Mercurial > hg > truffle

diff src/share/vm/ci/ciTypeFlow.cpp @ 1608:2389669474a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jrose
date Tue, 15 Jun 2010 15:57:36 -0700
parents b918d354830a
children 0e35fa8ebccd
line wrap: on
line diff
--- a/src/share/vm/ci/ciTypeFlow.cpp	Thu Jun 10 08:27:35 2010 -0700
+++ b/src/share/vm/ci/ciTypeFlow.cpp	Tue Jun 15 15:57:36 2010 -0700
@@ -712,10 +712,8 @@
     ciObject* obj = con.as_object();
     if (obj->is_null_object()) {
       push_null();
-    } else if (obj->is_klass()) {
-      // The type of ldc <class> is java.lang.Class
-      push_object(outer()->env()->Class_klass());
     } else {
+      assert(!obj->is_klass(), "must be java_mirror of klass");
       push_object(obj->klass());
     }
   } else {