1.1 --- a/src/share/vm/runtime/deoptimization.cpp Fri Jan 29 12:13:05 2010 +0100 1.2 +++ b/src/share/vm/runtime/deoptimization.cpp Fri Jan 29 08:33:24 2010 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright 1997-2010 Sun Microsystems, Inc. All Rights Reserved. 1.6 + * Copyright 1997-2009 Sun Microsystems, Inc. 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 @@ -235,12 +235,6 @@ 1.11 assert(cb->frame_size() >= 0, "Unexpected frame size"); 1.12 intptr_t* unpack_sp = stub_frame.sp() + cb->frame_size(); 1.13 1.14 - // If the deopt call site is a MethodHandle invoke call site we have 1.15 - // to adjust the unpack_sp. 1.16 - nmethod* deoptee_nm = deoptee.cb()->as_nmethod_or_null(); 1.17 - if (deoptee_nm != NULL && deoptee_nm->is_method_handle_return(deoptee.pc())) 1.18 - unpack_sp = deoptee.unextended_sp(); 1.19 - 1.20 #ifdef ASSERT 1.21 assert(cb->is_deoptimization_stub() || cb->is_uncommon_trap_stub(), "just checking"); 1.22 Events::log("fetch unroll sp " INTPTR_FORMAT, unpack_sp);