Mercurial > hg > truffle
diff src/share/vm/ci/ciTypeFlow.cpp @ 1604:b918d354830a
6960865: ldc of unloaded class throws an assert in ciTypeFlow
Summary: Support java_mirror for unloaded klasses, arrays as well as instances. Simplify ciTypeFlow by removing unused path.
Reviewed-by: kvn
author | jrose |
---|---|
date | Sat, 12 Jun 2010 22:53:43 -0700 |
parents | e9ff18c4ace7 |
children | 0e35fa8ebccd |
line wrap: on
line diff
--- a/src/share/vm/ci/ciTypeFlow.cpp Thu Jun 10 13:04:20 2010 -0700 +++ b/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 {