1.1 --- a/src/share/vm/runtime/frame.cpp Wed Sep 25 17:47:51 2013 +0200
1.2 +++ b/src/share/vm/runtime/frame.cpp Thu Sep 26 10:25:02 2013 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -1097,7 +1097,7 @@
1.11 return NULL;
1.12 }
1.13 oop r = *oop_adr;
1.14 - assert(Universe::heap()->is_in_or_null(r), err_msg("bad receiver: " INTPTR_FORMAT " (" INTX_FORMAT ")", (intptr_t) r, (intptr_t) r));
1.15 + assert(Universe::heap()->is_in_or_null(r), err_msg("bad receiver: " INTPTR_FORMAT " (" INTX_FORMAT ")", (void *) r, (void *) r));
1.16 return r;
1.17 }
1.18
1.19 @@ -1228,9 +1228,7 @@
1.20
1.21 void frame::ZapDeadClosure::do_oop(oop* p) {
1.22 if (TraceZapDeadLocals) tty->print_cr("zapping @ " INTPTR_FORMAT " containing " INTPTR_FORMAT, p, (address)*p);
1.23 - // Need cast because on _LP64 the conversion to oop is ambiguous. Constant
1.24 - // can be either long or int.
1.25 - *p = (oop)(int)0xbabebabe;
1.26 + *p = cast_to_oop<intptr_t>(0xbabebabe);
1.27 }
1.28 frame::ZapDeadClosure frame::_zap_dead;
1.29
