1.1 --- a/src/cpu/zero/vm/frame_zero.cpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/cpu/zero/vm/frame_zero.cpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc. 1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.9 * 1.10 @@ -29,7 +29,7 @@ 1.11 #include "interpreter/interpreterRuntime.hpp" 1.12 #include "memory/resourceArea.hpp" 1.13 #include "oops/markOop.hpp" 1.14 -#include "oops/methodOop.hpp" 1.15 +#include "oops/method.hpp" 1.16 #include "oops/oop.inline.hpp" 1.17 #include "runtime/frame.inline.hpp" 1.18 #include "runtime/handles.inline.hpp" 1.19 @@ -118,7 +118,7 @@ 1.20 BasicType frame::interpreter_frame_result(oop* oop_result, 1.21 jvalue* value_result) { 1.22 assert(is_interpreted_frame(), "interpreted frame expected"); 1.23 - methodOop method = interpreter_frame_method(); 1.24 + Method* method = interpreter_frame_method(); 1.25 BasicType type = method->result_type(); 1.26 intptr_t* tos_addr = (intptr_t *) interpreter_frame_tos_address(); 1.27 oop obj;