diff 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
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Tue Mar 05 23:44:54 2013 +0100
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Tue Mar 05 23:58:57 2013 +0100
@@ -407,10 +407,6 @@
   } else if (tag.is_klass() || tag.is_unresolved_klass()) {
     Handle type = GraalCompiler::get_JavaType(cp, index, cp->pool_holder(), CHECK_NULL);
     result = type();
-  } else if (tag.is_object()) {
-    oop obj = cp->object_at(index);
-    assert(obj->is_instance(), "must be an instance");
-    result = VMToCompiler::createConstantObject(obj, CHECK_NULL);
   } else {
     tty->print("unknown constant pool tag (%s) at cpi %d in %s: ", tag.internal_name(), index, cp->pool_holder()->name()->as_C_string());
     ShouldNotReachHere();