[GR-67990] Provide the current BCI from Espresso statement.

PullRequest: graal/21887

Author: entlicher

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/BytecodeNode.java

@@ -2963,7 +2963,7 @@ private static boolean assertionsEnabled() {
                         }
                     }
                     if (!seen) {
-                        statements[mapper.initIndex(i, entry.getBCI())] = new EspressoStatementNode(entry.getBCI(), method.getMethod().getSource().createSection(lineNumber));
+                        statements[mapper.initIndex(i, entry.getBCI())] = new EspressoStatementNode(method.getMethod().getSource().createSection(lineNumber));
                         seenLines[i] = lineNumber;
                         maxSeenLine = Math.max(maxSeenLine, lineNumber);
                     }

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/EspressoStatementNode.java

@@ -42,12 +42,10 @@
 @ExportLibrary(NodeLibrary.class)
 public final class EspressoStatementNode extends EspressoInstrumentableNode implements BciProvider {
 
-    private final int startBci;
     @Child private volatile ProbeNode eagerProbe;
     private final SourceSection sourceSection;
 
-    EspressoStatementNode(int startBci, SourceSection section) {
-        this.startBci = startBci;
+    EspressoStatementNode(SourceSection section) {
         this.sourceSection = section;
     }
 
@@ -57,8 +55,8 @@ public SourceSection getSourceSection() {
     }
 
     @Override
-    public int getBci(@SuppressWarnings("unused") Frame frame) {
-        return startBci;
+    public int getBci(Frame frame) {
+        return EspressoFrame.getBCI(frame);
     }
 
     @Override