Fallout from #4186. JRuby AOT and IR persistence needs to persist the…

… new fistKeywordIndex field in StaticScope.
jruby · Sep 28, 2016 · 50bb31d · 50bb31d
1 parent 18800ed
commit 50bb31d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ir/persistence/IRReader.java b/core/src/main/java/org/jruby/ir/persistence/IRReader.java
@@ -141,7 +141,7 @@ private static Map<String, Integer> decodeScopeLabelIndices(IRReaderDecoder deco
     }
 
     private static StaticScope decodeStaticScope(IRReaderDecoder decoder, StaticScope parentScope) {
-        StaticScope scope = StaticScopeFactory.newStaticScope(parentScope, decoder.decodeStaticScopeType(), decoder.decodeStringArray());
+        StaticScope scope = StaticScopeFactory.newStaticScope(parentScope, decoder.decodeStaticScopeType(), decoder.decodeStringArray(), decoder.decodeInt());
 
         scope.setSignature(decoder.decodeSignature());
 

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRWriter.java b/core/src/main/java/org/jruby/ir/persistence/IRWriter.java
@@ -123,6 +123,7 @@ private static void persistScopeLabelIndices(IRScope scope, IRWriterEncoder file
     private static void persistStaticScope(IRWriterEncoder file, StaticScope staticScope) {
         file.encode(staticScope.getType());
         file.encode(staticScope.getVariables());
+        file.encode(staticScope.getFirstKeywordIndex());
         file.encode(staticScope.getSignature());
     }
 }
diff --git a/core/src/main/java/org/jruby/parser/StaticScope.java b/core/src/main/java/org/jruby/parser/StaticScope.java
@@ -142,7 +142,7 @@ protected StaticScope(Type type, StaticScope enclosingScope) {
      * @param enclosingScope the lexically containing scope.
      * @param names          The list of interned String variable names.
      */
-    protected StaticScope(Type type, StaticScope enclosingScope, String[] names) {
+    protected StaticScope(Type type, StaticScope enclosingScope, String[] names, int firstKeywordIndex) {
         assert names != null : "names is not null";
         assert namesAreInterned(names);
 
@@ -152,6 +152,16 @@ protected StaticScope(Type type, StaticScope enclosingScope, String[] names) {
         this.irScope = null;
         this.isBlockOrEval = (type != Type.LOCAL);
         this.isArgumentScope = !isBlockOrEval;
+        this.firstKeywordIndex = firstKeywordIndex;
+    }
+
+    @Deprecated
+    protected StaticScope(Type type, StaticScope enclosingScope, String[] names) {
+        this(type, enclosingScope, names, -1);
+    }
+
+    public int getFirstKeywordIndex() {
+        return firstKeywordIndex;
     }
 
     public IRScope getIRScope() {

diff --git a/core/src/main/java/org/jruby/parser/StaticScopeFactory.java b/core/src/main/java/org/jruby/parser/StaticScopeFactory.java
@@ -51,6 +51,7 @@ public static StaticScope newIRBlockScope(StaticScope parent) {
         return new StaticScope(StaticScope.Type.BLOCK, parent);
     }
 
+    @Deprecated
     public static StaticScope newStaticScope(StaticScope parent, StaticScope.Type type, String[] names) {
         if(names == null) {
             return new StaticScope(type, parent);
@@ -59,6 +60,15 @@ public static StaticScope newStaticScope(StaticScope parent, StaticScope.Type ty
         }
     }
 
+    public static StaticScope newStaticScope(StaticScope parent, StaticScope.Type type, String[] names, int keywordArgIndex) {
+        if(names == null) {
+            return new StaticScope(type, parent);
+        } else {
+            return new StaticScope(type, parent, names, keywordArgIndex);
+        }
+    }
+
+
     public StaticScope getDummyScope() {
         return dummyScope;
     }