diff options
| author | Andra Danciu <andradanciu@google.com> | 2020-08-11 10:10:40 +0000 |
|---|---|---|
| committer | Andra Danciu <andradanciu@google.com> | 2020-08-11 12:05:00 +0000 |
| commit | ed0acfdaffdbf3c76fa57b15150390dabb4c69aa (patch) | |
| tree | c353c4191ba3d61ad5afda3ccef173f73121a79a /compiler/optimizing/code_generator.cc | |
| parent | 04bc725e1eafb567be44f64f27e441efcc0bc150 (diff) | |
Revert^2 "X86: VarHandle.Get() intrinsic for static primitive fields."
Test: art/test.py --host --32 -r -t 712-varhandle-invocations
Test: ART_READ_BARRIER_TYPE=TABLELOOKUP ART_HEAP_POISONING=true
SOONG_ALLOW_MISSING_DEPENDENCIES=true TARGET_BUILD_UNBUNDLED=true
art/test/testrunner/testrunner.py --interpreter --optimizing --host
--dex2oat-jobs 4 -b --dist --verbose -t 712-varhandle-invocations
Bug: 65872996
This reverts commit e74df4c3f269f2f624fa6f093c48f901fe971002.
Reason for revert: Relanding the change. Support only Baker-style
read barriers for VarHandleGet.
Change-Id: Id02ff69350fb2a2f701a96a591b7efd52f1060e7
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index 6bfdacfb7f..901424f570 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -1688,8 +1688,7 @@ void CodeGenerator::ValidateInvokeRuntimeWithoutRecordingPcInfo(HInstruction* in instruction->IsLoadString() || instruction->IsInstanceOf() || instruction->IsCheckCast() || - (instruction->IsInvokeVirtual() && instruction->GetLocations()->Intrinsified()) || - (instruction->IsInvokeStaticOrDirect() && instruction->GetLocations()->Intrinsified())) + (instruction->IsInvoke() && instruction->GetLocations()->Intrinsified())) << "instruction->DebugName()=" << instruction->DebugName() << " slow_path->GetDescription()=" << slow_path->GetDescription(); } |