fix pyTrue/pyFalse singletons to core

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -33,6 +33,7 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__PACKAGE__;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Arrays;
@@ -98,6 +99,7 @@
 import com.oracle.graal.python.builtins.objects.generator.GeneratorBuiltins;
 import com.oracle.graal.python.builtins.objects.getsetdescriptor.GetSetDescriptorTypeBuiltins;
 import com.oracle.graal.python.builtins.objects.ints.IntBuiltins;
+import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.iterator.ForeignIteratorBuiltins;
 import com.oracle.graal.python.builtins.objects.iterator.IteratorBuiltins;
 import com.oracle.graal.python.builtins.objects.iterator.PZipBuiltins;
@@ -272,6 +274,8 @@ public final class Python3Core implements PythonCore {
     @CompilationFinal private PythonBuiltinClass objectClass;
     @CompilationFinal private PythonBuiltinClass moduleClass;
     @CompilationFinal private PythonBuiltinClass foreignClass;
+    @CompilationFinal private PInt pyTrue;
+    @CompilationFinal private PInt pyFalse;
 
     @CompilationFinal(dimensions = 1) private PythonClass[] errorClasses;
     private final PythonParser parser;
@@ -509,6 +513,9 @@ private void initializeTypes() {
                 }
             }
         }
+        // now initialize well-known objects
+        pyTrue = new PInt(lookupType(PythonBuiltinClassType.Boolean), BigInteger.ONE);
+        pyFalse = new PInt(lookupType(PythonBuiltinClassType.Boolean), BigInteger.ZERO);
     }
 
     private void populateBuiltins() {
@@ -641,4 +648,12 @@ public void setContext(PythonContext context) {
         assert singletonContext == null;
         singletonContext = context;
     }
+
+    public PInt getTrue() {
+        return pyTrue;
+    }
+
+    public PInt getFalse() {
+        return pyFalse;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java

@@ -31,6 +31,7 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
+import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
@@ -112,6 +113,10 @@ public interface PythonCore {
 
     public PythonContext getContext();
 
+    public PInt getTrue();
+
+    public PInt getFalse();
+
     static void writeWarning(TruffleLanguage.Env env, String warning) {
         if (!LIBPOLYGLOT || env.getOptions().get(PythonOptions.VerboseFlag)) {
             write(env, "WARNING: " + warning);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -190,18 +190,9 @@ public PythonNativeObject createNativeObjectWrapper(Object obj) {
     /*
      * Primitive types
      */
-    @CompilationFinal PInt pyTrue = null;
-    @CompilationFinal PInt pyFalse = null;
-
     public PInt createInt(boolean value) {
-        if (value && pyTrue == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            pyTrue = new PInt(lookupClass(PythonBuiltinClassType.Boolean), BigInteger.ONE);
-        } else if (!value && pyFalse == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            pyFalse = new PInt(lookupClass(PythonBuiltinClassType.Boolean), BigInteger.ZERO);
-        }
-        return value ? pyTrue : pyFalse;
+        PythonCore core = getCore();
+        return value ? core.getTrue() : core.getFalse();
     }
 
     public PInt createInt(int value) {