1.1 --- a/src/share/vm/oops/methodKlass.cpp Thu Jan 27 13:42:28 2011 -0800 1.2 +++ b/src/share/vm/oops/methodKlass.cpp Thu Jan 27 16:11:27 2011 -0800 1.3 @@ -36,7 +36,7 @@ 1.4 #include "oops/methodKlass.hpp" 1.5 #include "oops/oop.inline.hpp" 1.6 #include "oops/oop.inline2.hpp" 1.7 -#include "oops/symbolOop.hpp" 1.8 +#include "oops/symbol.hpp" 1.9 #include "runtime/handles.inline.hpp" 1.10 1.11 klassOop methodKlass::create_klass(TRAPS) { 1.12 @@ -353,10 +353,6 @@ 1.13 if (!obj->partially_loaded()) { 1.14 methodOop m = methodOop(obj); 1.15 guarantee(m->is_perm(), "should be in permspace"); 1.16 - guarantee(m->name()->is_perm(), "should be in permspace"); 1.17 - guarantee(m->name()->is_symbol(), "should be symbol"); 1.18 - guarantee(m->signature()->is_perm(), "should be in permspace"); 1.19 - guarantee(m->signature()->is_symbol(), "should be symbol"); 1.20 guarantee(m->constants()->is_perm(), "should be in permspace"); 1.21 guarantee(m->constants()->is_constantPool(), "should be constant pool"); 1.22 guarantee(m->constMethod()->is_constMethod(), "should be constMethodOop");