[GR-55079] Fix some usages of transferToInterpreter()

eregon · eregon · commit fdb78f27175b · 2024-07-03T11:10:52.000+02:00
* transferToInterpreter() cannot be moved by the compiler, so should be avoided.
* transferToInterpreterAndInvalidate() is better if it should never happen
  or leads to an internal error.
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/AtexitModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/AtexitModuleBuiltins.java
@@ -65,7 +65,6 @@
 import com.oracle.graal.python.runtime.PythonContextFactory.GetThreadStateNodeGen;
 import com.oracle.graal.python.runtime.exception.ExceptionUtils;
 import com.oracle.graal.python.runtime.exception.PException;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleLanguage;
@@ -131,9 +130,9 @@ private static void handleException(PythonContext context, PException e) {
             }
         }
 
+        @TruffleBoundary
         @Specialization
         Object register(Object callable, Object[] arguments, PKeyword[] keywords) {
-            CompilerDirectives.transferToInterpreter();
             RootCallTarget callTarget = getLanguage().createCachedCallTarget(AtExitRootNode::new, AtExitRootNode.class);
             getContext().registerAtexitHook(callable, arguments, keywords, callTarget);
             return callable;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -642,7 +642,7 @@ static TruffleString doO(VirtualFrame frame, Node inliningTarget, Object x, Truf
                 isPInt.enter(inliningTarget);
                 return doPI((PInt) index, prefix, radix, longToString, fromJavaStringNode);
             } else {
-                CompilerDirectives.transferToInterpreter();
+                CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw PRaiseNode.raiseUncached(inliningTarget, PythonBuiltinClassType.NotImplementedError, toTruffleStringUncached("bin/oct/hex with native integer subclasses"));
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MathModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MathModuleBuiltins.java
@@ -1121,7 +1121,7 @@ static Object gcd(VirtualFrame frame, Object x, Object y,
 
         @Specialization
         Object gcdNative(@SuppressWarnings("unused") PythonAbstractNativeObject a, @SuppressWarnings("unused") Object b) {
-            CompilerDirectives.transferToInterpreter();
+            CompilerDirectives.transferToInterpreterAndInvalidate();
             throw PRaiseNode.raiseUncached(this, SystemError, ErrorMessages.GCD_FOR_NATIVE_NOT_SUPPORTED);
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java
@@ -367,7 +367,7 @@ protected final CApiContext getCApiContext() {
         }
 
         protected final PException badInternalCall(String argName) {
-            CompilerDirectives.transferToInterpreter();
+            CompilerDirectives.transferToInterpreterAndInvalidate();
             throw PRaiseNode.raiseUncached(this, SystemError, ErrorMessages.S_S_BAD_ARG_TO_INTERNAL_FUNC, getName(), argName);
         }
 
@@ -600,8 +600,7 @@ public CApiBuiltinExecutable(String name, CApiCallPath call, ArgDescriptor ret,
 
         CallTarget getCallTarget() {
             if (callTarget == null) {
-                CompilerDirectives.transferToInterpreter();
-                CompilerDirectives.shouldNotReachHere("call target slow path not implemented");
+                throw CompilerDirectives.shouldNotReachHere("call target slow path not implemented");
             }
             return callTarget;
         }
@@ -656,15 +655,15 @@ public static Object doExecute(@SuppressWarnings("unused") CApiBuiltinExecutable
                     CompilerDirectives.transferToInterpreter();
                     throw t;
                 } catch (Throwable t) {
-                    CompilerDirectives.transferToInterpreter();
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
                     t.printStackTrace();
                     throw CompilerDirectives.shouldNotReachHere(t);
                 }
             }
 
             @Specialization
             public static Object doFallback(@SuppressWarnings("unused") CApiBuiltinExecutable self, @SuppressWarnings("unused") Object[] arguments) {
-                CompilerDirectives.transferToInterpreter();
+                CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw CompilerDirectives.shouldNotReachHere("shouldn't hit generic case of " + Execute.class.getName());
             }
         }
@@ -824,7 +823,7 @@ Object execute(CApiBuiltinExecutable self, Object[] arguments) {
                 } else if (cachedSelf.getRetDescriptor().isVoid()) {
                     return PNone.NO_VALUE;
                 } else {
-                    CompilerDirectives.transferToInterpreter();
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
                     throw CompilerDirectives.shouldNotReachHere("return type while handling PException: " + cachedSelf.getRetDescriptor() + " in " + self.name);
                 }
             } finally {
@@ -1412,8 +1411,7 @@ static boolean traceCalls(PythonContext context) {
 
         @SuppressWarnings("unused")
         protected void trace(PythonContext context, Object ptr, Reference ref, TruffleString className) {
-            CompilerDirectives.transferToInterpreter();
-            throw new IllegalStateException("should not reach");
+            throw CompilerDirectives.shouldNotReachHere();
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTypeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTypeBuiltins.java
@@ -247,8 +247,7 @@ int trace(Object ptr, Object classNameObj,
                 try {
                     className = switchEncodingNode.execute(nameLib.asTruffleString(classNameObj), TS_ENCODING);
                 } catch (UnsupportedMessageException e) {
-                    CompilerDirectives.transferToInterpreter();
-                    throw new IllegalStateException();
+                    throw CompilerDirectives.shouldNotReachHere(e);
                 }
             } else {
                 className = null;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java
@@ -153,7 +153,6 @@
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.graal.python.util.PythonUtils;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Bind;
@@ -180,6 +179,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Shape;
+import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.api.strings.TruffleString.RegionEqualNode;
@@ -1364,11 +1364,13 @@ public Keys(Object[] keys) {
         }
 
         @ExportMessage
-        Object readArrayElement(long index) throws InvalidArrayIndexException {
-            try {
+        Object readArrayElement(long index,
+                        @Cached InlinedBranchProfile outOfBoundsProfile,
+                        @Bind("$node") Node inliningTarget) throws InvalidArrayIndexException {
+            if (Long.compareUnsigned(index, keys.length) < 0) {
                 return keys[(int) index];
-            } catch (IndexOutOfBoundsException e) {
-                CompilerDirectives.transferToInterpreter();
+            } else {
+                outOfBoundsProfile.enter(inliningTarget);
                 throw InvalidArrayIndexException.create(index);
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonAbstractNativeObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonAbstractNativeObject.java
@@ -102,8 +102,7 @@ public int compareTo(Object o) {
 
     public void lookupChanged() {
         // TODO invalidate cached native MRO
-        CompilerDirectives.transferToInterpreter();
-        throw new UnsupportedOperationException("not yet implemented");
+        throw CompilerDirectives.shouldNotReachHere("not yet implemented");
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java
@@ -70,7 +70,7 @@
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
 import static com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere;
-import static com.oracle.truffle.api.CompilerDirectives.transferToInterpreter;
+import static com.oracle.truffle.api.CompilerDirectives.transferToInterpreterAndInvalidate;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -2144,7 +2144,7 @@ private static PythonObject castToPythonObject(Object callable) {
             if (callable instanceof PythonObject pythonObject) {
                 return pythonObject;
             }
-            transferToInterpreter();
+            transferToInterpreterAndInvalidate();
             throw shouldNotReachHere("Unexpected class of callable: " + callable.getClass());
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/FunctionBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/FunctionBuiltins.java
@@ -78,7 +78,6 @@
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.util.PythonUtils;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -230,7 +229,6 @@ static Object set(PFunction self, @SuppressWarnings("unused") PNone arg) {
         @Specialization(guards = "!isNoValue(arg)")
         @TruffleBoundary
         Object set(PFunction self, PDict arg) {
-            CompilerDirectives.transferToInterpreter();
             ArrayList<PKeyword> keywords = new ArrayList<>();
             final HashingStorage storage = arg.getDictStorage();
             HashingStorageIterator it = HashingStorageGetIterator.executeUncached(storage);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PObjectSlice.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PObjectSlice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -50,7 +50,6 @@
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.CompilerDirectives.ValueType;
 
@@ -135,7 +134,6 @@ public static SliceObjectInfo computeIndicesSlowPath(PObjectSlice slice, Object
         BigInteger start, stop, step, length;
         length = (BigInteger) lengthIn;
         if (pySign(length) < 0) {
-            CompilerDirectives.transferToInterpreter();
             throw PRaiseNode.raiseUncached(null, ValueError, ErrorMessages.LENGTH_SHOULD_NOT_BE_NEG);
         }
         if (slice.getStep() == PNone.NONE) {
@@ -145,7 +143,6 @@ public static SliceObjectInfo computeIndicesSlowPath(PObjectSlice slice, Object
             step = (BigInteger) slice.getStep();
             stepIsNegative = pySign(step) < 0;
             if (pySign(step) == 0) {
-                CompilerDirectives.transferToInterpreter();
                 throw PRaiseNode.raiseUncached(null, ValueError, ErrorMessages.SLICE_STEP_CANNOT_BE_ZERO);
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PSlice.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PSlice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -109,7 +109,7 @@ public record SliceInfoLong(long start, long stop, long step) {
 
     protected static void checkNegative(int length) {
         if (length < 0) {
-            CompilerDirectives.transferToInterpreter();
+            CompilerDirectives.transferToInterpreterAndInvalidate();
             throw PRaiseNode.raiseUncached(null, ValueError, ErrorMessages.LENGTH_SHOULD_NOT_BE_NEG);
         }
     }
@@ -141,7 +141,7 @@ public static SliceInfo computeIndices(Object startIn, Object stopIn, Object ste
             step = (int) stepIn;
             stepIsNegative = pySign(step) < 0;
             if (pySign(step) == 0) {
-                CompilerDirectives.transferToInterpreter();
+                CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw PRaiseNode.raiseUncached(null, ValueError, ErrorMessages.SLICE_STEP_CANNOT_BE_ZERO);
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/SliceBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/SliceBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -55,7 +55,6 @@
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -231,7 +230,6 @@ public abstract static class HashNode extends PythonBuiltinNode {
         @Specialization
         public static long hash(PSlice self,
                         @Cached PRaiseNode raise) {
-            CompilerDirectives.transferToInterpreter();
             throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.UNHASHABLE_TYPE_P, PythonBuiltinClassType.PSlice);
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/EmulatedPosixSupport.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/EmulatedPosixSupport.java
@@ -2621,7 +2621,7 @@ final MMapHandle mmap(long length, int prot, int flags, int fd, long offset,
             try {
                 return new MMapHandle(new AnonymousMap(PythonUtils.toIntExact(length)), 0);
             } catch (OverflowException e) {
-                CompilerDirectives.transferToInterpreter();
+                CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw new UnsupportedPosixFeatureException(String.format("Anonymous mapping in mmap for memory larger than %d", Integer.MAX_VALUE));
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/ArrayBuilder.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/ArrayBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -65,7 +65,7 @@ public void add(Object item) {
             try {
                 data = PythonUtils.arrayCopyOf(data, PythonUtils.multiplyExact(size, 2));
             } catch (OverflowException e) {
-                CompilerDirectives.transferToInterpreter();
+                CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw new OutOfMemoryError();
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/ByteArrayBuilder.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/ByteArrayBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -112,7 +112,7 @@ private void ensureCanAppend(int bytesToAdd) {
             }
             data = arrayCopyOf(data, newSize);
         } catch (OverflowException e) {
-            CompilerDirectives.transferToInterpreter();
+            CompilerDirectives.transferToInterpreterAndInvalidate();
             throw new OutOfMemoryError();
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/IntArrayBuilder.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/IntArrayBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -62,7 +62,7 @@ public void add(int item) {
             try {
                 data = arrayCopyOf(data, PythonUtils.multiplyExact(size, 2));
             } catch (OverflowException e) {
-                CompilerDirectives.transferToInterpreter();
+                CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw new OutOfMemoryError();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,7 @@ static TruffleString doO(VirtualFrame frame, Node inliningTarget, Object x, Truf`
`642`	`642`	`isPInt.enter(inliningTarget);`
`643`	`643`	`return doPI((PInt) index, prefix, radix, longToString, fromJavaStringNode);`
`644`	`644`	`} else {`
`645`		`- CompilerDirectives.transferToInterpreter();`
	`645`	`+ CompilerDirectives.transferToInterpreterAndInvalidate();`
`646`	`646`	`throw PRaiseNode.raiseUncached(inliningTarget, PythonBuiltinClassType.NotImplementedError, toTruffleStringUncached("bin/oct/hex with native integer subclasses"));`
`647`	`647`	`}`
`648`	`648`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1121,7 +1121,7 @@ static Object gcd(VirtualFrame frame, Object x, Object y,`
`1121`	`1121`
`1122`	`1122`	`@Specialization`
`1123`	`1123`	`Object gcdNative(@SuppressWarnings("unused") PythonAbstractNativeObject a, @SuppressWarnings("unused") Object b) {`
`1124`		`- CompilerDirectives.transferToInterpreter();`
	`1124`	`+ CompilerDirectives.transferToInterpreterAndInvalidate();`
`1125`	`1125`	`throw PRaiseNode.raiseUncached(this, SystemError, ErrorMessages.GCD_FOR_NATIVE_NOT_SUPPORTED);`
`1126`	`1126`	`}`
`1127`	`1127`
Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ protected final CApiContext getCApiContext() {`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`protected final PException badInternalCall(String argName) {`
`370`		`- CompilerDirectives.transferToInterpreter();`
	`370`	`+ CompilerDirectives.transferToInterpreterAndInvalidate();`
`371`	`371`	`throw PRaiseNode.raiseUncached(this, SystemError, ErrorMessages.S_S_BAD_ARG_TO_INTERNAL_FUNC, getName(), argName);`
`372`	`372`	`}`
`373`	`373`
`@@ -600,8 +600,7 @@ public CApiBuiltinExecutable(String name, CApiCallPath call, ArgDescriptor ret,`
`600`	`600`
`601`	`601`	`CallTarget getCallTarget() {`
`602`	`602`	`if (callTarget == null) {`
`603`		`- CompilerDirectives.transferToInterpreter();`
`604`		`- CompilerDirectives.shouldNotReachHere("call target slow path not implemented");`
	`603`	`+ throw CompilerDirectives.shouldNotReachHere("call target slow path not implemented");`
`605`	`604`	`}`
`606`	`605`	`return callTarget;`
`607`	`606`	`}`
`@@ -656,15 +655,15 @@ public static Object doExecute(@SuppressWarnings("unused") CApiBuiltinExecutable`
`656`	`655`	`CompilerDirectives.transferToInterpreter();`
`657`	`656`	`throw t;`
`658`	`657`	`} catch (Throwable t) {`
`659`		`- CompilerDirectives.transferToInterpreter();`
	`658`	`+ CompilerDirectives.transferToInterpreterAndInvalidate();`
`660`	`659`	`t.printStackTrace();`
`661`	`660`	`throw CompilerDirectives.shouldNotReachHere(t);`
`662`	`661`	`}`
`663`	`662`	`}`
`664`	`663`
`665`	`664`	`@Specialization`
`666`	`665`	`public static Object doFallback(@SuppressWarnings("unused") CApiBuiltinExecutable self, @SuppressWarnings("unused") Object[] arguments) {`
`667`		`- CompilerDirectives.transferToInterpreter();`
	`666`	`+ CompilerDirectives.transferToInterpreterAndInvalidate();`
`668`	`667`	`throw CompilerDirectives.shouldNotReachHere("shouldn't hit generic case of " + Execute.class.getName());`
`669`	`668`	`}`
`670`	`669`	`}`
`@@ -824,7 +823,7 @@ Object execute(CApiBuiltinExecutable self, Object[] arguments) {`
`824`	`823`	`} else if (cachedSelf.getRetDescriptor().isVoid()) {`
`825`	`824`	`return PNone.NO_VALUE;`
`826`	`825`	`} else {`
`827`		`- CompilerDirectives.transferToInterpreter();`
	`826`	`+ CompilerDirectives.transferToInterpreterAndInvalidate();`
`828`	`827`	`throw CompilerDirectives.shouldNotReachHere("return type while handling PException: " + cachedSelf.getRetDescriptor() + " in " + self.name);`
`829`	`828`	`}`
`830`	`829`	`} finally {`
`@@ -1412,8 +1411,7 @@ static boolean traceCalls(PythonContext context) {`
`1412`	`1411`
`1413`	`1412`	`@SuppressWarnings("unused")`
`1414`	`1413`	`protected void trace(PythonContext context, Object ptr, Reference ref, TruffleString className) {`
`1415`		`- CompilerDirectives.transferToInterpreter();`
`1416`		`- throw new IllegalStateException("should not reach");`
	`1414`	`+ throw CompilerDirectives.shouldNotReachHere();`
`1417`	`1415`	`}`
`1418`	`1416`	`}`
`1419`	`1417`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,7 @@ public int compareTo(Object o) {`
`102`	`102`
`103`	`103`	`public void lookupChanged() {`
`104`	`104`	`// TODO invalidate cached native MRO`
`105`		`- CompilerDirectives.transferToInterpreter();`
`106`		`- throw new UnsupportedOperationException("not yet implemented");`
	`105`	`+ throw CompilerDirectives.shouldNotReachHere("not yet implemented");`
`107`	`106`	`}`
`108`	`107`
`109`	`108`	`@Override`