changeset 5753:b00c6d846a0a

Merge
author drchase
date Thu, 12 Dec 2013 18:00:27 -0500
parents 9ecf408d4568 00bcb186fc5a
children ddcb2ac2900d
files
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/oops/generateOopMap.cpp	Thu Dec 12 11:25:32 2013 -0800
+++ b/src/share/vm/oops/generateOopMap.cpp	Thu Dec 12 18:00:27 2013 -0500
@@ -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 {