1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp Wed Sep 25 17:47:51 2013 +0200 1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp Thu Sep 26 10:25:02 2013 -0400 1.3 @@ -126,7 +126,7 @@ 1.4 1.5 oop* mask_chunked_array_oop(oop obj) { 1.6 assert(!is_oop_masked((oop*) obj), "invariant"); 1.7 - oop* ret = (oop*) ((uintptr_t)obj | PS_CHUNKED_ARRAY_OOP_MASK); 1.8 + oop* ret = (oop*) (cast_from_oop<uintptr_t>(obj) | PS_CHUNKED_ARRAY_OOP_MASK); 1.9 assert(is_oop_masked(ret), "invariant"); 1.10 return ret; 1.11 }