do not cache concrete objects in shared ASTs

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

@@ -111,7 +111,6 @@ public Object execute(PythonNativeClass object, Object arg) {
     public static class FromNativeSubclassNode<T> extends PBaseNode {
         private final PythonBuiltinClassType expectedType;
         private final String conversionFuncName;
-        @CompilationFinal private PythonBuiltinClass expectedClass;
         @CompilationFinal private TruffleObject conversionFunc;
         @Child private Node executeNode;
         @Child private GetClassNode getClass = GetClassNode.create();
@@ -124,11 +123,7 @@ private FromNativeSubclassNode(PythonBuiltinClassType expectedType, String conve
         }
 
         private PythonBuiltinClass getExpectedClass() {
-            if (expectedClass == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                expectedClass = getCore().lookupType(expectedType);
-            }
-            return expectedClass;
+            return getCore().lookupType(expectedType);
         }
 
         private Node getExecNode() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/datamodel/IsHashableNode.java

@@ -76,10 +76,9 @@ protected boolean isHashableGeneric(@SuppressWarnings("unused") Object object) {
     @Specialization
     protected boolean isHashableGeneric(Object object,
                     @Cached("create(__HASH__)") LookupAndCallUnaryNode lookupHashAttributeNode,
-                    @Cached("create()") BuiltinFunctions.IsInstanceNode isInstanceNode,
-                    @Cached("getBuiltinIntType()") PythonClass IntType) {
+                    @Cached("create()") BuiltinFunctions.IsInstanceNode isInstanceNode) {
         Object hashValue = lookupHashAttributeNode.executeObject(object);
-        if (isInstanceNode.executeWith(hashValue, IntType)) {
+        if (isInstanceNode.executeWith(hashValue, getBuiltinIntType())) {
             return true;
         }
         throw raise(PythonErrorType.TypeError, "__hash__ method should return an integer");

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/FrameSlotNode.java

@@ -27,10 +27,8 @@
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
-import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.PNode;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -40,14 +38,9 @@
 
 public abstract class FrameSlotNode extends PNode {
     private final ConditionProfile isPrimitiveProfile = ConditionProfile.createBinaryProfile();
-    @CompilationFinal private PythonClass intClass;
 
     protected boolean isPrimitiveInt(PInt cls) {
-        if (intClass == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            intClass = getCore().lookupType(PythonBuiltinClassType.PInt);
-        }
-        return isPrimitiveProfile.profile(cls.getPythonClass() == intClass);
+        return isPrimitiveProfile.profile(cls.getPythonClass() == getCore().lookupType(PythonBuiltinClassType.PInt));
     }
 
     protected final FrameSlot frameSlot;