--- a/hotspot/src/share/vm/ci/ciTypeFlow.cpp	Thu Jun 10 13:04:20 2010 -0700
+++ b/hotspot/src/share/vm/ci/ciTypeFlow.cpp	Sat Jun 12 22:53:43 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 {