1.1 --- a/src/share/vm/opto/callGenerator.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/opto/callGenerator.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -25,7 +25,7 @@
1.4 #include "precompiled.hpp"
1.5 #include "ci/bcEscapeAnalyzer.hpp"
1.6 #include "ci/ciCallSite.hpp"
1.7 -#include "ci/ciCPCache.hpp"
1.8 +#include "ci/ciObjArray.hpp"
1.9 #include "ci/ciMemberName.hpp"
1.10 #include "ci/ciMethodHandle.hpp"
1.11 #include "classfile/javaClasses.hpp"
1.12 @@ -167,7 +167,7 @@
1.13 VirtualCallGenerator(ciMethod* method, int vtable_index)
1.14 : CallGenerator(method), _vtable_index(vtable_index)
1.15 {
1.16 - assert(vtable_index == methodOopDesc::invalid_vtable_index ||
1.17 + assert(vtable_index == Method::invalid_vtable_index ||
1.18 vtable_index >= 0, "either invalid or usable");
1.19 }
1.20 virtual bool is_virtual() const { return true; }
1.21 @@ -217,7 +217,7 @@
1.22 assert(!method()->is_static(), "virtual call must not be to static");
1.23 assert(!method()->is_final(), "virtual call should not be to final");
1.24 assert(!method()->is_private(), "virtual call should not be to private");
1.25 - assert(_vtable_index == methodOopDesc::invalid_vtable_index || !UseInlineCaches,
1.26 + assert(_vtable_index == Method::invalid_vtable_index || !UseInlineCaches,
1.27 "no vtable calls if +UseInlineCaches ");
1.28 address target = SharedRuntime::get_resolve_virtual_call_stub();
1.29 // Normal inline cache used for call
1.30 @@ -603,7 +603,7 @@
1.31 const TypeOopPtr* oop_ptr = receiver->bottom_type()->is_oopptr();
1.32 ciMethod* target = oop_ptr->const_oop()->as_method_handle()->get_vmtarget();
1.33 guarantee(!target->is_method_handle_intrinsic(), "should not happen"); // XXX remove
1.34 - const int vtable_index = methodOopDesc::invalid_vtable_index;
1.35 + const int vtable_index = Method::invalid_vtable_index;
1.36 CallGenerator* cg = C->call_generator(target, vtable_index, false, jvms, true, PROB_ALWAYS);
1.37 if (cg != NULL && cg->is_inline())
1.38 return cg;
1.39 @@ -653,7 +653,7 @@
1.40 }
1.41 }
1.42 }
1.43 - const int vtable_index = methodOopDesc::invalid_vtable_index;
1.44 + const int vtable_index = Method::invalid_vtable_index;
1.45 const bool call_is_virtual = target->is_abstract(); // FIXME workaround
1.46 CallGenerator* cg = C->call_generator(target, vtable_index, call_is_virtual, jvms, true, PROB_ALWAYS);
1.47 if (cg != NULL && cg->is_inline())
