Move debuginfotests into its own module.

This makes native image builds for debuginfo tests independent of svm tests.
Make debuginfotests work with -O2.

Author: dominikmascherbauer

substratevm/mx.substratevm/mx_substratevm.py

@@ -982,9 +982,9 @@ def _collector(x):
             raise Exception('Unexpected output: ' + str(actual_output) + "  !=  " + str(expected_output))
 
 def _debuginfotest(native_image, path, build_only, with_isolates_only, args):
-    sourcepath = mx.project('com.oracle.svm.test').source_dirs()[0]
+    sourcepath = mx.project('com.oracle.svm.test.debug').source_dirs()[0]
     # the header file for foreign types resides at the root of the
-    # com.oracle.svm.test source tree
+    # com.oracle.svm.test.debug source tree
     cincludepath = sourcepath
     for key, value in get_java_properties().items():
         args.append("-D" + key + "=" + value)
@@ -1012,7 +1012,7 @@ def build_debug_test(variant_name, image_name, extra_args):
     # this is a non-layered build
     env['debuginfotest_layered'] = 'no'
 
-    testhello_py = join(suite.dir, 'mx.substratevm', 'testhello.py')
+    testhello_py = join(sourcepath, 'gdb-tests', 'testhello.py')
     testhello_args = [
         # We do not want to step into class initializer, so initialize everything at build time.
         '--initialize-at-build-time=hello',
@@ -1034,7 +1034,7 @@ def build_debug_test(variant_name, image_name, extra_args):
 
 
 def _layereddebuginfotest(native_image, output_path, skip_base_layer, with_isolates_only, args):
-    sourcepath = mx.project('com.oracle.svm.test').source_dirs()[0]
+    sourcepath = mx.project('com.oracle.svm.test.debug').source_dirs()[0]
     cincludepath = sourcepath
 
     for key, value in get_java_properties().items():
@@ -1058,7 +1058,7 @@ def build_layer(layer_path, layer_args):
         build_layer(base_layer_path, [
             '-o', join(base_layer_path, base_layer_name),
         ] + svm_experimental_options([
-            f'-H:LayerCreate={base_layer_name}.nil,module=java.base,package=com.oracle.svm.test'
+            f'-H:LayerCreate={base_layer_name}.nil,module=java.base'
         ]))
 
     app_layer_path = join(output_path, 'app-layer')
@@ -1080,7 +1080,7 @@ def build_layer(layer_path, layer_args):
     env['LD_LIBRARY_PATH'] = base_layer_path
 
     # fetch python test file
-    testhello_py = join(suite.dir, 'mx.substratevm', 'testhello.py')
+    testhello_py = join(sourcepath, 'gdb-tests', 'testhello.py')
 
     # run gdb
     mx.run(gdb_base_command() + ['-x', testhello_py, app_layer], cwd=app_layer_path, env=env)
@@ -1110,13 +1110,13 @@ def testhello_ni_args(cincludepath, sourcepath):
         '--native-compiler-options=-I' + cincludepath,
         '-H:CLibraryPath=' + sourcepath,
         '--native-image-info',
-        '-cp', classpath('com.oracle.svm.test'),
+        '-cp', classpath('com.oracle.svm.test.debug'),
         '-Djdk.graal.LogFile=graal.log',
-        '-DbuildDebugInfoTestExample=true', # set property controlling inclusion of foreign struct header
-        ] + svm_experimental_options([
-            '-H:+SourceLevelDebug',
-            '-H:DebugInfoSourceSearchPath=' + sourcepath,
-        ])
+        '-DbuildDebugInfoTestExample=true',  # set property controlling inclusion of foreign struct header
+    ] + svm_experimental_options([
+        '-H:+SourceLevelDebug',
+        '-H:DebugInfoSourceSearchPath=' + sourcepath,
+    ])
 
 def _gdbdebughelperstest(native_image, path, with_isolates_only, args):
 
@@ -1134,21 +1134,21 @@ def _gdbdebughelperstest(native_image, path, with_isolates_only, args):
                  ('GDB Python API is not available.' if gdb_version == 0 else f'found GDB version {gdb_version}.'))
     # ===============================
 
