Enable and fix gate test for run-time debug info

Author: dominikmascherbauer

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java

@@ -996,7 +996,7 @@ private int writeOpaqueType(DebugContext context, TypeEntry typeEntry, byte[] bu
         abbrevCode = AbbrevCode.TYPE_POINTER;
         log(context, "  [0x%08x] <1> Abbrev Number %d", pos, abbrevCode.ordinal());
         pos = writeAbbrevCode(abbrevCode, buffer, pos);
-        int pointerSize = dwarfSections.referenceSize();
+        int pointerSize = dwarfSections.pointerSize();
         log(context, "  [0x%08x]     byte_size 0x%x", pos, pointerSize);
         pos = writeAttrData1((byte) pointerSize, buffer, pos);
         log(context, "  [0x%08x]     type 0x%x", pos, refTypeIdx);

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/debug/helper/test_runtime_compilation.py

@@ -43,7 +43,6 @@ def setUp(cls):
         set_up_test()
         gdb_delete_breakpoints()
         gdb_start()
-        gdb_execute("set dwarf-type-signature-fallback main")
 
     @classmethod
     def tearDown(cls):
@@ -136,7 +135,6 @@ def setUp(cls):
         gdb_delete_breakpoints()
         gdb_start()
         set_up_gdb_debughelpers()
-        gdb_execute("set dwarf-type-signature-fallback main")
 
     @classmethod
     def tearDown(cls):

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/debug/helper/test_runtime_deopt.py

@@ -85,9 +85,17 @@ def test_backtrace_with_deopt(self):
         backtrace = gdb_execute('backtrace 5')
         # check if eager deopt frame
         if 'EAGER DEOPT FRAME' in backtrace:
-            self.assertIn('[EAGER DEOPT FRAME] com.oracle.truffle.runtime.OptimizedCallTarget::profiledPERoot', backtrace)
-            self.assertIn('(deoptFrameValues=2, __0=com.oracle.svm.truffle.api.SubstrateOptimizedCallTarget = {...}, __1=java.lang.Object[5] = {...}) at OptimizedCallTarget.java', backtrace)
-            self.assertIn('com.oracle.svm.truffle.api.SubstrateOptimizedCallTargetInstalledCode::doInvoke', backtrace)
+            self.assertIn('in [EAGER DEOPT FRAME]', backtrace)
+            self.assertIn('deoptFrameValues=2', backtrace)
+
+            # check if values are printed correctly and backtrace is not corrupted
+            if 'SubstrateEnterpriseOptimizedCallTarget' in backtrace:
+                self.assertIn('SubstrateEnterpriseOptimizedCallTarget = {...}, __1=java.lang.Object[5] = {...}', backtrace)
+                self.assertIn('SubstrateEnterpriseOptimizedCallTarget::doInvoke', backtrace)
+            else:
+                self.assertIn('SubstrateOptimizedCallTarget = {...}, __1=java.lang.Object[5] = {...})', backtrace)
+                self.assertIn('SubstrateOptimizedCallTargetInstalledCode::doInvoke', backtrace)
+
             self.assertNotIn('??', backtrace)
             self.assertNotIn('Unknown Frame at', backtrace)
         else:
@@ -104,9 +112,13 @@ def test_opaque_types_with_shared_library(self):
 
         # check backtrace
         backtrace = gdb_execute('backtrace 5')
-        self.assertIn('com.oracle.truffle.runtime.OptimizedCallTarget::profiledPERoot', backtrace)
-        self.assertIn('(this=<optimized out>, originalArguments=com.oracle.svm.core.option.RuntimeOptionKey = {...})', backtrace)
-        self.assertNotIn('this=<unknown type in <in-memory@', backtrace)
+        if 'SubstrateEnterpriseOptimizedCallTarget' in backtrace:
+            self.assertIn('SubstrateEnterpriseOptimizedCallTarget::add_I_AAIIZ', backtrace)
+            self.assertNotIn('<unknown type in <in-memory@', backtrace)
+        else:
+            self.assertIn('com.oracle.truffle.runtime.OptimizedCallTarget::profiledPERoot', backtrace)
+            self.assertIn('(this=<optimized out>, originalArguments=com.oracle.svm.core.option.RuntimeOptionKey = {...})', backtrace)
+            self.assertNotIn('this=<unknown type in <in-memory@', backtrace)
 
 
 # redirect unittest output to terminal