8010121: Remove definition of ShouldNotReachHere2(msg)
Reviewed-by: kvn, stefank, rbackman, twisti
Contributed-by: niclas.adlertz@oracle.com
--- a/hotspot/src/share/vm/memory/sharedHeap.cpp Mon Mar 18 09:08:07 2013 -0700
+++ b/hotspot/src/share/vm/memory/sharedHeap.cpp Tue Mar 19 10:31:16 2013 +0100
@@ -178,7 +178,7 @@
SystemDictionary::always_strong_oops_do(roots);
ClassLoaderDataGraph::always_strong_oops_do(roots, klass_closure, !is_scavenging);
} else {
- ShouldNotReachHere2("We should always have selected either SO_AllClasses or SO_SystemClasses");
+ fatal("We should always have selected either SO_AllClasses or SO_SystemClasses");
}
}
--- a/hotspot/src/share/vm/oops/fieldInfo.hpp Mon Mar 18 09:08:07 2013 -0700
+++ b/hotspot/src/share/vm/oops/fieldInfo.hpp Tue Mar 19 10:31:16 2013 +0100
@@ -108,11 +108,11 @@
return build_int_from_shorts(_shorts[low_packed_offset], _shorts[high_packed_offset]) >> FIELDINFO_TAG_SIZE;
#ifndef PRODUCT
case FIELDINFO_TAG_TYPE_PLAIN:
- ShouldNotReachHere2("Asking offset for the plain type field");
+ fatal("Asking offset for the plain type field");
case FIELDINFO_TAG_TYPE_CONTENDED:
- ShouldNotReachHere2("Asking offset for the contended type field");
+ fatal("Asking offset for the contended type field");
case FIELDINFO_TAG_BLANK:
- ShouldNotReachHere2("Asking offset for the blank field");
+ fatal("Asking offset for the blank field");
#endif
}
ShouldNotReachHere();
@@ -128,9 +128,9 @@
return true;
#ifndef PRODUCT
case FIELDINFO_TAG_OFFSET:
- ShouldNotReachHere2("Asking contended flag for the field with offset");
+ fatal("Asking contended flag for the field with offset");
case FIELDINFO_TAG_BLANK:
- ShouldNotReachHere2("Asking contended flag for the blank field");
+ fatal("Asking contended flag for the blank field");
#endif
}
ShouldNotReachHere();
@@ -146,9 +146,9 @@
return _shorts[high_packed_offset];
#ifndef PRODUCT
case FIELDINFO_TAG_OFFSET:
- ShouldNotReachHere2("Asking the contended group for the field with offset");
+ fatal("Asking the contended group for the field with offset");
case FIELDINFO_TAG_BLANK:
- ShouldNotReachHere2("Asking the contended group for the blank field");
+ fatal("Asking the contended group for the blank field");
#endif
}
ShouldNotReachHere();
@@ -163,9 +163,9 @@
return (lo >> FIELDINFO_TAG_SIZE);
#ifndef PRODUCT
case FIELDINFO_TAG_OFFSET:
- ShouldNotReachHere2("Asking the field type for field with offset");
+ fatal("Asking the field type for field with offset");
case FIELDINFO_TAG_BLANK:
- ShouldNotReachHere2("Asking the field type for the blank field");
+ fatal("Asking the field type for the blank field");
#endif
}
ShouldNotReachHere();
@@ -211,7 +211,7 @@
case FIELDINFO_TAG_TYPE_PLAIN:
case FIELDINFO_TAG_TYPE_CONTENDED:
case FIELDINFO_TAG_OFFSET:
- ShouldNotReachHere2("Setting the field type with overwriting");
+ fatal("Setting the field type with overwriting");
#endif
}
ShouldNotReachHere();
@@ -226,11 +226,11 @@
return;
#ifndef PRODUCT
case FIELDINFO_TAG_TYPE_CONTENDED:
- ShouldNotReachHere2("Overwriting contended group");
+ fatal("Overwriting contended group");
case FIELDINFO_TAG_BLANK:
- ShouldNotReachHere2("Setting contended group for the blank field");
+ fatal("Setting contended group for the blank field");
case FIELDINFO_TAG_OFFSET:
- ShouldNotReachHere2("Setting contended group for field with offset");
+ fatal("Setting contended group for field with offset");
#endif
}
ShouldNotReachHere();
--- a/hotspot/src/share/vm/utilities/debug.cpp Mon Mar 18 09:08:07 2013 -0700
+++ b/hotspot/src/share/vm/utilities/debug.cpp Tue Mar 19 10:31:16 2013 +0100
@@ -248,10 +248,6 @@
report_vm_error(file, line, "ShouldNotReachHere()");
}
-void report_should_not_reach_here2(const char* file, int line, const char* message) {
- report_vm_error(file, line, "ShouldNotReachHere()", message);
-}
-
void report_unimplemented(const char* file, int line) {
report_vm_error(file, line, "Unimplemented()");
}
--- a/hotspot/src/share/vm/utilities/debug.hpp Mon Mar 18 09:08:07 2013 -0700
+++ b/hotspot/src/share/vm/utilities/debug.hpp Tue Mar 19 10:31:16 2013 +0100
@@ -192,12 +192,6 @@
BREAKPOINT; \
} while (0)
-#define ShouldNotReachHere2(message) \
-do { \
- report_should_not_reach_here2(__FILE__, __LINE__, message); \
- BREAKPOINT; \
-} while (0)
-
#define Unimplemented() \
do { \
report_unimplemented(__FILE__, __LINE__); \
@@ -218,7 +212,6 @@
const char* message);
void report_should_not_call(const char* file, int line);
void report_should_not_reach_here(const char* file, int line);
-void report_should_not_reach_here2(const char* file, int line, const char* message);
void report_unimplemented(const char* file, int line);
void report_untested(const char* file, int line, const char* message);