-    test_proj = mx.dependency('com.oracle.svm.test')
+    test_proj = mx.dependency('com.oracle.svm.test.debug')
     test_source_path = test_proj.source_dirs()[0]
     tutorial_proj = mx.dependency('com.oracle.svm.tutorial')
     tutorial_c_source_dir = join(tutorial_proj.dir, 'native')
     tutorial_source_path = tutorial_proj.source_dirs()[0]
 
-    test_python_source_dir = join(test_source_path, 'com', 'oracle', 'svm', 'test', 'debug', 'helper')
+    test_python_source_dir = join(test_source_path, 'gdb-tests')
     test_pretty_printer_py = join(test_python_source_dir, 'test_pretty_printer.py')
     test_cinterface_py = join(test_python_source_dir, 'test_cinterface.py')
     test_class_loader_py = join(test_python_source_dir, 'test_class_loader.py')
     test_settings_py = join(test_python_source_dir, 'test_settings.py')
     test_svm_util_py = join(test_python_source_dir, 'test_svm_util.py')
 
     test_pretty_printer_args = [
-        '-cp', classpath('com.oracle.svm.test'),
+        '-cp', classpath('com.oracle.svm.test.debug'),
         # We do not want to step into class initializer, so initialize everything at build time.
         '--initialize-at-build-time=com.oracle.svm.test.debug.helper',
         'com.oracle.svm.test.debug.helper.PrettyPrinterTest'
@@ -1159,11 +1159,11 @@ def _gdbdebughelperstest(native_image, path, with_isolates_only, args):
         '-cp', tutorial_proj.output_dir()
     ]
     test_class_loader_args = [
-        '-cp', classpath('com.oracle.svm.test'),
-        '-Dsvm.test.missing.classes=' + classpath('com.oracle.svm.test.missing.classes'),
+        '-cp', classpath('com.oracle.svm.test.debug'),
+        '-Dcom.oracle.svm.test.debug.missing.classes=' + classpath('com.oracle.svm.test.debug.missing.classes'),
         '--initialize-at-build-time=com.oracle.svm.test.debug.helper',
         # We need the static initializer of the ClassLoaderTest to run at image build time
-        '--initialize-at-build-time=com.oracle.svm.test.missing.classes',
+        '--initialize-at-build-time=com.oracle.svm.test.debug.missing.classes',
         'com.oracle.svm.test.debug.helper.ClassLoaderTest'
     ]
 
@@ -1253,13 +1253,13 @@ def _runtimedebuginfotest(native_image, output_path, with_isolates_only, args=No
 
     args = [] if args is None else args
 
-    test_proj = mx.dependency('com.oracle.svm.test')
+    test_proj = mx.dependency('com.oracle.svm.test.debug')
     test_source_path = test_proj.source_dirs()[0]
 
-    test_python_source_dir = join(test_source_path, 'com', 'oracle', 'svm', 'test', 'debug', 'helper')
+    test_python_source_dir = join(test_source_path, 'gdb-tests')
     test_runtime_compilation_py = join(test_python_source_dir, 'test_runtime_compilation.py')
     test_runtime_deopt_py = join(test_python_source_dir, 'test_runtime_deopt.py')
-    testdeopt_js = join(suite.dir, 'mx.substratevm', 'testdeopt.js')
+    testdeopt_js = join(test_python_source_dir, 'testdeopt.js')
 
     # clean / create output directory
     if exists(output_path):
@@ -1273,9 +1273,11 @@ def _runtimedebuginfotest(native_image, output_path, with_isolates_only, args=No
         '-DbuildDebugInfoTestExample=true',
         '--native-compiler-options=-I' + test_source_path,
         '-o', join(output_path, 'runtimedebuginfotest'),
-        '-cp', classpath('com.oracle.svm.test'),
+        '-cp', classpath('com.oracle.svm.test.debug'),
         # We do not want to step into class initializer, so initialize everything at build time.
         '--initialize-at-build-time=com.oracle.svm.test.debug.helper',
+        # We need access to ModuleSupport
+        '--add-exports=org.graalvm.nativeimage.base/com.oracle.svm.util=ALL-UNNAMED',
         '--features=com.oracle.svm.test.debug.helper.RuntimeCompileDebugInfoTest$RegisterMethodsFeature',
         'com.oracle.svm.test.debug.helper.RuntimeCompileDebugInfoTest',
     ] + svm_experimental_options([
@@ -1876,7 +1878,7 @@ def debuginfotest(args, config=None):
 def layereddebuginfotest(args, config=None):
     """
     Builds a layered native image and tests it with gdb.
-    Base layer: java.base, com.oracle.svm.test
+    Base layer: java.base
     App Layer: hello.Hello
     """
     parser = ArgumentParser(prog='mx layereddebuginfotest')

substratevm/mx.substratevm/suite.py

@@ -1172,10 +1172,6 @@
                     "jdk.internal.misc",
                     "sun.security.jca",
                 ],
-                "jdk.internal.vm.ci" : [
-                    "jdk.vm.ci.code",
-                    "jdk.vm.ci.meta",
-                ],
             },
             "checkstyle": "com.oracle.svm.test",
             "checkstyleVersion" : "10.21.0",
@@ -1189,19 +1185,46 @@
             "jacoco" : "exclude",
         },
 
