diff options
| author | Andra Danciu <andradanciu@google.com> | 2020-08-12 08:58:07 +0000 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2020-08-13 09:41:48 +0000 |
| commit | 1ca6f32dd26f97e2617c45627b470d548d573975 (patch) | |
| tree | ebb64a8b0507ff1b245e77aa435d4ca183874baf /compiler/optimizing/code_generator.cc | |
| parent | 02fd071c03c8587ff2bbea639c165b24c11d9a2f (diff) | |
Revert^2 "Revert^2 "X86: VarHandle.Get() intrinsic for static primitive fields.""
This reverts commit 0e5e1772fb6ed3dcbd1cdaf09e3c8cd2020091d5.
Reason for revert: Relanding the change. It was reverted because it
seemed to be the source of a test failure, but it turned out to be a
known flaky test (Bug: 147572335).
Change-Id: I572d2d1951b0909641a73df0b3ef2fd453f62d8b
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(); } |