# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@gmail.com>
# Date 1321452831 -3600
# Node ID 441d68905702841ade97a53c3cfeab144e9b40a6
# Parent  8093b8a2a76d0260660685db5c6ee82cdab6d661# Parent  ce5841053fc9853d0de654a3b1c73160d1e21a6b
Merge

diff -r ce5841053fc9 -r 441d68905702 src/share/vm/graal/graalVMEntries.cpp
--- a/src/share/vm/graal/graalVMEntries.cpp	Wed Nov 16 15:13:29 2011 +0100
+++ b/src/share/vm/graal/graalVMEntries.cpp	Wed Nov 16 15:13:51 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");