Mercurial > hg > graal-compiler
diff src/cpu/x86/vm/assembler_x86.hpp @ 1047:beb8f45ee9f0
6889740: G1: OpenDS fails with "unhandled exception in compiled code"
Summary: Incorrect code was being generated for the store operation in the null case of the aastore bytecode template. The bad code was generated by the store_heap_oop routine which takes a Register as its second argument. Passing NULL_WORD (0) as the second argument causes the value to be converted to Register(0), which is rax. Thus the generated store was "mov (dst), $rax" instead of "mov (dst), $0x0". Changed calls to store_heap_oop that pass NULL_WORD as the second argument to a new routine store_heap_oop_null.
Reviewed-by: kvn, twisti
| author | johnc |
|---|---|
| date | Thu, 29 Oct 2009 09:42:26 -0700 |
| parents | 62001a362ce9 |
| children | 2f1ec89b9995 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/assembler_x86.hpp Wed Oct 28 11:16:42 2009 -0700 +++ b/src/cpu/x86/vm/assembler_x86.hpp Thu Oct 29 09:42:26 2009 -0700 @@ -1682,6 +1682,17 @@ void load_heap_oop(Register dst, Address src); void store_heap_oop(Address dst, Register src); + + // This dummy is to prevent a call to store_heap_oop from + // converting a zero (like NULL) into a Register by giving + // the compiler two choices it can't resolve + + void store_heap_oop(Address dst, void* dummy); + + // Used for storing NULL. All other oop constants should be + // stored using routines that take a jobject. + void store_heap_oop_null(Address dst); + void encode_heap_oop(Register r); void decode_heap_oop(Register r); void encode_heap_oop_not_null(Register r);