[GR-21590] Update imports.

PullRequest: graalpython/3750

Author: timfel

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "039785349ad5fead7a5bb11edb3845879f1a8798" }
+{ "overlay": "e4b020a3723f37633632bebc0b715fa0c0b80ed9" }

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

@@ -435,14 +435,14 @@ private static TruffleString[] initializeCoreFiles() {
 
     private final PythonBuiltins[] builtins;
 
-    private static final boolean hasProfilerTool;
+    public static final boolean HAS_PROFILER_TOOL;
     static {
         Class<?> c = null;
         try {
             c = Class.forName("com.oracle.truffle.tools.profiler.CPUSampler");
         } catch (LinkageError | ClassNotFoundException e) {
         }
-        hasProfilerTool = c != null;
+        HAS_PROFILER_TOOL = c != null;
         c = null;
     }
 
@@ -797,7 +797,7 @@ private static PythonBuiltins[] initializeBuiltins(TruffleLanguage.Env env) {
                         // _tokenizer
                         new TokenizeModuleBuiltins(),
                         new TokenizerIterBuiltins()));
-        if (hasProfilerTool) {
+        if (HAS_PROFILER_TOOL) {
             builtins.add(new LsprofModuleBuiltins());
             builtins.add(new ProfilerBuiltins());
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/lsprof/ProfilerBuiltins.java

@@ -54,6 +54,7 @@
 import com.oracle.graal.python.annotations.Slot.SlotSignature;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
@@ -97,14 +98,17 @@ abstract static class LsprofNew extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
         Profiler doit(Object cls, @SuppressWarnings("unused") Object[] args, @SuppressWarnings("unused") PKeyword[] kwargs) {
-            PythonContext context = getContext();
-            TruffleLanguage.Env env = context.getEnv();
-            Map<String, InstrumentInfo> instruments = env.getInstruments();
-            InstrumentInfo instrumentInfo = instruments.get(CPUSamplerInstrument.ID);
-            if (instrumentInfo != null) {
-                CPUSampler sampler = env.lookup(instrumentInfo, CPUSampler.class);
-                if (sampler != null) {
-                    return PFactory.createProfiler(context.getLanguage(), cls, TypeNodes.GetInstanceShape.executeUncached(cls), sampler);
+            if (Python3Core.HAS_PROFILER_TOOL) {
+                // Avoid ClassNotFoundException
+                PythonContext context = getContext();
+                TruffleLanguage.Env env = context.getEnv();
+                Map<String, InstrumentInfo> instruments = env.getInstruments();
+                InstrumentInfo instrumentInfo = instruments.get(CPUSamplerInstrument.ID);
+                if (instrumentInfo != null) {
+                    CPUSampler sampler = env.lookup(instrumentInfo, CPUSampler.class);
+                    if (sampler != null) {
+                        return PFactory.createProfiler(context.getLanguage(), cls, TypeNodes.GetInstanceShape.executeUncached(cls), sampler);
+                    }
                 }
             }
             throw PRaiseNode.raiseStatic(this, PythonBuiltinClassType.NotImplementedError, ErrorMessages.COVERAGE_TRACKER_NOT_AVAILABLE);

mx.graalpython/suite.py

@@ -45,31 +45,31 @@
             },
             {
                 "name": "sdk",
-                "version": "6086ff083909852c9b785594493ad2fb10e9c917",
+                "version": "46e36ff52c61d4d3d973dcf3055b9891ae2f0b6e",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "6086ff083909852c9b785594493ad2fb10e9c917",
+                "version": "46e36ff52c61d4d3d973dcf3055b9891ae2f0b6e",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "6086ff083909852c9b785594493ad2fb10e9c917",
+                "version": "46e36ff52c61d4d3d973dcf3055b9891ae2f0b6e",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "6086ff083909852c9b785594493ad2fb10e9c917",
+                "version": "46e36ff52c61d4d3d973dcf3055b9891ae2f0b6e",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},