# HG changeset patch
# User drchase
# Date 1386889227 18000
# Node ID b00c6d846a0aa532943e624415e6a5c036285794
# Parent  9ecf408d45684d6d9d4e4d28ce5c398ae8ee162e# Parent  00bcb186fc5ac7e8e15aa248100dba5710dd8a52
Merge

diff -r 9ecf408d4568 -r b00c6d846a0a src/share/vm/oops/generateOopMap.cpp
--- 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 {