1.1 --- a/src/share/vm/interpreter/templateInterpreter.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/interpreter/templateInterpreter.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, 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 @@ -510,7 +510,7 @@
1.11 assert(step > 0, "just checkin'");
1.12 // setup stuff for dispatching next bytecode
1.13 if (ProfileInterpreter && VerifyDataPointer
1.14 - && methodDataOopDesc::bytecode_has_profile(t->bytecode())) {
1.15 + && MethodData::bytecode_has_profile(t->bytecode())) {
1.16 __ verify_method_data_pointer();
1.17 }
1.18 __ dispatch_prolog(tos_out, step);
1.19 @@ -588,7 +588,7 @@
1.20 // Deoptimization support
1.21
1.22 // If deoptimization happens, this function returns the point of next bytecode to continue execution
1.23 -address TemplateInterpreter::deopt_continue_after_entry(methodOop method, address bcp, int callee_parameters, bool is_top_frame) {
1.24 +address TemplateInterpreter::deopt_continue_after_entry(Method* method, address bcp, int callee_parameters, bool is_top_frame) {
1.25 return AbstractInterpreter::deopt_continue_after_entry(method, bcp, callee_parameters, is_top_frame);
1.26 }
1.27
1.28 @@ -596,7 +596,7 @@
1.29 // the bytecode.
1.30 // Note: Bytecodes::_athrow (C1 only) and Bytecodes::_return are the special cases
1.31 // that do not return "Interpreter::deopt_entry(vtos, 0)"
1.32 -address TemplateInterpreter::deopt_reexecute_entry(methodOop method, address bcp) {
1.33 +address TemplateInterpreter::deopt_reexecute_entry(Method* method, address bcp) {
1.34 assert(method->contains(bcp), "just checkin'");
1.35 Bytecodes::Code code = Bytecodes::java_code_at(method, bcp);
1.36 if (code == Bytecodes::_return) {
