# HG changeset patch
# User Michael Van De Vanter  <michael.van.de.vanter@oracle.com>
# Date 1449554095 28800
# Node ID 1b11227a5a6158a62c893f17ee6838efd78dba66
# Parent  8d19a118c1095422ca5b81daf0c1c678d897014c
Truffle/Debugging:  minor merge cleanup

diff -r 8d19a118c109 -r 1b11227a5a61 truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Debugger.java
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Debugger.java	Mon Dec 07 21:54:37 2015 -0800
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Debugger.java	Mon Dec 07 21:54:55 2015 -0800
@@ -768,7 +768,6 @@
             // The top/current/0 frame is not produced by the iterator; reported separately
             Truffle.getRuntime().iterateFrames(new FrameInstanceVisitor<FrameInstance>() {
                 int stackIndex = 1;
-                int frameIndex = 1;
 
                 @Override
                 public FrameInstance visitFrame(FrameInstance frameInstance) {
@@ -778,7 +777,6 @@
                             final SourceSection sourceSection = callNode.getEncapsulatingSourceSection();
                             if (sourceSection != null && !sourceSection.getIdentifier().equals("<unknown>")) {
                                 frames.add(frameInstance);
-                                frameIndex++;
                             } else if (TRACE) {
                                 if (callNode != null) {
                                     contextTrace("HIDDEN frame added: " + callNode);
@@ -786,7 +784,6 @@
                                     contextTrace("HIDDEN frame added");
                                 }
                                 frames.add(frameInstance);
-                                frameIndex++;
                             }
                         } else if (TRACE) {
                             if (callNode != null) {
@@ -795,7 +792,6 @@
                                 contextTrace("HIDDEN frame added");
                             }
                             frames.add(frameInstance);
-                            frameIndex++;
                         }
                         stackIndex++;
                         return null;
diff -r 8d19a118c109 -r 1b11227a5a61 truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/TagBreakpointFactory.java
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/TagBreakpointFactory.java	Mon Dec 07 21:54:37 2015 -0800
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/TagBreakpointFactory.java	Mon Dec 07 21:54:55 2015 -0800
@@ -447,5 +447,7 @@
                 TagBreakpointImpl.this.nodeEnter(node, vFrame);
             }
         }
+
     }
+
 }