# HG changeset patch
# User morris
# Date 1363885884 25200
# Node ID 589aa23334ea5456e7a505392363c93991615240
# Parent  98f3af39770511173a259e0144e68626264d524e
8009584: [parfait] Null pointer deference in hotspot/src/cpu/x86/vm/relocInfo_x86.cpp
Summary: added guarantee() to pd_address_in_code()
Reviewed-by: kvn

diff -r 98f3af397705 -r 589aa23334ea src/cpu/x86/vm/relocInfo_x86.cpp
--- a/src/cpu/x86/vm/relocInfo_x86.cpp	Wed Mar 20 17:04:45 2013 -0700
+++ b/src/cpu/x86/vm/relocInfo_x86.cpp	Thu Mar 21 10:11:24 2013 -0700
@@ -145,12 +145,9 @@
   assert(which == Assembler::disp32_operand ||
          which == Assembler::call32_operand ||
          which == Assembler::imm_operand, "format unpacks ok");
-  if (which != Assembler::imm_operand) {
-    // The "address" in the code is a displacement can't return it as
-    // and address* since it is really a jint*
-    ShouldNotReachHere();
-    return NULL;
-  }
+  // The "address" in the code is a displacement can't return it as
+  // and address* since it is really a jint*
+  guarantee(which == Assembler::imm_operand, "must be immediate operand");
 #else
   assert(which == Assembler::disp32_operand || which == Assembler::imm_operand, "format unpacks ok");
 #endif // AMD64