1.1 --- a/src/share/vm/oops/generateOopMap.cpp Thu Jan 16 14:25:51 2014 +0100
1.2 +++ b/src/share/vm/oops/generateOopMap.cpp Wed Jan 22 17:42:23 2014 -0800
1.3 @@ -1863,11 +1863,8 @@
1.4 constantTag tag = cp->tag_at(ldc.pool_index()); // idx is index in resolved_references
1.5 BasicType bt = ldc.result_type();
1.6 CellTypeState cts;
1.7 - if (tag.is_klass() ||
1.8 - tag.is_unresolved_klass() ||
1.9 - tag.is_string() ||
1.10 - tag.is_method_handle() ||
1.11 - tag.is_method_type()) {
1.12 + if (tag.basic_type() == T_OBJECT) {
1.13 + assert(!tag.is_string_index() && !tag.is_klass_index(), "Unexpected index tag");
1.14 assert(bt == T_OBJECT, "Guard is incorrect");
1.15 cts = CellTypeState::make_line_ref(bci);
1.16 } else {
