Mercurial > hg > graal-compiler
changeset 3642:8093b8a2a76d
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Nov 2011 13:56:48 +0100 |
parents | a8021a9f2a14 (diff) d7e8627a1016 (current diff) |
children | 441d68905702 9c2c0a182f13 |
files | |
diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/graal/graalVMEntries.cpp Wed Nov 16 13:30:33 2011 +0100 +++ b/src/share/vm/graal/graalVMEntries.cpp Wed Nov 16 13:56:48 2011 +0100 @@ -510,9 +510,7 @@ } result = VMExits::createCiConstantObject(string, CHECK_0); } else if (tag.is_klass() || tag.is_unresolved_klass()) { - bool ignore; - KlassHandle klass = GraalEnv::get_klass_by_index(cp, index, ignore, cp->pool_holder()); - result = GraalCompiler::get_RiType(klass, CHECK_NULL); + result = GraalCompiler::get_RiType(cp, index, cp->pool_holder(), CHECK_NULL); } else if (tag.is_object()) { oop obj = cp->object_at(index); assert(obj->is_instance(), "must be an instance");