jruby · May 25, 2017 · May 25, 2017
Showing with 23 additions and 12 deletions.

+1 −1 VERSION

+1 −1 core/pom.xml

+18 −7 core/src/main/java/org/jruby/ir/IRBuilder.java

+2 −2 lib/pom.xml

+1 −1 pom.xml
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9.1.10.0-SNAPSHOT
+9.1.11.0-SNAPSHOT
diff --git a/core/pom.xml b/core/pom.xml
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.1.10.0-SNAPSHOT</version>
+    <version>9.1.11.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>

diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -280,6 +280,12 @@ public void cloneIntoHostScope(IRBuilder builder) {
 
     private int _lastProcessedLineNum = -1;
 
+    // We do not need n consecutive line num instrs but only the last one in the sequence.
+    // We set this flag to indicate that we need to emit a line number but have not yet.
+    // addInstr will then appropriately add line info when it is called (which will never be
+    // called by a linenum instr).
+    private boolean needsLineNumInfo = false;
+
     public boolean underscoreVariableSeen = false;
 
     public IRLoop getCurrentLoop() {
@@ -313,6 +319,17 @@ public void addArgumentDescription(ArgumentType type, String name) {
     }
 
     public void addInstr(Instr instr) {
+        if (needsLineNumInfo) {
+            needsLineNumInfo = false;
+            addInstr(manager.newLineNumber(_lastProcessedLineNum));
+            if (RubyInstanceConfig.FULL_TRACE_ENABLED) {
+                addInstr(new TraceInstr(RubyEvent.LINE, methodNameFor(), getFileName(), _lastProcessedLineNum));
+                if (needsCodeCoverage()) {
+                    addInstr(new TraceInstr(RubyEvent.COVERAGE, methodNameFor(), getFileName(), _lastProcessedLineNum));
+                }
+            }
+        }
+
         // If we are building an ensure body, stash the instruction
         // in the ensure body's list. If not, add it to the scope directly.
         if (ensureBodyBuildStack.empty()) {
@@ -373,13 +390,7 @@ private Operand buildOperand(Variable result, Node node) throws NotCompilableExc
         if (node.isNewline()) {
             int currLineNum = node.getLine();
             if (currLineNum != _lastProcessedLineNum) { // Do not emit multiple line number instrs for the same line
-                addInstr(manager.newLineNumber(currLineNum));
-                if (RubyInstanceConfig.FULL_TRACE_ENABLED) {
-                    addInstr(new TraceInstr(RubyEvent.LINE, methodNameFor(), getFileName(), currLineNum));
-                    if (needsCodeCoverage()) {
-                        addInstr(new TraceInstr(RubyEvent.COVERAGE, methodNameFor(), getFileName(), currLineNum));
-                    }
-                }
+                needsLineNumInfo = true;
                 _lastProcessedLineNum = currLineNum;
             }
         }

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.1.10.0-SNAPSHOT</version>
+    <version>9.1.11.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-stdlib</artifactId>
   <name>JRuby Lib Setup</name>
@@ -28,7 +28,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
-      <version>9.1.10.0-SNAPSHOT</version>
+      <version>9.1.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@ DO NOT MODIFIY - GENERATED CODE
   </parent>
   <groupId>org.jruby</groupId>
   <artifactId>jruby-parent</artifactId>
-  <version>9.1.10.0-SNAPSHOT</version>
+  <version>9.1.11.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JRuby</name>
   <description>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.</description>