infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-26 18:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8239142: C2's UseUniqueSubclasses optimization is broken for array accesses

Browse Source 
Avoid resetting the elemtype for array accesses.

Reviewed-by: vlivanov, eosterlund
This commit is contained in:
Tobias Hartmann 2020-02-18 08:28:02 +01:00
parent 4e430ffbb6
commit cb2eeb7d9a
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/opto/parse.hpp
View File

@ -480,7 +480,7 @@ class Parse : public GraphKit {
// Helper function to generate array store
void array_store(BasicType etype);
// Helper function to compute array addressing
Node* array_addressing(BasicType type, int vals, const Type* *result2=NULL);
Node* array_addressing(BasicType type, int vals, const Type*& elemtype);
void clinit_deopt();

19
src/hotspot/share/opto/parse2.cpp
View File

@ -54,7 +54,7 @@ extern int explicit_null_checks_inserted,
void Parse::array_load(BasicType bt) {
const Type* elemtype = Type::TOP;
bool big_val = bt == T_DOUBLE || bt == T_LONG;
Node* adr = array_addressing(bt, 0, &elemtype);
Node* adr = array_addressing(bt, 0, elemtype);
if (stopped()) return; // guaranteed null or range check
pop(); // index (already used)
@ -62,10 +62,7 @@ void Parse::array_load(BasicType bt) {
if (elemtype == TypeInt::BOOL) {
bt = T_BOOLEAN;
} else if (bt == T_OBJECT) {
elemtype = _gvn.type(array)->is_aryptr()->elem()->make_oopptr();
}
const TypeAryPtr* adr_type = TypeAryPtr::get_array_body_type(bt);
Node* ld = access_load_at(array, adr, adr_type, elemtype, bt,
@ -82,7 +79,7 @@ void Parse::array_load(BasicType bt) {
void Parse::array_store(BasicType bt) {
const Type* elemtype = Type::TOP;
bool big_val = bt == T_DOUBLE || bt == T_LONG;
Node* adr = array_addressing(bt, big_val ? 2 : 1, &elemtype);
Node* adr = array_addressing(bt, big_val ? 2 : 1, elemtype);
if (stopped()) return; // guaranteed null or range check
if (bt == T_OBJECT) {
array_store_check();
@ -98,10 +95,7 @@ void Parse::array_store(BasicType bt) {
if (elemtype == TypeInt::BOOL) {
bt = T_BOOLEAN;
} else if (bt == T_OBJECT) {
elemtype = _gvn.type(array)->is_aryptr()->elem()->make_oopptr();
}
const TypeAryPtr* adr_type = TypeAryPtr::get_array_body_type(bt);
access_store_at(array, adr, adr_type, val, elemtype, bt, MO_UNORDERED | IN_HEAP | IS_ARRAY);
@ -110,7 +104,7 @@ void Parse::array_store(BasicType bt) {
//------------------------------array_addressing-------------------------------
// Pull array and index from the stack. Compute pointer-to-element.
Node* Parse::array_addressing(BasicType type, int vals, const Type* *result2) {
Node* Parse::array_addressing(BasicType type, int vals, const Type*& elemtype) {
Node *idx = peek(0+vals); // Get from stack without popping
Node *ary = peek(1+vals); // in case of exception
@ -121,9 +115,9 @@ Node* Parse::array_addressing(BasicType type, int vals, const Type* *result2) {
const TypeAryPtr* arytype = _gvn.type(ary)->is_aryptr();
const TypeInt* sizetype = arytype->size();
const Type* elemtype = arytype->elem();
elemtype = arytype->elem();
if (UseUniqueSubclasses && result2 != NULL) {
if (UseUniqueSubclasses) {
const Type* el = elemtype->make_ptr();
if (el && el->isa_instptr()) {
const TypeInstPtr* toop = el->is_instptr();
@ -207,9 +201,6 @@ Node* Parse::array_addressing(BasicType type, int vals, const Type* *result2) {
// Make array address computation control dependent to prevent it
// from floating above the range check during loop optimizations.
Node* ptr = array_element_address(ary, idx, type, sizetype, control());
if (result2 != NULL) *result2 = elemtype;
assert(ptr != top(), "top should go hand-in-hand with stopped");
return ptr;