-        "com.oracle.svm.test.missing.classes": {
+        "com.oracle.svm.test.debug": {
             "subDir": "src",
             "sourceDirs": ["src"],
             "dependencies": [
+                "sdk:NATIVEIMAGE",
+                "SVM",
             ],
+            "requiresConcealed": {
+                "jdk.internal.vm.ci": [
+                    "jdk.vm.ci.code",
+                    "jdk.vm.ci.meta",
+                ],
+            },
+            "checkstyle": "com.oracle.svm.test",
+            "workingSets": "SVM",
             "annotationProcessors": [
+                "compiler:GRAAL_PROCESSOR",
+                "SVM_PROCESSOR",
+            ],
+            "javaCompliance": "21+",
+            "spotbugs": "false",
+            "jacoco": "exclude",
+            "testProject": True,
+        },
+
+        "com.oracle.svm.test.debug.missing.classes": {
+            "subDir": "src",
+            "sourceDirs": ["src"],
+            "dependencies": [
             ],
             "checkstyle": "com.oracle.svm.test",
-            "javaCompliance" : "21+",
             "workingSets": "SVM",
+            "annotationProcessors": [
+                "compiler:GRAAL_PROCESSOR",
+                "SVM_PROCESSOR",
+            ],
+            "javaCompliance": "21+",
             "spotbugs": "false",
+            "jacoco": "exclude",
             "testProject": True,
-            "jacoco" : "exclude",
         },
 
         "com.oracle.svm.with.space.test": {
@@ -2489,27 +2512,19 @@
             "com.oracle.svm.test",
             "com.oracle.svm.configure.test",
             "com.oracle.svm.graal.test",
+            "com.oracle.svm.test.debug",
+            "com.oracle.svm.test.debug.missing.classes",
             "SVM_TEST_RESOURCE_WITH_SPACE",
           ],
           "distDependencies": [
             "mx:JUNIT_TOOL",
             "sdk:NATIVEIMAGE",
             "SVM",
             "SVM_CONFIGURE",
-            "SVM_TEST_MISSING_CLASSES",
           ],
           "testDistribution" : True,
         },
 
