Incorporate feedback

Author: dominikmascherbauer

substratevm/mx.substratevm/mx_substratevm.py

@@ -1069,16 +1069,16 @@ def build_layer(layer_path, layer_args):
         '-o', join(app_layer_path, app_layer_name),
         # We do not want to step into class initializer, so initialize everything at build time.
         '--initialize-at-build-time=hello',
-        'hello.Hello'
+        'hello.Hello',
     ] + svm_experimental_options([
         f'-H:LayerUse={join(base_layer_path, base_layer_name)}.nil',
+        f'-H:LinkerRPath={base_layer_path}'
     ]))
 
     # prepare environment
     env = os.environ.copy()
     env['debuginfotest_isolates'] = 'yes'
     env['debuginfotest_layered'] = 'yes'
-    env['LD_LIBRARY_PATH'] = base_layer_path
 
     # fetch python test file
     testhello_py = join(sourcepath, 'gdb-tests', 'testhello.py')

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java

@@ -122,6 +122,8 @@ class NativeImageDebugInfoProvider extends SharedDebugInfoProvider {
     private final int primitiveStartOffset;
     private final int referenceStartOffset;
     private final Set<HostedMethod> allOverrides;
+    private final boolean buildingImageLayer;
+    private final int layerNumber;
 
     NativeImageDebugInfoProvider(DebugContext debug, NativeImageCodeCache codeCache, NativeImageHeap heap, NativeLibraries nativeLibs, HostedMetaAccess metaAccess,
                     RuntimeConfiguration runtimeConfiguration) {
@@ -143,6 +145,9 @@ class NativeImageDebugInfoProvider extends SharedDebugInfoProvider {
                         .flatMap(m -> Arrays.stream(m.getImplementations())
                                         .filter(Predicate.not(m::equals)))
                         .collect(Collectors.toSet());
+
+        buildingImageLayer = ImageLayerBuildingSupport.buildingImageLayer();
+        layerNumber = DynamicImageLayerInfo.getCurrentLayerNumber();
     }
 
     @SuppressWarnings("unused")
@@ -589,14 +594,13 @@ private void processFieldEntries(HostedType type, StructureTypeEntry structureTy
         }
 
         for (ResolvedJavaField field : type.getStaticFields()) {
-            assert field instanceof HostedField;
+            HostedField hField = (HostedField) field;
             /*
              * If we are in a layered build only add debug info for a static field if it is
              * installed in the current layer.
              */
-            if (!ImageLayerBuildingSupport.buildingImageLayer() ||
-                            (((HostedField) field).hasInstalledLayerNum() && DynamicImageLayerInfo.getCurrentLayerNumber() == StaticFieldsSupport.getInstalledLayerNum(field))) {
-                structureTypeEntry.addField(createFieldEntry((HostedField) field, structureTypeEntry));
+            if (!buildingImageLayer || (hField.hasInstalledLayerNum() && layerNumber == hField.getInstalledLayerNum())) {
+                structureTypeEntry.addField(createFieldEntry(hField, structureTypeEntry));
             }
         }
     }

substratevm/src/com.oracle.svm.test.debug/src/com/oracle/svm/test/debug/helper/PrettyPrinterTest.java

@@ -154,9 +154,17 @@ static void testLambda(Function<String, String> lambda) {
         lambda.apply("test");
     }
 
+    @NeverInline("Prevent constant folding")
+    private static boolean alwaysFalse() {
+        return false;
+    }
+
     @SuppressWarnings("unused")
     @NeverInline("For testing purposes")
     static void testClassType(Class<?> clazz, Holder dyn) {
+        if (alwaysFalse()) {
+            staticHolder = null; // Prevent constant folding of staticHolder.
+        }
         blackhole(clazz, dyn, staticHolder.c, staticHolder.o);
     }
 
@@ -197,6 +205,5 @@ public static void main(String[] args) {
 
         testLambda(str -> str);
         testClassType(String.class, new Holder(String.class, String.class));
-        staticHolder = null;
     }
 }

substratevm/src/com.oracle.svm.test.debug/src/gdb-tests/test_cinterface.py

@@ -100,6 +100,27 @@ def test_auto_reload(self):
         self.assertIn('SubstrateVM FrameFilter', exec_string)
 
 
+class TestSVMFrameDecorator(unittest.TestCase):
+    @classmethod
+    def setUp(cls):
+        cls.maxDiff = None
+        set_up_test()
+        gdb_start()
+        set_up_gdb_debughelpers()
+
+    @classmethod
+    def tearDown(cls):
+        gdb_delete_breakpoints()
+        gdb_kill()
+
+    def test_object_file_names_in_backtrace(self):
+        gdb_set_breakpoint("com.oracle.svm.tutorial.CInterfaceTutorial::releaseData")
+        gdb_continue()
+        backtrace = gdb_execute("backtrace")
+        self.assertIn('in cinterfacetutorial', backtrace)
+        self.assertIn('in libcinterfacetutorial.so', backtrace)
+
+
 class TestCInterface(unittest.TestCase):
     @classmethod
     def setUp(cls):