# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1321448208 -3600
# Node ID 8093b8a2a76d0260660685db5c6ee82cdab6d661
# Parent  a8021a9f2a149bc5b5d431b28ab0ae4edd4116d8# Parent  d7e8627a10161ed6c7f19a1f351f682eb5340230
Merge.

diff -r d7e8627a1016 -r 8093b8a2a76d src/share/vm/graal/graalVMEntries.cpp
--- 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");