1.1 --- a/src/share/vm/runtime/vframeArray.cpp Wed Sep 25 17:47:51 2013 +0200
1.2 +++ b/src/share/vm/runtime/vframeArray.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 @@ -111,7 +111,7 @@
1.11 case T_OBJECT:
1.12 assert(!value->obj_is_scalar_replaced(), "object should be reallocated already");
1.13 // preserve object type
1.14 - _locals->add( new StackValue((intptr_t) (value->get_obj()()), T_OBJECT ));
1.15 + _locals->add( new StackValue(cast_from_oop<intptr_t>((value->get_obj()())), T_OBJECT ));
1.16 break;
1.17 case T_CONFLICT:
1.18 // A dead local. Will be initialized to null/zero.
1.19 @@ -136,7 +136,7 @@
1.20 case T_OBJECT:
1.21 assert(!value->obj_is_scalar_replaced(), "object should be reallocated already");
1.22 // preserve object type
1.23 - _expressions->add( new StackValue((intptr_t) (value->get_obj()()), T_OBJECT ));
1.24 + _expressions->add( new StackValue(cast_from_oop<intptr_t>((value->get_obj()())), T_OBJECT ));
1.25 break;
1.26 case T_CONFLICT:
1.27 // A dead stack element. Will be initialized to null/zero.
