Mercurial > hg > truffle
diff src/share/vm/oops/generateOopMap.cpp @ 14909:4ca6dc0799b6
Backout jdk9 merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 01 Apr 2014 13:57:07 +0200 |
parents | 9ae5189791f4 |
children | 89152779163c |
line wrap: on
line diff
--- a/src/share/vm/oops/generateOopMap.cpp Tue Apr 01 14:09:03 2014 +0200 +++ b/src/share/vm/oops/generateOopMap.cpp Tue Apr 01 13:57:07 2014 +0200 @@ -1863,8 +1863,11 @@ constantTag tag = cp->tag_at(ldc.pool_index()); // idx is index in resolved_references BasicType bt = ldc.result_type(); CellTypeState cts; - if (tag.basic_type() == T_OBJECT) { - assert(!tag.is_string_index() && !tag.is_klass_index(), "Unexpected index tag"); + if (tag.is_klass() || + tag.is_unresolved_klass() || + tag.is_string() || + tag.is_method_handle() || + tag.is_method_type()) { assert(bt == T_OBJECT, "Guard is incorrect"); cts = CellTypeState::make_line_ref(bci); } else {