address code clarity review comments

timfel · msimacek · commit 5d5b9e7846b9 · 2022-09-13T18:32:33.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java
@@ -922,6 +922,7 @@ private void copyArgs(Object[] args, Frame localFrame) {
                     continue;
                 }
             }
+            CompilerDirectives.transferToInterpreterAndInvalidate();
             generalizeVariableStores(i);
             variableTypes[i] = QuickeningTypes.OBJECT;
             localFrame.setObject(i, arg);
@@ -2095,7 +2096,7 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
                         continue;
                     }
                     default:
-                        throw raiseUnkownBytecodeError(bc);
+                        throw raiseUnknownBytecodeError(bc);
                 }
                 // prepare next loop
                 oparg = 0;
@@ -2715,7 +2716,7 @@ private void chainPythonExceptions(VirtualFrame virtualFrame, MutableLoopData mu
         }
     }
 
-    private PException raiseUnkownBytecodeError(final byte bc) {
+    private PException raiseUnknownBytecodeError(final byte bc) {
         CompilerDirectives.transferToInterpreterAndInvalidate();
         throw PRaiseNode.raiseUncached(this, SystemError, toTruffleStringUncached("not implemented bytecode %s"), OpCodes.fromOpCode(bc));
     }

Original file line number	Diff line number	Diff line change
`@@ -922,6 +922,7 @@ private void copyArgs(Object[] args, Frame localFrame) {`
`922`	`922`	`continue;`
`923`	`923`	`}`
`924`	`924`	`}`
	`925`	`+ CompilerDirectives.transferToInterpreterAndInvalidate();`
`925`	`926`	`generalizeVariableStores(i);`
`926`	`927`	`variableTypes[i] = QuickeningTypes.OBJECT;`
`927`	`928`	`localFrame.setObject(i, arg);`
`@@ -2095,7 +2096,7 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod`
`2095`	`2096`	`continue;`
`2096`	`2097`	`}`
`2097`	`2098`	`default:`
`2098`		`- throw raiseUnkownBytecodeError(bc);`
	`2099`	`+ throw raiseUnknownBytecodeError(bc);`
`2099`	`2100`	`}`
`2100`	`2101`	`// prepare next loop`
`2101`	`2102`	`oparg = 0;`
`@@ -2715,7 +2716,7 @@ private void chainPythonExceptions(VirtualFrame virtualFrame, MutableLoopData mu`
`2715`	`2716`	`}`
`2716`	`2717`	`}`
`2717`	`2718`
`2718`		`- private PException raiseUnkownBytecodeError(final byte bc) {`
	`2719`	`+ private PException raiseUnknownBytecodeError(final byte bc) {`
`2719`	`2720`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`2720`	`2721`	`throw PRaiseNode.raiseUncached(this, SystemError, toTruffleStringUncached("not implemented bytecode %s"), OpCodes.fromOpCode(bc));`
`2721`	`2722`	`}`