-        "SVM_TEST_MISSING_CLASSES" : {
-            "subDir": "src",
-            "relpath" : True,
-            "dependencies": [
-                "com.oracle.svm.test.missing.classes"
-            ],
-            "testDistribution": True,
-        },
-
         # Special test distribution used for testing inclusion of resources from jar files with a space in their name.
         # The space in the distribution name is intentional.
         "SVM_TESTS WITH SPACE" : {

substratevm/src/com.oracle.svm.test.missing.classes/src/com/oracle/svm/test/missing/classes/TestClass.java renamed to substratevm/src/com.oracle.svm.test.debug.missing.classes/src/com/oracle/svm/test/debug/missing/classes/TestClass.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.test.missing.classes;
+package com.oracle.svm.test.debug.missing.classes;
 
 public class TestClass {
     public static final Object CONSTANT_OBJECT_FIELD = 42;

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/debug/CInterfaceDebugTestDirectives.java renamed to substratevm/src/com.oracle.svm.test.debug/src/com/oracle/svm/test/debug/CInterfaceDebugTestDirectives.java

@@ -44,18 +44,18 @@ public class ClassLoaderTest {
 
     static {
         try {
-            Path path = Paths.get(System.getProperty("svm.test.missing.classes"));
+            Path path = Paths.get(System.getProperty("com.oracle.svm.test.debug.missing.classes"));
             URL[] urls = new URL[]{path.toUri().toURL()};
             try (URLClassLoader classLoader = new URLClassLoader("testClassLoader", urls, ClassLoaderTest.class.getClassLoader())) {
-                testClass = classLoader.loadClass("com.oracle.svm.test.missing.classes.TestClass");
+                testClass = classLoader.loadClass("com.oracle.svm.test.debug.missing.classes.TestClass");
                 testObj = testClass.getConstructor().newInstance();
                 instanceMethod = testClass.getDeclaredMethod("instanceMethod");
             } catch (IOException | ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
                 throw new RuntimeException(e);
             }
             // load the same class from two different classLoaders
             try (URLClassLoader classLoader = new URLClassLoader(urls, ClassLoaderTest.class.getClassLoader())) {
-                testClass2 = classLoader.loadClass("com.oracle.svm.test.missing.classes.TestClass");
+                testClass2 = classLoader.loadClass("com.oracle.svm.test.debug.missing.classes.TestClass");
                 testObj2 = testClass2.getConstructor().newInstance();
                 instanceMethod2 = testClass2.getDeclaredMethod("instanceMethod");
             } catch (IOException | ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/debug/CStructTests.java renamed to substratevm/src/com.oracle.svm.test.debug/src/com/oracle/svm/test/debug/CStructTests.java

@@ -151,7 +151,7 @@ static void testHashMap(HashMap<String, String> strMap, Map<Object, Object> mixe
     @SuppressWarnings("unused")
     @NeverInline("For testing purposes")
     static void testLambda(Function<String, String> lambda) {
-        blackhole(lambda);
+        lambda.apply("test");
     }
 
     @SuppressWarnings("unused")
@@ -166,6 +166,7 @@ static void blackhole(Object... value) {
     }
 
     static ExampleClass setupExampleObject(boolean recursive) {
+        ExampleClass.s1 += "!"; // Ensure the static field ends up in the debug info.
         ExampleClass example = new ExampleClass();
         example.f10 = new ExampleClass(10, 20, (short) 30, '\40', (byte) 50, true, "60", Day.Sunday, new Object(), null);
         example.f9 = new ArrayList<>(List.of(example.f10, new ExampleClass()));

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/debug/helper/ClassLoaderTest.java renamed to substratevm/src/com.oracle.svm.test.debug/src/com/oracle/svm/test/debug/helper/ClassLoaderTest.java

@@ -25,8 +25,6 @@
 
 package com.oracle.svm.test.debug.helper;
 
-import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,6 +44,7 @@
 import com.oracle.svm.core.AlwaysInline;
 import com.oracle.svm.core.NeverInline;
 import com.oracle.svm.core.c.InvokeJavaFunctionPointer;
+import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.graal.SubstrateGraalUtils;
 import com.oracle.svm.graal.hosted.runtimecompilation.RuntimeCompilationFeature;
 import com.oracle.svm.graal.meta.SubstrateMethod;
@@ -256,7 +255,7 @@ private static SubstrateMethod prepareMethodForRuntimeCompilation(BeforeAnalysis
             try {
                 return runtimeCompilationFeature.prepareMethodForRuntimeCompilation(holder.getMethod(methodName, signature), config);
             } catch (NoSuchMethodException ex) {
-                throw shouldNotReachHere(ex);
+                throw VMError.shouldNotReachHere(ex);
             }
         }
     }