Fixes to JIT of regexp named-group captured vars.

* Store result to complete SetCapturedVar. * Get name using depth and offset during IR build of captured var. Fixes #1993.
jruby · Sep 20, 2014 · 8782912 · 8782912
1 parent 7ef5314
commit 8782912
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -2573,20 +2573,26 @@ public Operand buildMatch2(Match2Node matchNode, IRScope s) {
         addInstr(s, new Match2Instr(result, receiver, value));
         if (matchNode instanceof Match2CaptureNode) {
             Match2CaptureNode m2c = (Match2CaptureNode)matchNode;
-            String[] vars = s.getStaticScope().getVariables();
             for (int slot:  m2c.getScopeOffsets()) {
                 // Static scope scope offsets store both depth and offset
                 int depth = slot >> 16;
                 int offset = slot & 0xffff;
 
                 // For now, we'll continue to implicitly reference "$~"
-                String var = vars[offset];
+                String var = getVarNameFromScopeTree(s, depth, offset);
                 addInstr(s, new SetCapturedVarInstr(s.getLocalVariable(var, depth), result, var));
             }
         }
         return result;
     }
 
+    private String getVarNameFromScopeTree(IRScope scope, int depth, int offset) {
+        if (depth == 0) {
+            return scope.getStaticScope().getVariables()[offset];
+        }
+        return getVarNameFromScopeTree(scope.getLexicalParent(), depth - 1, offset);
+    }
+
     public Operand buildMatch3(Match3Node matchNode, IRScope s) {
         Operand receiver = build(matchNode.getReceiverNode(), s);
         Operand value    = build(matchNode.getValueNode(), s);

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -1734,6 +1734,7 @@ public void SetCapturedVarInstr(SetCapturedVarInstr instr) {
         visit(instr.getMatch2Result());
         jvmAdapter().ldc(instr.getVarName());
         jvmMethod().invokeIRHelper("setCapturedVar", sig(IRubyObject.class, ThreadContext.class, IRubyObject.class, String.class));
+        jvmStoreLocal(instr.getResult());
     }
 
     @Override