[GR-6160] Temporarily avoid static fields in PolyglotRootNode.

The-Alchemist · Sep 22, 2017 · 4ce3097 · 4ce3097
1 parent ca62113
commit 4ce3097
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/truffle/src/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotRootNode.java b/truffle/src/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotRootNode.java
@@ -51,8 +51,6 @@
 
 abstract class PolyglotRootNode extends RootNode {
 
-    private static final CallTarget VOID_TARGET = Truffle.getRuntime().createCallTarget(new VoidRootNode());
-
     final PolyglotEngine engine;
 
     PolyglotRootNode(PolyglotEngine engine) {
@@ -77,7 +75,7 @@ static CallTarget createExecuteSymbol(PolyglotEngine engine, Class<?> type) {
         RootNode symbolNode;
         if (isPrimitiveType(type)) {
             // no conversion necessary just return value
-            return VOID_TARGET;
+            return Truffle.getRuntime().createCallTarget(new VoidRootNode());
         } else {
             symbolNode = new ForeignExecuteRootNode(engine, (Class<? extends TruffleObject>) type);
         }
@@ -89,7 +87,7 @@ static CallTarget createAsJava(PolyglotEngine engine, Class<?> type) {
         RootNode symbolNode;
         if (isPrimitiveType(type)) {
             // no conversion necessary just return value
-            return VOID_TARGET;
+            return Truffle.getRuntime().createCallTarget(new VoidRootNode());
         } else {
             symbolNode = new AsJavaRootNode(engine, (Class<? extends TruffleObject>) type);
         }