Bugfixes and cleanup

Author: dominikmascherbauer

substratevm/debug/gdbpy/gdb-debughelpers.py

@@ -234,6 +234,7 @@ def __init__(self):
         self.heap_base_regnum = try_or_else(lambda: int(gdb.parse_and_eval('(int)__svm_heap_base_regnum')), 0, gdb.error)
         self.frame_size_status_mask = try_or_else(lambda: int(gdb.parse_and_eval('(int)__svm_frame_size_status_mask')), 0, gdb.error)
         self.object_type = gdb.lookup_type("java.lang.Object")
+        self.object_header_type = gdb.lookup_type("_objhdr")
         self.stack_type = gdb.lookup_type("long")
         self.hub_type = gdb.lookup_type("java.lang.Class")
         self.classloader_type = gdb.lookup_type("java.lang.ClassLoader")
@@ -372,6 +373,12 @@ def get_java_string(self, obj: gdb.Value, gdb_output_string: bool = False) -> st
         trace(f'<SVMUtil> - get_java_string({hex(self.get_adr(obj))}) = {result}')
         return result
 
+    def get_hub_field(self, obj: gdb.Value) -> gdb.Value:
+        try:
+            return obj.cast(self.object_header_type)[self.hub_field_name]
+        except gdb.error:
+            return self.null
+        
     def get_obj_field(self, obj: gdb.Value, field_name: str, default: gdb.Value = None) -> gdb.Value:
         try:
             return obj[field_name]
@@ -387,7 +394,7 @@ def get_int_field(self, obj: gdb.Value, field_name: str, default: int = 0) -> in
 
     def get_classloader_namespace(self, obj: gdb.Value) -> str:
         try:
-            hub = self.get_obj_field(obj, SVMUtil.hub_field_name)
+            hub = self.get_hub_field(obj)
             if self.is_null(hub):
                 return ""
 
@@ -422,7 +429,7 @@ def get_rtt(self, obj: gdb.Value) -> gdb.Type:
         if self.get_uncompressed_type(SVMUtil.get_basic_type(obj.type)).code == gdb.TYPE_CODE_UNION:
             obj = self.cast_to(obj, self.object_type)
 
-        hub = self.get_obj_field(obj, SVMUtil.hub_field_name)
+        hub = self.get_hub_field(obj)
         if self.is_null(hub):
             return static_type
 
@@ -506,15 +513,18 @@ def get_base_class(self, t: gdb.Type) -> gdb.Type:
 
     def find_shared_types(self, type_list: list, t: gdb.Type) -> list:  # list[gdb.Type]
         if len(type_list) == 0:
+            # fill type list -> java.lang.Object will be last element
             while t != self.object_type:
                 type_list += [t]
                 t = self.get_base_class(t)
             return type_list
         else:
+            # find first type in hierarchy of t that is contained in the type list
             while t != self.object_type:
                 if t in type_list:
                     return type_list[type_list.index(t):]
                 t = self.get_base_class(t)
+            # if nothing matches return the java.lang.Object
             return [self.object_type]
 
     def is_java_type(self, t: gdb.Type) -> bool:
@@ -847,6 +857,8 @@ def infer_generic_types(self) -> str:
         for i, elem in enumerate(self, 1):
             if not self.__svm_util.is_null(elem):  # check for null values
                 elem_type = self.__svm_util.find_shared_types(elem_type, self.__svm_util.get_rtt(elem))
+            # java.lang.Object will always be the last element in a type list
+            # if it is the only element in the list we cannot infer more than java.lang.Object
             if (len(elem_type) > 0 and elem_type[0] == self.__svm_util.object_type) or (0 <= svm_infer_generics.value <= i):
                 break
 
@@ -924,6 +936,8 @@ def infer_generic_types(self) -> tuple:  # (str, str):
                 key_type = self.__svm_util.find_shared_types(key_type, self.__svm_util.get_rtt(key))
             if not self.__svm_util.is_null(value) and (len(value_type) == 0 or value_type[0] != self.__svm_util.object_type):
                 value_type = self.__svm_util.find_shared_types(value_type, self.__svm_util.get_rtt(value))
+            # java.lang.Object will always be the last element in a type list
+            # if it is the only element in the list we cannot infer more than java.lang.Object
             if (0 <= svm_infer_generics.value <= i) or (len(key_type) > 0 and key_type[0] == self.__svm_util.object_type and
                                                        len(value_type) > 0 and value_type[0] == self.__svm_util.object_type):
                 break
@@ -1010,6 +1024,8 @@ def infer_generic_types(self) -> tuple:  # (str, str):
                 key_type = self.__svm_util.find_shared_types(key_type, self.__svm_util.get_rtt(key))
             if not self.__svm_util.is_null(value) and (len(value_type) == 0 or value_type[0] != self.__svm_util.object_type):
                 value_type = self.__svm_util.find_shared_types(value_type, self.__svm_util.get_rtt(value))
+            # java.lang.Object will always be the last element in a type list
+            # if it is the only element in the list we cannot infer more than java.lang.Object
             if (0 <= svm_infer_generics.value <= i) or (len(key_type) > 0 and key_type[0] == self.__svm_util.object_type and
                                                         len(value_type) > 0 and value_type[0] == self.__svm_util.object_type):
                 break

