Mercurial > hg > graal-compiler
changeset 8861:a57fc14f798a
Merge
author | roland |
---|---|
date | Thu, 21 Mar 2013 22:00:14 -0700 |
parents | c3c64a973559 (diff) 46f6f063b272 (current diff) |
children | 360ce06580b8 |
files | |
diffstat | 2 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/x86/vm/relocInfo_x86.cpp Thu Mar 21 09:27:54 2013 +0100 +++ b/src/cpu/x86/vm/relocInfo_x86.cpp Thu Mar 21 22:00:14 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
--- a/src/share/vm/oops/constantPool.cpp Thu Mar 21 09:27:54 2013 +0100 +++ b/src/share/vm/oops/constantPool.cpp Thu Mar 21 22:00:14 2013 -0700 @@ -1852,6 +1852,7 @@ switch (tag_at(index).value()) { case JVM_CONSTANT_Class : { Klass* k = klass_at(index, CATCH); + guarantee(k != NULL, "need klass"); k->print_value_on(st); st->print(" {0x%lx}", (address)k); }