Mercurial > hg > graal-compiler
comparison src/share/vm/graal/graalCompilerToVM.cpp @ 8125:0026a2e70695
Merge fixes.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:58:57 +0100 |
parents | 30b3a966562e |
children | 3d41998c30de |
comparison
equal
deleted
inserted
replaced
8124:5fc51c1ecdeb | 8125:0026a2e70695 |
---|---|
405 } | 405 } |
406 result = VMToCompiler::createConstantObject(string, CHECK_0); | 406 result = VMToCompiler::createConstantObject(string, CHECK_0); |
407 } else if (tag.is_klass() || tag.is_unresolved_klass()) { | 407 } else if (tag.is_klass() || tag.is_unresolved_klass()) { |
408 Handle type = GraalCompiler::get_JavaType(cp, index, cp->pool_holder(), CHECK_NULL); | 408 Handle type = GraalCompiler::get_JavaType(cp, index, cp->pool_holder(), CHECK_NULL); |
409 result = type(); | 409 result = type(); |
410 } else if (tag.is_object()) { | |
411 oop obj = cp->object_at(index); | |
412 assert(obj->is_instance(), "must be an instance"); | |
413 result = VMToCompiler::createConstantObject(obj, CHECK_NULL); | |
414 } else { | 410 } else { |
415 tty->print("unknown constant pool tag (%s) at cpi %d in %s: ", tag.internal_name(), index, cp->pool_holder()->name()->as_C_string()); | 411 tty->print("unknown constant pool tag (%s) at cpi %d in %s: ", tag.internal_name(), index, cp->pool_holder()->name()->as_C_string()); |
416 ShouldNotReachHere(); | 412 ShouldNotReachHere(); |
417 } | 413 } |
418 | 414 |