1.1 --- a/src/share/vm/runtime/sharedRuntime.cpp Wed Sep 25 17:47:51 2013 +0200
1.2 +++ b/src/share/vm/runtime/sharedRuntime.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 @@ -577,7 +577,7 @@
1.11 assert(caller.is_interpreted_frame(), "");
1.12 int args_size = ArgumentSizeComputer(sig).size() + 1;
1.13 assert(args_size <= caller.interpreter_frame_expression_stack_size(), "receiver must be on interpreter stack");
1.14 - oop result = (oop) *caller.interpreter_frame_tos_at(args_size - 1);
1.15 + oop result = cast_to_oop(*caller.interpreter_frame_tos_at(args_size - 1));
1.16 assert(Universe::heap()->is_in(result) && result->is_oop(), "receiver must be an oop");
1.17 return result;
1.18 }
1.19 @@ -2872,7 +2872,7 @@
1.20 ObjectSynchronizer::inflate_helper(kptr2->obj());
1.21 // Now the displaced header is free to move
1.22 buf[i++] = (intptr_t)lock->displaced_header();
1.23 - buf[i++] = (intptr_t)kptr2->obj();
1.24 + buf[i++] = cast_from_oop<intptr_t>(kptr2->obj());
1.25 }
1.26 }
1.27 assert( i - max_locals == active_monitor_count*2, "found the expected number of monitors" );
