src/cpu/x86/vm/assembler_x86.hpp

*** 1680,1689 ****
--- 1680,1700 ----
  #ifdef _LP64
    void store_klass_gap(Register dst, Register src);
  
    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);
    void decode_heap_oop_not_null(Register r);
    void encode_heap_oop_not_null(Register dst, Register src);