allow building a native image without CoverageTool or CPUSampler on the classpath

Author: timfel

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

@@ -40,8 +40,6 @@
 import java.util.function.Supplier;
 import java.util.logging.Level;
 
-import org.graalvm.nativeimage.ImageInfo;
-
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.modules.ArrayModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.AstModuleBuiltins;
@@ -193,6 +191,8 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 
+import org.graalvm.nativeimage.ImageInfo;
+
 /**
  * The core is intended to the immutable part of the interpreter, including most modules and most
  * types.
@@ -265,6 +265,24 @@ private static final String[] initializeCoreFiles() {
 
     private final PythonBuiltins[] builtins;
 
+    private static final boolean hasCoverageTool;
+    private static final boolean hasProfilerTool;
+    static {
+        Class<?> c = null;
+        try {
+            c = Class.forName("com.oracle.truffle.tools.coverage.CoverageTracker");
+        } catch (LinkageError | ClassNotFoundException e) {
+        }
+        hasCoverageTool = c != null;
+        c = null;
+        try {
+            c = Class.forName("com.oracle.truffle.tools.profiler.CPUSampler");
+        } catch (LinkageError | ClassNotFoundException e) {
+        }
+        hasProfilerTool = c != null;
+        c = null;
+    }
+
     private static final PythonBuiltins[] initializeBuiltins() {
         List<PythonBuiltins> builtins = new ArrayList<>(Arrays.asList(
                         new BuiltinConstructors(),
@@ -379,10 +397,14 @@ private static final PythonBuiltins[] initializeBuiltins() {
                         new LZMADecompressorBuiltins(),
                         new MultiprocessingModuleBuiltins(),
                         new SemLockBuiltins(),
-                        new TraceModuleBuiltins(),
-                        new LsprofModuleBuiltins(),
-                        LsprofModuleBuiltins.newProfilerBuiltins(),
                         new GraalPythonModuleBuiltins()));
+        if (hasCoverageTool) {
+            builtins.add(new TraceModuleBuiltins());
+        }
+        if (hasProfilerTool) {
+            builtins.add(new LsprofModuleBuiltins());
+            builtins.add(LsprofModuleBuiltins.newProfilerBuiltins());
+        }
         if (!TruffleOptions.AOT) {
             ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class, Python3Core.class.getClassLoader());
             for (PythonBuiltins builtin : providers) {

graalpython/lib-graalpython/_lsprof.py

@@ -72,7 +72,10 @@ def getstats(self):
     return getstats
 
 
-Profiler.getstats = make_wrapped_getstats(Profiler.getstats)
+try:
+    Profiler.getstats = make_wrapped_getstats(Profiler.getstats)
+except NameError:
+    pass # Profiler isn't available, we've been built without tools
 
 
 # cleanup