Mercurial > hg > graal-compiler
comparison src/share/vm/graal/graalCompiler.cpp @ 6950:41938af2b3d8
modifications to support non-perm-gen changes in HotSpot
fixed issue when intrinsifying Class.getModifiers() for primitive classes
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 14 Nov 2012 11:28:02 +0100 |
parents | e522a00b91aa |
children | 9ba90252ce08 |
comparison
equal
deleted
inserted
replaced
6949:d09b0fed89db | 6950:41938af2b3d8 |
---|---|
239 } else { | 239 } else { |
240 return GraalCompiler::get_JavaType(klass, CHECK_NULL); | 240 return GraalCompiler::get_JavaType(klass, CHECK_NULL); |
241 } | 241 } |
242 } | 242 } |
243 | 243 |
244 Handle GraalCompiler::get_JavaTypeFromClass(Handle javaClassHandle, TRAPS) { | 244 Handle GraalCompiler::get_JavaTypeFromClass(Handle java_class, TRAPS) { |
245 if (java_lang_Class::is_primitive(javaClassHandle())) { | 245 oop graal_mirror = java_lang_Class::graal_mirror(java_class()); |
246 BasicType basicType = java_lang_Class::primitive_type(javaClassHandle()); | 246 if (graal_mirror != NULL) { |
247 return graal_mirror; | |
248 } | |
249 | |
250 if (java_lang_Class::is_primitive(java_class())) { | |
251 BasicType basicType = java_lang_Class::primitive_type(java_class()); | |
247 return VMToCompiler::createPrimitiveJavaType((int) basicType, THREAD); | 252 return VMToCompiler::createPrimitiveJavaType((int) basicType, THREAD); |
248 } else { | 253 } else { |
249 KlassHandle klass = java_lang_Class::as_Klass(javaClassHandle()); | 254 KlassHandle klass = java_lang_Class::as_Klass(java_class()); |
250 Handle name = java_lang_String::create_from_symbol(klass->name(), CHECK_NULL); | 255 Handle name = java_lang_String::create_from_symbol(klass->name(), CHECK_NULL); |
251 return GraalCompiler::createHotSpotResolvedJavaType(klass, name, CHECK_NULL); | 256 return GraalCompiler::createHotSpotResolvedJavaType(klass, name, CHECK_NULL); |
252 } | 257 } |
253 } | 258 } |
254 | 259 |