diff options
| author | 2023-10-27 11:05:27 +0200 | |
|---|---|---|
| committer | 2023-10-30 15:37:52 +0000 | |
| commit | fe7f7aa33d085ed3097ab499277c63aafdfd0e5c (patch) | |
| tree | e7c3b5dd11b3a9d459a70dd933d77cb76d48dae5 /compiler/optimizing/instruction_simplifier_shared.cc | |
| parent | 178e647cfc23649acd4340fb60ce4d0f5207a526 (diff) | |
Replace `gUseReadBarrier` with compiler option in compiler.
Leave a few `gUseReadBarrier` uses in JNI macro assemblers.
We shall deaal with these later.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: run-gtests.sh
Test: testrunner.py --target --optimizing
Bug: 289805127
Change-Id: I9d2aa245cee4c650129f169a82beda7dc0dd6a35
Diffstat (limited to 'compiler/optimizing/instruction_simplifier_shared.cc')
| -rw-r--r-- | compiler/optimizing/instruction_simplifier_shared.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/optimizing/instruction_simplifier_shared.cc b/compiler/optimizing/instruction_simplifier_shared.cc index 34daae21ee..50ea2b929b 100644 --- a/compiler/optimizing/instruction_simplifier_shared.cc +++ b/compiler/optimizing/instruction_simplifier_shared.cc @@ -16,6 +16,7 @@ #include "instruction_simplifier_shared.h" +#include "code_generator.h" #include "mirror/array-inl.h" namespace art HIDDEN { @@ -229,7 +230,8 @@ bool TryMergeNegatedInput(HBinaryOperation* op) { } -bool TryExtractArrayAccessAddress(HInstruction* access, +bool TryExtractArrayAccessAddress(CodeGenerator* codegen, + HInstruction* access, HInstruction* array, HInstruction* index, size_t data_offset) { @@ -244,8 +246,7 @@ bool TryExtractArrayAccessAddress(HInstruction* access, // The access may require a runtime call or the original array pointer. return false; } - if (gUseReadBarrier && - !kUseBakerReadBarrier && + if (codegen->EmitNonBakerReadBarrier() && access->IsArrayGet() && access->GetType() == DataType::Type::kReference) { // For object arrays, the non-Baker read barrier instrumentation requires |