Mercurial > hg > graal-compiler
comparison src/share/vm/graal/graalCompilerToVM.cpp @ 13479:606959535fd4
remove Graal mirror from Class
author | twisti |
---|---|
date | Wed, 25 Dec 2013 20:27:59 -0800 |
parents | fe03864a2c72 |
children | 37ec2cabf397 |
comparison
equal
deleted
inserted
replaced
13478:fe03864a2c72 | 13479:606959535fd4 |
---|---|
233 if (resolved_type == NULL) { | 233 if (resolved_type == NULL) { |
234 assert(!eagerResolve, "failed eager resolution should have caused an exception"); | 234 assert(!eagerResolve, "failed eager resolution should have caused an exception"); |
235 Handle type = VMToCompiler::createUnresolvedJavaType(name, THREAD); | 235 Handle type = VMToCompiler::createUnresolvedJavaType(name, THREAD); |
236 result = type(); | 236 result = type(); |
237 } else { | 237 } else { |
238 Handle type = GraalCompiler::createHotSpotResolvedObjectType(resolved_type, CHECK_NULL); | 238 Handle type = VMToCompiler::createResolvedJavaType(resolved_type->java_mirror(), CHECK_NULL); |
239 result = type(); | 239 result = type(); |
240 } | 240 } |
241 } | 241 } |
242 | 242 |
243 return JNIHandles::make_local(THREAD, result); | 243 return JNIHandles::make_local(THREAD, result); |
278 Bytecodes::Code bc = (Bytecodes::Code) (((int) opcode) & 0xFF); | 278 Bytecodes::Code bc = (Bytecodes::Code) (((int) opcode) & 0xFF); |
279 int cp_index = GraalCompiler::to_cp_index(index, bc); | 279 int cp_index = GraalCompiler::to_cp_index(index, bc); |
280 | 280 |
281 methodHandle method = GraalEnv::get_method_by_index(cp, cp_index, bc, pool_holder); | 281 methodHandle method = GraalEnv::get_method_by_index(cp, cp_index, bc, pool_holder); |
282 if (!method.is_null()) { | 282 if (!method.is_null()) { |
283 Handle holder = GraalCompiler::createHotSpotResolvedObjectType(method->method_holder(), CHECK_NULL); | 283 Handle holder = VMToCompiler::createResolvedJavaType(method->method_holder()->java_mirror(), CHECK_NULL); |
284 return JNIHandles::make_local(THREAD, VMToCompiler::createResolvedJavaMethod(holder, method(), THREAD)); | 284 return JNIHandles::make_local(THREAD, VMToCompiler::createResolvedJavaMethod(holder, method(), THREAD)); |
285 } else { | 285 } else { |
286 // Get the method's name and signature. | 286 // Get the method's name and signature. |
287 Handle name = java_lang_String::create_from_symbol(cp->name_ref_at(cp_index), CHECK_NULL); | 287 Handle name = java_lang_String::create_from_symbol(cp->name_ref_at(cp_index), CHECK_NULL); |
288 Handle signature = java_lang_String::create_from_symbol(cp->signature_ref_at(cp_index), CHECK_NULL); | 288 Handle signature = java_lang_String::create_from_symbol(cp->signature_ref_at(cp_index), CHECK_NULL); |
353 } else { | 353 } else { |
354 offset = result.offset(); | 354 offset = result.offset(); |
355 flags = result.access_flags(); | 355 flags = result.access_flags(); |
356 holder_klass = result.field_holder(); | 356 holder_klass = result.field_holder(); |
357 basic_type = result.field_type(); | 357 basic_type = result.field_type(); |
358 holder = GraalCompiler::createHotSpotResolvedObjectType(holder_klass, CHECK_NULL); | 358 holder = VMToCompiler::createResolvedJavaType(holder_klass->java_mirror(), CHECK_NULL); |
359 } | 359 } |
360 } | 360 } |
361 | 361 |
362 Handle type = GraalCompiler::get_JavaTypeFromSignature(signature, cp->pool_holder(), CHECK_NULL); | 362 Handle type = GraalCompiler::get_JavaTypeFromSignature(signature, cp->pool_holder(), CHECK_NULL); |
363 Handle field_handle = GraalCompiler::get_JavaField(offset, flags.as_int(), name, holder, type, THREAD); | 363 Handle field_handle = GraalCompiler::get_JavaField(offset, flags.as_int(), name, holder, type, THREAD); |