1.1 --- a/src/share/vm/oops/fieldInfo.hpp Mon Mar 18 09:08:07 2013 -0700 1.2 +++ b/src/share/vm/oops/fieldInfo.hpp Tue Mar 19 10:31:16 2013 +0100 1.3 @@ -108,11 +108,11 @@ 1.4 return build_int_from_shorts(_shorts[low_packed_offset], _shorts[high_packed_offset]) >> FIELDINFO_TAG_SIZE; 1.5 #ifndef PRODUCT 1.6 case FIELDINFO_TAG_TYPE_PLAIN: 1.7 - ShouldNotReachHere2("Asking offset for the plain type field"); 1.8 + fatal("Asking offset for the plain type field"); 1.9 case FIELDINFO_TAG_TYPE_CONTENDED: 1.10 - ShouldNotReachHere2("Asking offset for the contended type field"); 1.11 + fatal("Asking offset for the contended type field"); 1.12 case FIELDINFO_TAG_BLANK: 1.13 - ShouldNotReachHere2("Asking offset for the blank field"); 1.14 + fatal("Asking offset for the blank field"); 1.15 #endif 1.16 } 1.17 ShouldNotReachHere(); 1.18 @@ -128,9 +128,9 @@ 1.19 return true; 1.20 #ifndef PRODUCT 1.21 case FIELDINFO_TAG_OFFSET: 1.22 - ShouldNotReachHere2("Asking contended flag for the field with offset"); 1.23 + fatal("Asking contended flag for the field with offset"); 1.24 case FIELDINFO_TAG_BLANK: 1.25 - ShouldNotReachHere2("Asking contended flag for the blank field"); 1.26 + fatal("Asking contended flag for the blank field"); 1.27 #endif 1.28 } 1.29 ShouldNotReachHere(); 1.30 @@ -146,9 +146,9 @@ 1.31 return _shorts[high_packed_offset]; 1.32 #ifndef PRODUCT 1.33 case FIELDINFO_TAG_OFFSET: 1.34 - ShouldNotReachHere2("Asking the contended group for the field with offset"); 1.35 + fatal("Asking the contended group for the field with offset"); 1.36 case FIELDINFO_TAG_BLANK: 1.37 - ShouldNotReachHere2("Asking the contended group for the blank field"); 1.38 + fatal("Asking the contended group for the blank field"); 1.39 #endif 1.40 } 1.41 ShouldNotReachHere(); 1.42 @@ -163,9 +163,9 @@ 1.43 return (lo >> FIELDINFO_TAG_SIZE); 1.44 #ifndef PRODUCT 1.45 case FIELDINFO_TAG_OFFSET: 1.46 - ShouldNotReachHere2("Asking the field type for field with offset"); 1.47 + fatal("Asking the field type for field with offset"); 1.48 case FIELDINFO_TAG_BLANK: 1.49 - ShouldNotReachHere2("Asking the field type for the blank field"); 1.50 + fatal("Asking the field type for the blank field"); 1.51 #endif 1.52 } 1.53 ShouldNotReachHere(); 1.54 @@ -211,7 +211,7 @@ 1.55 case FIELDINFO_TAG_TYPE_PLAIN: 1.56 case FIELDINFO_TAG_TYPE_CONTENDED: 1.57 case FIELDINFO_TAG_OFFSET: 1.58 - ShouldNotReachHere2("Setting the field type with overwriting"); 1.59 + fatal("Setting the field type with overwriting"); 1.60 #endif 1.61 } 1.62 ShouldNotReachHere(); 1.63 @@ -226,11 +226,11 @@ 1.64 return; 1.65 #ifndef PRODUCT 1.66 case FIELDINFO_TAG_TYPE_CONTENDED: 1.67 - ShouldNotReachHere2("Overwriting contended group"); 1.68 + fatal("Overwriting contended group"); 1.69 case FIELDINFO_TAG_BLANK: 1.70 - ShouldNotReachHere2("Setting contended group for the blank field"); 1.71 + fatal("Setting contended group for the blank field"); 1.72 case FIELDINFO_TAG_OFFSET: 1.73 - ShouldNotReachHere2("Setting contended group for field with offset"); 1.74 + fatal("Setting contended group for field with offset"); 1.75 #endif 1.76 } 1.77 ShouldNotReachHere();