diff -r 6e2633440960 -r 2fe087c3e814 src/cpu/x86/vm/interp_masm_x86_64.hpp --- a/src/cpu/x86/vm/interp_masm_x86_64.hpp Fri Jun 01 15:30:44 2012 -0700 +++ b/src/cpu/x86/vm/interp_masm_x86_64.hpp Wed Jun 06 14:33:43 2012 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -84,9 +84,14 @@ movptr(reg, Address(rbp, frame::interpreter_frame_method_offset * wordSize)); } + void get_const(Register reg) { + get_method(reg); + movptr(reg, Address(reg, methodOopDesc::const_offset())); + } + void get_constant_pool(Register reg) { - get_method(reg); - movptr(reg, Address(reg, methodOopDesc::constants_offset())); + get_const(reg); + movptr(reg, Address(reg, constMethodOopDesc::constants_offset())); } void get_constant_pool_cache(Register reg) {