8340009: Improve the output from assert_different_registers

Reviewed-by: aboldtch, dholmes, shade, mli

Author: stefank

src/hotspot/share/asm/register.hpp

@@ -276,19 +276,23 @@ inline constexpr bool different_registers(R first_register, Rx... more_registers
 }
 
 template<typename R, typename... Rx>
-inline void assert_different_registers(R first_register, Rx... more_registers) {
+inline void assert_different_registers_impl(const char* file, int line, R first_register, Rx... more_registers) {
 #ifdef ASSERT
   if (!different_registers(first_register, more_registers...)) {
     const R regs[] = { first_register, more_registers... };
     // Find a duplicate entry.
     for (size_t i = 0; i < ARRAY_SIZE(regs) - 1; ++i) {
       for (size_t j = i + 1; j < ARRAY_SIZE(regs); ++j) {
-        assert(!regs[i]->is_valid() || regs[i] != regs[j],
-               "Multiple uses of register: %s", regs[i]->name());
+        if (regs[i]->is_valid()) {
+          assert_with_file_and_line(regs[i] != regs[j], file, line, "regs[%zu] and regs[%zu] are both: %s",
+              i, j, regs[i]->name());
+        }
       }
     }
   }
 #endif
 }
 
+#define assert_different_registers(...) assert_different_registers_impl(__FILE__, __LINE__, __VA_ARGS__)
+
 #endif // SHARE_ASM_REGISTER_HPP

src/hotspot/share/utilities/debug.hpp

@@ -139,22 +139,25 @@ class DebuggingContext {
 
 // assertions
 #ifndef ASSERT
+#define vmassert_with_file_and_line(p, file, line, ...)
 #define vmassert(p, ...)
 #else
 // Note: message says "assert" rather than "vmassert" for backward
 // compatibility with tools that parse/match the message text.
 // Note: The signature is vmassert(p, format, ...), but the solaris
 // compiler can't handle an empty ellipsis in a macro without a warning.
-#define vmassert(p, ...)                                                       \
-do {                                                                           \
-  if (! VMASSERT_CHECK_PASSED(p)) {                                            \
-    TOUCH_ASSERT_POISON;                                                       \
-    report_vm_error(__FILE__, __LINE__, "assert(" #p ") failed", __VA_ARGS__); \
-  }                                                                            \
+#define vmassert_with_file_and_line(p, file, line, ...)                \
+do {                                                                   \
+  if (! VMASSERT_CHECK_PASSED(p)) {                                    \
+    TOUCH_ASSERT_POISON;                                               \
+    report_vm_error(file, line, "assert(" #p ") failed", __VA_ARGS__); \
+  }                                                                    \
 } while (0)
+#define vmassert(p, ...) vmassert_with_file_and_line(p, __FILE__, __LINE__, __VA_ARGS__)
 #endif
 
 // For backward compatibility.
+#define assert_with_file_and_line(p, file, line, ...) vmassert_with_file_and_line(p, file, line, __VA_ARGS__)
 #define assert(p, ...) vmassert(p, __VA_ARGS__)
 
 #define precond(p)   assert(p, "precond")