Mercurial > hg > graal-jvmci-8
changeset 17458:ddcb2ac2900d
Merge
author | drchase |
---|---|
date | Thu, 12 Dec 2013 20:55:36 -0500 |
parents | 8beff993531a (current diff) b00c6d846a0a (diff) |
children | 22c88c127fa4 |
files | |
diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/oops/generateOopMap.cpp Thu Dec 12 18:57:38 2013 -0500 +++ b/src/share/vm/oops/generateOopMap.cpp Thu Dec 12 20:55:36 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 {