Mercurial > hg > truffle

diff src/share/vm/oops/generateOopMap.cpp @ 17524:89152779163c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8-b132
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 11:59:32 +0200
parents 4ca6dc0799b6
children
line wrap: on
line diff
--- a/src/share/vm/oops/generateOopMap.cpp	Wed Oct 15 15:35:33 2014 +0200
+++ b/src/share/vm/oops/generateOopMap.cpp	Wed Oct 15 11:59:32 2014 +0200
@@ -1863,11 +1863,8 @@
   constantTag tag = cp->tag_at(ldc.pool_index()); // idx is index in resolved_references
   BasicType       bt  = ldc.result_type();
   CellTypeState   cts;
-  if (tag.is_klass() ||
-      tag.is_unresolved_klass() ||
-      tag.is_string() ||
-      tag.is_method_handle() ||
-      tag.is_method_type()) {
+  if (tag.basic_type() == T_OBJECT) {
+    assert(!tag.is_string_index() && !tag.is_klass_index(), "Unexpected index tag");
     assert(bt == T_OBJECT, "Guard is incorrect");
     cts = CellTypeState::make_line_ref(bci);
   } else {