Mercurial > hg > truffle
changeset 22484:1b11227a5a61
Truffle/Debugging: minor merge cleanup
author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
---|---|
date | Mon, 07 Dec 2015 21:54:55 -0800 |
parents | 8d19a118c109 |
children | 55e2a3f21528 |
files | truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/Debugger.java truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/TagBreakpointFactory.java |
diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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); } } + } + }