function builtins: cache GetFunctionCodeNode in specializations

- fix guards on getCodeCached specialization

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/code/GetFunctionCodeNode.java

@@ -50,8 +50,9 @@
 public abstract class GetFunctionCodeNode extends PNodeWithContext {
     public abstract PCode execute(PFunction function);
 
-    @Specialization(guards = {"self.getCode() == cachedCode"}, assumptions = {"codeStableAssumption"})
+    @Specialization(guards = {"self == cachedSelf"}, assumptions = {"codeStableAssumption"})
     PCode getCodeCached(@SuppressWarnings("unused") PFunction self,
+                    @SuppressWarnings("unused") @Cached("self") PFunction cachedSelf,
                     @Cached("self.getCode()") PCode cachedCode,
                     @SuppressWarnings("unused") @Cached("self.getCodeStableAssumption()") Assumption codeStableAssumption) {
         return cachedCode;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/code/GetSignatureNode.java

@@ -46,27 +46,17 @@
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.builtins.objects.method.PMethod;
 import com.oracle.graal.python.nodes.PNodeWithContext;
-import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 
 public abstract class GetSignatureNode extends PNodeWithContext {
-    @Child private GetFunctionCodeNode getCodeNode;
-
-    private GetFunctionCodeNode getGetCodeNode() {
-        if (getCodeNode == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            getCodeNode = GetFunctionCodeNode.create();
-        }
-        return getCodeNode;
-    }
-
-    private Signature doFunctionInternal(PFunction function) {
-        return getGetCodeNode().execute(function).getSignature();
+    private Signature doFunctionInternal(GetFunctionCodeNode getFunctionCodeNode, PFunction function) {
+        return getFunctionCodeNode.execute(function).getSignature();
     }
 
-    private Signature doMethodInternal(Object function) {
+    private Signature doMethodInternal(GetFunctionCodeNode getFunctionCodeNode, Object function) {
         if (function instanceof PFunction) {
-            return doFunctionInternal((PFunction) function);
+            return doFunctionInternal(getFunctionCodeNode, (PFunction) function);
         } else if (function instanceof PBuiltinFunction) {
             return ((PBuiltinFunction) function).getSignature();
         }
@@ -76,8 +66,9 @@ private Signature doMethodInternal(Object function) {
     public abstract Signature execute(Object function);
 
     @Specialization
-    Signature doFunction(PFunction function) {
-        return doFunctionInternal(function);
+    Signature doFunction(PFunction function,
+                    @Cached("create()") GetFunctionCodeNode getFunctionCodeNode) {
+        return doFunctionInternal(getFunctionCodeNode, function);
     }
 
     @Specialization
@@ -86,13 +77,15 @@ Signature doBuiltinFunction(PBuiltinFunction builtinFunction) {
     }
 
     @Specialization
-    Signature doMethod(PMethod method) {
-        return doMethodInternal(method.getFunction());
+    Signature doMethod(PMethod method,
+                    @Cached("create()") GetFunctionCodeNode getFunctionCodeNode) {
+        return doMethodInternal(getFunctionCodeNode, method.getFunction());
     }
 
     @Specialization
-    Signature doBuiltinMethod(PBuiltinMethod builtinMethod) {
-        return doMethodInternal(builtinMethod.getFunction());
+    Signature doBuiltinMethod(PBuiltinMethod builtinMethod,
+                    @Cached("create()") GetFunctionCodeNode getFunctionCodeNode) {
+        return doMethodInternal(getFunctionCodeNode, builtinMethod.getFunction());
     }
 
     public static GetSignatureNode create() {