Remove line number tracking from CompileContext

Only output line number byte code if line number changes during generation
prestodb · Apr 8, 2015 · 84f5799 · 84f5799
1 parent fd8a88e
commit 84f5799
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/byteCode/Block.java b/presto-main/src/main/java/com/facebook/presto/byteCode/Block.java
@@ -61,6 +61,7 @@ public class Block
     private final List<ByteCodeNode> nodes = new ArrayList<>();
 
     private String description;
+    private int currentLineNumber = -1;
 
     public Block(CompilerContext context)
     {
@@ -995,14 +996,12 @@ public Block putObjectArrayElement()
         return this;
     }
 
-    public Block visitLineNumber(int line)
+    public Block visitLineNumber(int currentLineNumber)
     {
-        if (line <= 0) {
+        checkArgument(currentLineNumber >= 0, "currentLineNumber must be positive");
-            context.cleanLineNumber();
+        if (this.currentLineNumber != currentLineNumber) {
-        }
+            nodes.add(new LineNumberNode(currentLineNumber));
-        else if (!context.hasVisitedLine(line)) {
+            this.currentLineNumber = currentLineNumber;
-            nodes.add(new LineNumberNode(line));
-            context.visitLine(line);
         }
         return this;
     }

diff --git a/presto-main/src/main/java/com/facebook/presto/byteCode/CompilerContext.java b/presto-main/src/main/java/com/facebook/presto/byteCode/CompilerContext.java
@@ -40,8 +40,6 @@ public class CompilerContext
     private final LabelNode variableStartLabel = new LabelNode("VariableStart");
     private final LabelNode variableEndLabel = new LabelNode("VariableEnd");
 
-    private Integer currentLine;
-
     public CompilerContext()
     {
     }
@@ -119,21 +117,6 @@ public IterationScope peekIterationScope(int level)
         return Iterators.get(iterationScopes.iterator(), level - 1, null);
     }
 
-    public boolean hasVisitedLine(Integer line)
-    {
-        return this.currentLine != null && line.intValue() == this.currentLine.intValue();
-    }
-
-    public void cleanLineNumber()
-    {
-        this.currentLine = null;
-    }
-
-    public void visitLine(int currentLine)
-    {
-        this.currentLine = currentLine;
-    }
-
     public LabelNode getVariableStartLabel()
     {
         return variableStartLabel;

diff --git a/presto-main/src/main/java/com/facebook/presto/byteCode/MethodGenerationContext.java b/presto-main/src/main/java/com/facebook/presto/byteCode/MethodGenerationContext.java
@@ -15,4 +15,15 @@
 
 public class MethodGenerationContext
 {
+    private int currentLineNumber = -1;
+
+    public boolean updateLineNumber(int lineNumber)
+    {
+        if (lineNumber == currentLineNumber) {
+            return false;
+        }
+
+        currentLineNumber = lineNumber;
+        return true;
+    }
 }
diff --git a/presto-main/src/main/java/com/facebook/presto/byteCode/debug/LineNumberNode.java b/presto-main/src/main/java/com/facebook/presto/byteCode/debug/LineNumberNode.java
@@ -38,7 +38,9 @@ public LineNumberNode(int lineNumber)
     @Override
     public void accept(MethodVisitor visitor, MethodGenerationContext generationContext)
     {
-        visitor.visitLineNumber(lineNumber, label.getLabel());
+        if (generationContext.updateLineNumber(lineNumber)) {
+            visitor.visitLineNumber(lineNumber, label.getLabel());
+        }
     }
 
     public int getLineNumber()