[GR-21590] Update imports

PullRequest: graalpython/2403

Author: tomasstupka

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "17edbb52412c55f5a3903eededc75bf33371bd49" }
+{ "overlay": "3574d704e1a0beb8d217ea2dbde16158ead449d3" }

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -104,6 +104,8 @@ public static void main(String[] args) {
 
     boolean useASTInterpreter = false;
 
+    private String toolInstrumentWarning = null;
+
     protected static void setStartupTime() {
         if (GraalPythonMain.startupNanoTime == -1) {
             GraalPythonMain.startupNanoTime = System.nanoTime();
@@ -124,7 +126,6 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
         List<String> subprocessArgs = new ArrayList<>();
         programArgs = new ArrayList<>();
         boolean posixBackendSpecified = false;
-        boolean toolInstrumentWarning = true;
         for (Iterator<String> argumentIterator = arguments.iterator(); argumentIterator.hasNext();) {
             String arg = argumentIterator.next();
             if (arg.startsWith("-")) {
@@ -203,10 +204,7 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                             if (argStartsWith(arg, "--agentscript", "--coverage", "--cpusampler", "--cputracer", "--dap",
                                             "--heap.", "--heapmonitor", "--insight", "--inspect", "--lsp", "--memtracer", "--sandbox.")) {
                                 useASTInterpreter = true;
-                                if (toolInstrumentWarning) {
-                                    toolInstrumentWarning = false;
-                                    System.out.println("WARNING: Switching to AST interpreter due to instruments option " + arg);
-                                }
+                                toolInstrumentWarning = "WARNING: Switching to AST interpreter due to instruments option " + arg;
                             } else if (arg.startsWith("--llvm.") ||
                                             matchesPythonOption(arg, "CoreHome") ||
                                             matchesPythonOption(arg, "StdLibHome") ||
@@ -620,6 +618,10 @@ protected void launch(Builder contextBuilder) {
             contextBuilder.option("python.PyCachePrefix", "/dev/null");
             contextBuilder.option("python.EnableBytecodeInterpreter", "false");
             contextBuilder.option("python.DisableFrozenModules", "true");
+            if (toolInstrumentWarning != null) {
+                System.out.println(toolInstrumentWarning);
+                toolInstrumentWarning = null;
+            }
         } else {
             contextBuilder.option("python.DontWriteBytecodeFlag", Boolean.toString(dontWriteBytecode));
             if (cachePrefix != null) {

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

@@ -62,7 +62,6 @@
 import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -732,7 +731,9 @@ public final Shape getInstanceShape(PythonLanguage lang) {
 
         Empty.base = Exception;
 
-        HashSet<String> set = PythonUtils.ASSERTIONS_ENABLED ? new HashSet<>() : null;
+        boolean assertionsEnabled = false;
+        assert (assertionsEnabled = true) == true;
+        HashSet<String> set = assertionsEnabled ? new HashSet<>() : null;
         for (PythonBuiltinClassType type : VALUES) {
             // check uniqueness
             assert set.add("" + type.moduleName + "." + type.name) : type.name();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/ObjectHashMap.java

@@ -768,7 +768,7 @@ private void compact() {
                 if (collision) {
                     markCollision(i);
                 }
-            } else if (PythonUtils.ASSERTIONS_ENABLED && index == DUMMY_INDEX) {
+            } else if (index == DUMMY_INDEX) {
                 dummyCount--;
             }
         }

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

@@ -1223,11 +1223,6 @@ public byte[] getHashSecret() {
     }
 
     public boolean isInitialized() {
-        if (PythonUtils.ASSERTIONS_ENABLED && isInitializedNonCompilationFinal != isInitialized) {
-            // We cannot use normal assertion, because those are removed in compilation
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw CompilerDirectives.shouldNotReachHere(String.format("%b != %b", isInitializedNonCompilationFinal, isInitialized));
-        }
         return isInitialized;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java

@@ -99,17 +99,13 @@ public final class PythonUtils {
     public static final PCell[] NO_CLOSURE = new PCell[0];
     public static final ByteArraySupport arrayAccessor;
     public static final ConditionProfile[] DISABLED = new ConditionProfile[]{ConditionProfile.getUncached()};
-    public static final boolean ASSERTIONS_ENABLED;
 
     static {
         if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) {
             arrayAccessor = ByteArraySupport.bigEndian();
         } else {
             arrayAccessor = ByteArraySupport.littleEndian();
         }
-        boolean ae = false;
-        assert (ae = true) == true;
-        ASSERTIONS_ENABLED = ae;
     }
 
     private PythonUtils() {

mx.graalpython/suite.py

@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "410584369e346f9000b59475c381dec882acfb70",
+                "version": "027c48a30c9f18a8753c0b959d1a0e5b5f64c0af",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "410584369e346f9000b59475c381dec882acfb70",
+                "version": "027c48a30c9f18a8753c0b959d1a0e5b5f64c0af",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "410584369e346f9000b59475c381dec882acfb70",
+                "version": "027c48a30c9f18a8753c0b959d1a0e5b5f64c0af",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},