8273967.cr0.patch

Author: dcubed-ojdk

src/hotspot/os/bsd/decoder_machO.cpp

@@ -52,6 +52,12 @@ bool MachODecoder::demangle(const char* symbol, char *buf, int buflen) {
 
 bool MachODecoder::decode(address addr, char *buf,
       int buflen, int *offset, const void *mach_base) {
+  if (addr == (address)(intptr_t)-1) {
+    // dladdr() in macOS12/Monterey returns success for -1, but that addr value
+    // won't work in this function. Should have been handled by the caller.
+    ShouldNotReachHere();
+    return false;
+  }
   struct symtab_command * symt = (struct symtab_command *)
     mach_find_command((struct mach_header_64 *)mach_base, LC_SYMTAB);
   if (symt == NULL) {

src/hotspot/os/bsd/os_bsd.cpp

@@ -878,7 +878,9 @@ bool os::address_is_in_vm(address addr) {
 }
 
 
+#if defined(__APPLE__)
 #define MACH_MAXSYMLEN 256
+#endif
 
 bool os::dll_address_to_function_name(address addr, char *buf,
                                       int buflen, int *offset,
@@ -887,9 +889,18 @@ bool os::dll_address_to_function_name(address addr, char *buf,
   assert(buf != NULL, "sanity check");
 
   Dl_info dlinfo;
-  char localbuf[MACH_MAXSYMLEN];
 
   if (dladdr((void*)addr, &dlinfo) != 0) {
+#if defined(__APPLE__)
+    if (addr == (address)(intptr_t)-1) {
+      // dladdr() in macOS12/Monterey returns success for -1, but that addr
+      // value should not be allowed to work to avoid confusion.
+      buf[0] = '\0';
+      if (offset) *offset = -1;
+      return false;
+    }
+#endif
+
     // see if we have a matching symbol
     if (dlinfo.dli_saddr != NULL && dlinfo.dli_sname != NULL) {
       if (!(demangle && Decoder::demangle(dlinfo.dli_sname, buf, buflen))) {
@@ -898,14 +909,25 @@ bool os::dll_address_to_function_name(address addr, char *buf,
       if (offset != NULL) *offset = addr - (address)dlinfo.dli_saddr;
       return true;
     }
+
+#if !defined(__APPLE__)
+    // The 6-parameter Decoder::decode() function is not implemented on macOS.
+    // The Mach-O binary format does not contain a "list of files" with address
+    // ranges like ELF. That makes sense since Mach-O can contain binaries for
+    // than one instruction set so there can be more than one address range for
+    // each "file".
+
     // no matching symbol so try for just file info
     if (dlinfo.dli_fname != NULL && dlinfo.dli_fbase != NULL) {
       if (Decoder::decode((address)(addr - (address)dlinfo.dli_fbase),
                           buf, buflen, offset, dlinfo.dli_fname, demangle)) {
         return true;
       }
     }
+#endif
 
+#if defined(__APPLE__)
+    char localbuf[MACH_MAXSYMLEN];
     // Handle non-dynamic manually:
     if (dlinfo.dli_fbase != NULL &&
         Decoder::decode(addr, localbuf, MACH_MAXSYMLEN, offset,
@@ -916,6 +938,8 @@ bool os::dll_address_to_function_name(address addr, char *buf,
       return true;
     }
   }
+#endif
+
   buf[0] = '\0';
   if (offset != NULL) *offset = -1;
   return false;
@@ -930,6 +954,16 @@ bool os::dll_address_to_library_name(address addr, char* buf,
   Dl_info dlinfo;
 
   if (dladdr((void*)addr, &dlinfo) != 0) {
+#if defined(__APPLE__)
+    if (addr == (address)(intptr_t)-1) {
+      // dladdr() in macOS12/Monterey returns success for -1, but that addr
+      // value should not be allowed to work to avoid confusion.
+      buf[0] = '\0';
+      if (offset) *offset = -1;
+      return false;
+    }
+#endif
+
     if (dlinfo.dli_fname != NULL) {
       jio_snprintf(buf, buflen, "%s", dlinfo.dli_fname);
     }

src/hotspot/share/runtime/os.cpp

@@ -907,7 +907,7 @@ bool os::print_function_and_library_name(outputStream* st,
       addr = addr2;
     }
   }
-#endif // HANDLE_FUNCTION_DESCRIPTORS
+#endif // HAVE_FUNCTION_DESCRIPTORS
 
   if (have_function_name) {
     // Print function name, optionally demangled

test/hotspot/gtest/runtime/test_os.cpp

@@ -709,11 +709,7 @@ TEST_VM(os, pagesizes_test_print) {
   ASSERT_EQ(strcmp(expected, buffer), 0);
 }
 
-#if defined(__APPLE__)  // See JDK-8273967.
-  TEST_VM(os, DISABLED_dll_address_to_function_and_library_name) {
-#else
-  TEST_VM(os, dll_address_to_function_and_library_name) {
-#endif
+TEST_VM(os, dll_address_to_function_and_library_name) {
   char tmp[1024];
   char output[1024];
   stringStream st(output, sizeof(output));
@@ -726,8 +722,10 @@ TEST_VM(os, pagesizes_test_print) {
 #define LOG(...)
 
   // Invalid addresses
+  LOG("os::print_function_and_library_name(st, -1) expects FALSE.");
   address addr = (address)(intptr_t)-1;
   EXPECT_FALSE(os::print_function_and_library_name(&st, addr));
+  LOG("os::print_function_and_library_name(st, NULL) expects FALSE.");
   addr = NULL;
   EXPECT_FALSE(os::print_function_and_library_name(&st, addr));