[GR-33279] Avoiding a potential NPE from NativeFunctionRootNode.getName().

PullRequest: js/2150

Author: iamstolis

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/GraalJSAccess.java

@@ -1747,16 +1747,22 @@ public Object functionTemplateGetFunction(Object realm, Object templateObj) {
 
     private DynamicObject functionTemplateCreateCallback(JSContext context, JSRealm realm, FunctionTemplate template) {
         CompilerAsserts.neverPartOfCompilation("do not create function template in compiled code");
-        JSOrdinary instanceLayout = template.getInstanceTemplate().getInternalFieldCount() > 0 ? JSOrdinary.INTERNAL_FIELD_INSTANCE : JSOrdinary.INSTANCE;
-        JSFunctionData functionData = JSFunctionData.create(context, template.getLength(), template.getClassName(), template.getPrototypeTemplate() != null, false, false, false);
-        CallTarget callTarget = Truffle.getRuntime().createCallTarget(new ExecuteNativeFunctionNode.NativeFunctionRootNode(this, context, template, false, false));
-        CallTarget newCallTarget = Truffle.getRuntime().createCallTarget(new ExecuteNativeFunctionNode.NativeFunctionRootNode(this, context, template, true, false));
-        CallTarget newTargetCallTarget = Truffle.getRuntime().createCallTarget(new ExecuteNativeFunctionNode.NativeFunctionRootNode(this, context, template, true, true));
-        CallTarget constructTarget = Truffle.getRuntime().createCallTarget(ConstructorRootNode.create(functionData, newCallTarget, false, instanceLayout));
-        CallTarget constructNewTarget = Truffle.getRuntime().createCallTarget(ConstructorRootNode.create(functionData, newTargetCallTarget, true, instanceLayout));
-        functionData.setCallTarget(callTarget);
-        functionData.setConstructTarget(constructTarget);
-        functionData.setConstructNewTarget(constructNewTarget);
+
+        JSFunctionData functionData = template.getFunctionData();
+        if (functionData == null) {
+            JSOrdinary instanceLayout = template.getInstanceTemplate().getInternalFieldCount() > 0 ? JSOrdinary.INTERNAL_FIELD_INSTANCE : JSOrdinary.INSTANCE;
+            functionData = JSFunctionData.create(context, template.getLength(), template.getClassName(), template.getPrototypeTemplate() != null, false, false, false);
+            CallTarget callTarget = Truffle.getRuntime().createCallTarget(new ExecuteNativeFunctionNode.NativeFunctionRootNode(this, context, template, false, false));
+            CallTarget newCallTarget = Truffle.getRuntime().createCallTarget(new ExecuteNativeFunctionNode.NativeFunctionRootNode(this, context, template, true, false));
+            CallTarget newTargetCallTarget = Truffle.getRuntime().createCallTarget(new ExecuteNativeFunctionNode.NativeFunctionRootNode(this, context, template, true, true));
+            CallTarget constructTarget = Truffle.getRuntime().createCallTarget(ConstructorRootNode.create(functionData, newCallTarget, false, instanceLayout));
+            CallTarget constructNewTarget = Truffle.getRuntime().createCallTarget(ConstructorRootNode.create(functionData, newTargetCallTarget, true, instanceLayout));
+            functionData.setCallTarget(callTarget);
+            functionData.setConstructTarget(constructTarget);
+            functionData.setConstructNewTarget(constructNewTarget);
+            template.setFunctionData(functionData);
+        }
+
         DynamicObject functionObject = JSFunction.create(realm, functionData);
         template.setFunctionObject(realm, functionObject);
 

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/info/FunctionTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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
@@ -43,6 +43,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.js.runtime.JSRealm;
+import com.oracle.truffle.js.runtime.builtins.JSFunctionData;
 import com.oracle.truffle.trufflenode.GraalJSAccess;
 
 /**
@@ -64,6 +65,7 @@ public final class FunctionTemplate {
     private FunctionTemplate parent;
     private String className = "";
     private boolean readOnlyPrototype;
+    private JSFunctionData functionData;
     private DynamicObject functionObj;
     private final boolean singleFunctionTemplate;
 
@@ -91,6 +93,14 @@ public ObjectTemplate getPrototypeTemplate() {
         return prototypeTemplate;
     }
 
+    public void setFunctionData(JSFunctionData functionData) {
+        this.functionData = functionData;
+    }
+
+    public JSFunctionData getFunctionData() {
+        return functionData;
+    }
+
     public void setFunctionObject(JSRealm realm, DynamicObject functionObj) {
         if (singleFunctionTemplate) {
             this.functionObj = functionObj;

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/node/ExecuteNativeFunctionNode.java

@@ -345,7 +345,7 @@ public Object execute(VirtualFrame frame) {
 
         @Override
         public String getName() {
-            return JSFunction.getFunctionData(template.getFunctionObject(getRealm())).getName();
+            return template.getFunctionData().getName();
         }
 
         @Override