1.1 --- a/src/share/vm/opto/type.cpp Mon Jan 04 15:21:09 2010 -0800
1.2 +++ b/src/share/vm/opto/type.cpp Tue Jan 05 13:05:58 2010 +0100
1.3 @@ -2431,7 +2431,7 @@
1.4 //------------------------------make_from_constant-----------------------------
1.5 // Make a java pointer from an oop constant
1.6 const TypeOopPtr* TypeOopPtr::make_from_constant(ciObject* o, bool require_constant) {
1.7 - if (o->is_method_data() || o->is_method()) {
1.8 + if (o->is_method_data() || o->is_method() || o->is_cpcache()) {
1.9 // Treat much like a typeArray of bytes, like below, but fake the type...
1.10 const Type* etype = (Type*)get_const_basic_type(T_BYTE);
1.11 const TypeAry* arr0 = TypeAry::make(etype, TypeInt::POS);
1.12 @@ -3966,7 +3966,7 @@
1.13 const TypeFunc* tf = C->last_tf(method); // check cache
1.14 if (tf != NULL) return tf; // The hit rate here is almost 50%.
1.15 const TypeTuple *domain;
1.16 - if (method->flags().is_static()) {
1.17 + if (method->is_static()) {
1.18 domain = TypeTuple::make_domain(NULL, method->signature());
1.19 } else {
1.20 domain = TypeTuple::make_domain(method->holder(), method->signature());
