integrate new source section & continuation changes; skip short circu…

…it op for unary compare operations
oracle · Apr 2, 2024 · 3bec5b4 · 3bec5b4
1 parent 012a050
commit 3bec5b4
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 125 deletions.
diff --git a/...m.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeBuiltins.java b/...m.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeBuiltins.java
@@ -58,7 +58,6 @@
 import com.oracle.graal.python.lib.PyObjectGetIter;
 import com.oracle.graal.python.lib.PyObjectHashNode;
 import com.oracle.graal.python.nodes.PGuards;
-import com.oracle.graal.python.nodes.bytecode.PBytecodeRootNode;
 import com.oracle.graal.python.nodes.bytecode_dsl.PBytecodeDSLRootNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
@@ -310,10 +309,10 @@ static Object lines(PCode self) {
             CodeUnit co = self.getCodeUnit();
             if (co != null) {
                 if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER) {
-                    BytecodeIntrospection introspectionData = ((PBytecodeDSLRootNode) self.getRootNode()).getIntrospectionData();
+                    BytecodeIntrospection introspectionData = ((PBytecodeDSLRootNode) self.getRootNodeForExtraction()).getIntrospectionData();
                     List<PTuple> lines = new ArrayList<>();
                     for (SourceInformation sourceInfo : introspectionData.getSourceInformation()) {
-                        lines.add(factory.createTuple(new int[]{sourceInfo.getStartBci(), sourceInfo.getEndBci(), sourceInfo.getSourceSection().getStartLine()}));
+                        lines.add(factory.createTuple(new int[]{sourceInfo.getBeginBci(), sourceInfo.getEndBci(), sourceInfo.getSourceSection().getStartLine()}));
                     }
                     tuple = factory.createTuple(lines.toArray());
                 } else {
@@ -354,7 +353,7 @@ Object positions(PCode self) {
             if (co != null) {
                 List<PTuple> lines = new ArrayList<>();
                 if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER) {
-                    PBytecodeDSLRootNode rootNode = (PBytecodeDSLRootNode) self.getRootNode();
+                    PBytecodeDSLRootNode rootNode = (PBytecodeDSLRootNode) self.getRootNodeForExtraction();
                     for (Instruction instruction : rootNode.getIntrospectionData().getInstructions()) {
                         SourceSection section = rootNode.getSourceSectionForLocation(instruction.getLocation());
                         lines.add(factory.createTuple(new int[]{

diff --git a/...thon/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java b/...thon/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java
@@ -429,6 +429,10 @@ RootNode getRootNode() {
         return getRootCallTarget().getRootNode();
     }
 
+    RootNode getRootNodeForExtraction() {
+        return rootNodeForExtraction(getRootNode());
+    }
+
     public TruffleString[] getFreeVars() {
         if (freevars == null) {
             freevars = extractFreeVars(getRootNode());

diff --git a/...raal.python/src/com/oracle/graal/python/builtins/objects/generator/GeneratorBuiltins.java b/...raal.python/src/com/oracle/graal/python/builtins/objects/generator/GeneratorBuiltins.java
@@ -59,7 +59,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
-import com.oracle.truffle.api.bytecode.BytecodeNode;
+import com.oracle.truffle.api.bytecode.BytecodeLocation;
 import com.oracle.truffle.api.bytecode.ContinuationResult;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -197,11 +197,11 @@ static Object getFrame(PGenerator self,
                     BytecodeDSLFrameInfo info = (BytecodeDSLFrameInfo) generatorFrame.getFrameDescriptor().getInfo();
                     PBytecodeDSLRootNode rootNode = info.getRootNode();
                     ContinuationResult continuation = self.getContinuation();
-                    BytecodeNode bytecodeNode = continuation.getBytecodeNode();
-                    PFrame frame = MaterializeFrameNode.materializeGeneratorFrame(bytecodeNode, generatorFrame, PFrame.Reference.EMPTY, factory);
-                    int bci = continuation.getBci();
+                    BytecodeLocation location = continuation.getBytecodeLocation();
+                    PFrame frame = MaterializeFrameNode.materializeGeneratorFrame(location.getBytecodeNode(), generatorFrame, PFrame.Reference.EMPTY, factory);
+                    int bci = location.getBytecodeIndex();
                     frame.setBci(bci);
-                    frame.setLine(rootNode.bciToLine(bci, bytecodeNode));
+                    frame.setLine(rootNode.bciToLine(bci, location.getBytecodeNode()));
                     return frame;
                 } else {
                     BytecodeFrameInfo info = (BytecodeFrameInfo) generatorFrame.getFrameDescriptor().getInfo();