1.1 --- a/src/cpu/x86/vm/frame_x86.inline.hpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/cpu/x86/vm/frame_x86.inline.hpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2012, 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 @@ -174,14 +174,14 @@ 1.11 1.12 // Constant pool cache 1.13 1.14 -inline constantPoolCacheOop* frame::interpreter_frame_cache_addr() const { 1.15 +inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const { 1.16 assert(is_interpreted_frame(), "must be interpreted"); 1.17 return &(get_interpreterState()->_constants); 1.18 } 1.19 1.20 // Method 1.21 1.22 -inline methodOop* frame::interpreter_frame_method_addr() const { 1.23 +inline Method** frame::interpreter_frame_method_addr() const { 1.24 assert(is_interpreted_frame(), "must be interpreted"); 1.25 return &(get_interpreterState()->_method); 1.26 } 1.27 @@ -221,14 +221,14 @@ 1.28 1.29 // Constant pool cache 1.30 1.31 -inline constantPoolCacheOop* frame::interpreter_frame_cache_addr() const { 1.32 - return (constantPoolCacheOop*)addr_at(interpreter_frame_cache_offset); 1.33 +inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const { 1.34 + return (ConstantPoolCache**)addr_at(interpreter_frame_cache_offset); 1.35 } 1.36 1.37 // Method 1.38 1.39 -inline methodOop* frame::interpreter_frame_method_addr() const { 1.40 - return (methodOop*)addr_at(interpreter_frame_method_offset); 1.41 +inline Method** frame::interpreter_frame_method_addr() const { 1.42 + return (Method**)addr_at(interpreter_frame_method_offset); 1.43 } 1.44 1.45 // top of expression stack