1.1 --- a/src/share/vm/opto/doCall.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/opto/doCall.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 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 @@ -23,7 +23,6 @@
1.11 */
1.12
1.13 #include "precompiled.hpp"
1.14 -#include "ci/ciCPCache.hpp"
1.15 #include "ci/ciCallSite.hpp"
1.16 #include "ci/ciMethodHandle.hpp"
1.17 #include "classfile/vmSymbols.hpp"
1.18 @@ -392,7 +391,7 @@
1.19
1.20 // Choose call strategy.
1.21 bool call_is_virtual = is_virtual_or_interface;
1.22 - int vtable_index = methodOopDesc::invalid_vtable_index;
1.23 + int vtable_index = Method::invalid_vtable_index;
1.24 ciMethod* callee = orig_callee;
1.25
1.26 // Try to get the most accurate receiver type
1.27 @@ -539,7 +538,7 @@
1.28 }
1.29 }
1.30 } else {
1.31 - assert(ct == rt, err_msg_res("unexpected mismatch rt=%d, ct=%d", rt, ct));
1.32 + assert(ct == rt, err_msg("unexpected mismatch rt=%d, ct=%d", rt, ct));
1.33 // push a zero; it's better than getting an oop/int mismatch
1.34 retnode = pop_node(rt);
1.35 retnode = zerocon(ct);
1.36 @@ -836,9 +835,9 @@
1.37 if( at_method_entry ) {
1.38 // bump invocation counter if top method (for statistics)
1.39 if (CountCompiledCalls && depth() == 1) {
1.40 - const TypeOopPtr* addr_type = TypeOopPtr::make_from_constant(method());
1.41 + const TypePtr* addr_type = TypeMetadataPtr::make(method());
1.42 Node* adr1 = makecon(addr_type);
1.43 - Node* adr2 = basic_plus_adr(adr1, adr1, in_bytes(methodOopDesc::compiled_invocation_counter_offset()));
1.44 + Node* adr2 = basic_plus_adr(adr1, adr1, in_bytes(Method::compiled_invocation_counter_offset()));
1.45 increment_counter(adr2);
1.46 }
1.47 } else if (is_inline) {