substratevm/mx.substratevm/mx_substratevm.py

@@ -1135,7 +1135,6 @@ def run_debug_test(image_name: str, testfile: str, source_path: str, with_isolat
                 else:
                     c_command = ['cl', '-MD', join(tutorial_c_source_dir, 'cinterfacetutorial.c'), '-I.',
                                  'libcinterfacetutorial.lib']
-                mx.log(' '.join(c_command))
                 mx.run(c_command, cwd=build_dir)
         if mx.get_os() == 'linux':
             logfile = join(path, pathlib.Path(testfile).stem + ('' if with_isolates else '_no_isolates') + '.log')
@@ -1146,7 +1145,6 @@ def run_debug_test(image_name: str, testfile: str, source_path: str, with_isolat
                 '-iex', f"set auto-load safe-path {join(build_dir, 'gdb-debughelpers.py')}",
                 '-x', testfile, join(build_dir, image_name)
             ]
-            log_gdb_command(gdb_command)
             # unittest may result in different exit code, nonZeroIsFatal ensures that we can go on with other test
             return mx.run(gdb_command, cwd=build_dir, nonZeroIsFatal=False)
         return 0
@@ -1173,10 +1171,6 @@ def run_debug_test(image_name: str, testfile: str, source_path: str, with_isolat
         mx.abort(status)
 
 
-def log_gdb_command(gdb_command):
-    mx.log(' '.join([(f"'{c}'" if ' ' in c else c) for c in gdb_command]))
-
-
 def _runtimedebuginfotest(native_image, output_path, args=None):
     """Build and run the runtimedebuginfotest"""
 
@@ -1230,7 +1224,6 @@ def _runtimedebuginfotest(native_image, output_path, args=None):
         '-iex', f"set auto-load safe-path {join(output_path, 'gdb-debughelpers.py')}",
         '-x', test_runtime_compilation_py, runtime_compile_binary
     ]
-    log_gdb_command(gdb_command)
     # unittest may result in different exit code, nonZeroIsFatal ensures that we can go on with other test
     status = mx.run(gdb_command, cwd=output_path, nonZeroIsFatal=False)
 
@@ -1253,7 +1246,6 @@ def run_js_test(eager: bool = False):
             '-iex', f"set auto-load safe-path {join(output_path, 'gdb-debughelpers.py')}",
             '-x', test_runtime_deopt_py, '--args', js_launcher, testdeopt_js
         ]
-        log_gdb_command(gdb_command)
         # unittest may result in different exit code, nonZeroIsFatal ensures that we can go on with other test
         return mx.run(gdb_command, cwd=output_path, nonZeroIsFatal=False)
 

substratevm/mx.substratevm/testhello.py

@@ -886,7 +886,7 @@ def test():
     exec_string = execute("info types com.oracle.svm.test.debug.CStructTests\$")
     rexp = [
         fr"{spaces_pattern}typedef composite_struct \* com\.oracle\.svm\.test\.debug\.CStructTests\$CompositeStruct;",
-        fr"{spaces_pattern}typedef int32_t \* com\.oracle\.svm\.test\.debug\.CStructTests\$MyCIntPointer;",
+        fr"{spaces_pattern}typedef int \* com\.oracle\.svm\.test\.debug\.CStructTests\$MyCIntPointer;",
         fr"{spaces_pattern}typedef simple_struct \* com\.oracle\.svm\.test\.debug\.CStructTests\$SimpleStruct;",
         fr"{spaces_pattern}typedef simple_struct2 \* com\.oracle\.svm\.test\.debug\.CStructTests\$SimpleStruct2;",
         fr"{spaces_pattern}typedef weird \* com\.oracle\.svm\.test\.debug\.CStructTests\$Weird;"]
@@ -927,8 +927,8 @@ def test():
             fr"/\*{spaces_pattern}24{spaces_pattern}\|{spaces_pattern}4{spaces_pattern}\*/{spaces_pattern}float f_float;",
             fr"/\*{spaces_pattern}XXX{spaces_pattern}4-byte hole{spaces_pattern}\*/",
             fr"/\*{spaces_pattern}32{spaces_pattern}\|{spaces_pattern}8{spaces_pattern}\*/{spaces_pattern}double f_double;",
-            fr"/\*{spaces_pattern}40{spaces_pattern}\|{spaces_pattern}32{spaces_pattern}\*/{spaces_pattern}int32_t a_int\[8\];",
-            fr"/\*{spaces_pattern}72{spaces_pattern}\|{spaces_pattern}12{spaces_pattern}\*/{spaces_pattern}(u)?int8_t a_char\[12\];",
+            fr"/\*{spaces_pattern}40{spaces_pattern}\|{spaces_pattern}32{spaces_pattern}\*/{spaces_pattern}int a_int\[8\];",
+            fr"/\*{spaces_pattern}72{spaces_pattern}\|{spaces_pattern}12{spaces_pattern}\*/{spaces_pattern}char a_char\[12\];",
             fr"/\*{spaces_pattern}XXX{spaces_pattern}4-byte padding{spaces_pattern}\*/",
             fr"{spaces_pattern}/\* total size \(bytes\):{spaces_pattern}88 \*/",
             fr"{spaces_pattern}}} \*"]