Skip to content

Commit 451611f

Browse files
committed
8274401: C2: GraphKit::load_array_element bypasses Access API
Backport-of: a8210c53e7af1cb558251fcb420de1b8a5461b25
1 parent 61a56e3 commit 451611f

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

src/hotspot/share/opto/graphKit.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,14 +1748,15 @@ Node* GraphKit::array_element_address(Node* ary, Node* idx, BasicType elembt,
17481748
}
17491749

17501750
//-------------------------load_array_element-------------------------
1751-
Node* GraphKit::load_array_element(Node* ctl, Node* ary, Node* idx, const TypeAryPtr* arytype) {
1751+
Node* GraphKit::load_array_element(Node* ary, Node* idx, const TypeAryPtr* arytype, bool set_ctrl) {
17521752
const Type* elemtype = arytype->elem();
17531753
BasicType elembt = elemtype->array_element_basic_type();
17541754
Node* adr = array_element_address(ary, idx, elembt, arytype->size());
17551755
if (elembt == T_NARROWOOP) {
17561756
elembt = T_OBJECT; // To satisfy switch in LoadNode::make()
17571757
}
1758-
Node* ld = make_load(ctl, adr, elemtype, elembt, arytype, MemNode::unordered);
1758+
Node* ld = access_load_at(ary, adr, arytype, elemtype, elembt,
1759+
IN_HEAP | IS_ARRAY | (set_ctrl ? C2_CONTROL_DEPENDENT_LOAD : 0));
17591760
return ld;
17601761
}
17611762

@@ -4260,7 +4261,7 @@ void GraphKit::inflate_string_slow(Node* src, Node* dst, Node* start, Node* coun
42604261
record_for_igvn(mem);
42614262
set_control(head);
42624263
set_memory(mem, TypeAryPtr::BYTES);
4263-
Node* ch = load_array_element(control(), src, i_byte, TypeAryPtr::BYTES);
4264+
Node* ch = load_array_element(src, i_byte, TypeAryPtr::BYTES, /* set_ctrl */ true);
42644265
Node* st = store_to_memory(control(), array_element_address(dst, i_char, T_BYTE),
42654266
AndI(ch, intcon(0xff)), T_CHAR, TypeAryPtr::BYTES, MemNode::unordered,
42664267
false, false, true /* mismatched */);

src/hotspot/share/opto/graphKit.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ class GraphKit : public Phase {
660660
Node* ctrl = NULL);
661661

662662
// Return a load of array element at idx.
663-
Node* load_array_element(Node* ctl, Node* ary, Node* idx, const TypeAryPtr* arytype);
663+
Node* load_array_element(Node* ary, Node* idx, const TypeAryPtr* arytype, bool set_ctrl);
664664

665665
//---------------- Dtrace support --------------------
666666
void make_dtrace_method_entry_exit(ciMethod* method, bool is_entry);

src/hotspot/share/opto/library_call.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6167,7 +6167,7 @@ Node * LibraryCallKit::get_key_start_from_aescrypt_object(Node *aescrypt_object)
61676167
if (objSessionK == NULL) {
61686168
return (Node *) NULL;
61696169
}
6170-
Node* objAESCryptKey = load_array_element(control(), objSessionK, intcon(0), TypeAryPtr::OOPS);
6170+
Node* objAESCryptKey = load_array_element(objSessionK, intcon(0), TypeAryPtr::OOPS, /* set_ctrl */ true);
61716171
#else
61726172
Node* objAESCryptKey = load_field_from_object(aescrypt_object, "K", "[I");
61736173
#endif // PPC64

src/hotspot/share/opto/stringopts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ Node* PhaseStringOpts::int_stringSize(GraphKit& kit, Node* arg) {
12741274
kit.set_control(loop);
12751275
Node* sizeTable = fetch_static_field(kit, size_table_field);
12761276

1277-
Node* value = kit.load_array_element(NULL, sizeTable, index, TypeAryPtr::INTS);
1277+
Node* value = kit.load_array_element(sizeTable, index, TypeAryPtr::INTS, /* set_ctrl */ false);
12781278
C->record_for_igvn(value);
12791279
Node* limit = __ CmpI(phi, value);
12801280
Node* limitb = __ Bool(limit, BoolTest::le);

0 commit comments

Comments
 (0)