diff options
| author | Alex Light <allight@google.com> | 2021-01-22 06:43:28 -0800 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2021-01-22 07:15:17 -0800 |
| commit | b171bc4b117e0d8d399f7a71a95ca5ec6cff19ca (patch) | |
| tree | 2e2c6cfd5e27dc964a6cae1eaf774c875bf4a9bc /compiler/optimizing/load_store_analysis_test.cc | |
| parent | ef01e763eb700b513e4042ef7a1fbd22ecb10fc4 (diff) | |
Change offsets in LSE_test to be outside of Object
Several tests in load_store_elimination_test used field offsets that
were within the ObjectHeader on read-barrier configurations. Since LSE
special cases object-header fields this could cause tests to
incorrectly fail.
Test: ./test.py --host
Bug: 67037140
Change-Id: I3146f5310dd4474bbc7079ac2e7584459e5c5ac6
Diffstat (limited to 'compiler/optimizing/load_store_analysis_test.cc')
| -rw-r--r-- | compiler/optimizing/load_store_analysis_test.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/compiler/optimizing/load_store_analysis_test.cc b/compiler/optimizing/load_store_analysis_test.cc index ffb3d0c6f7..a5b628cf05 100644 --- a/compiler/optimizing/load_store_analysis_test.cc +++ b/compiler/optimizing/load_store_analysis_test.cc @@ -166,7 +166,7 @@ TEST_F(LoadStoreAnalysisTest, FieldHeapLocations) { c1, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, kUnknownFieldIndex, kUnknownClassDefIndex, @@ -175,7 +175,7 @@ TEST_F(LoadStoreAnalysisTest, FieldHeapLocations) { HInstanceFieldGet* get_field10 = new (GetAllocator()) HInstanceFieldGet(object, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, kUnknownFieldIndex, kUnknownClassDefIndex, @@ -894,7 +894,7 @@ TEST_F(LoadStoreAnalysisTest, PartialEscape) { c0, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -907,7 +907,7 @@ TEST_F(LoadStoreAnalysisTest, PartialEscape) { HInstruction* read_final = new (GetAllocator()) HInstanceFieldGet(new_inst, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1001,7 +1001,7 @@ TEST_F(LoadStoreAnalysisTest, PartialEscape2) { c0, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1089,7 +1089,7 @@ TEST_F(LoadStoreAnalysisTest, PartialEscape3) { c10, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1122,7 +1122,7 @@ TEST_F(LoadStoreAnalysisTest, PartialEscape3) { c20, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1135,7 +1135,7 @@ TEST_F(LoadStoreAnalysisTest, PartialEscape3) { HInstruction* read_final = new (GetAllocator()) HInstanceFieldGet(new_inst, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1230,7 +1230,7 @@ TEST_F(LoadStoreAnalysisTest, TotalEscapeAdjacent) { c0, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1348,7 +1348,7 @@ TEST_F(LoadStoreAnalysisTest, TotalEscape) { c0, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1363,7 +1363,7 @@ TEST_F(LoadStoreAnalysisTest, TotalEscape) { HInstruction* read_final = new (GetAllocator()) HInstanceFieldGet(new_inst, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1421,7 +1421,7 @@ TEST_F(LoadStoreAnalysisTest, TotalEscape2) { c0, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1540,7 +1540,7 @@ TEST_F(LoadStoreAnalysisTest, DoubleDiamondEscape) { c0, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1553,7 +1553,7 @@ TEST_F(LoadStoreAnalysisTest, DoubleDiamondEscape) { HInstruction* read_mid = new (GetAllocator()) HInstanceFieldGet(new_inst, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1564,7 +1564,7 @@ TEST_F(LoadStoreAnalysisTest, DoubleDiamondEscape) { mul_mid, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1596,7 +1596,7 @@ TEST_F(LoadStoreAnalysisTest, DoubleDiamondEscape) { c0, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, @@ -1609,7 +1609,7 @@ TEST_F(LoadStoreAnalysisTest, DoubleDiamondEscape) { HInstruction* read_final = new (GetAllocator()) HInstanceFieldGet(new_inst, nullptr, DataType::Type::kInt32, - MemberOffset(10), + MemberOffset(32), false, 0, 0, |