diff options
| author | Igor Murashkin <iam@google.com> | 2020-08-11 23:03:59 +0000 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-12 00:56:06 +0000 |
| commit | 0e5e1772fb6ed3dcbd1cdaf09e3c8cd2020091d5 (patch) | |
| tree | 53daaedc7d7a07bec449723521dcfaad3782de83 /compiler/optimizing/code_generator.cc | |
| parent | c3c7dff8784ab409fe0c3e47d9516ed0bc6f6cc9 (diff) | |
Revert "Revert^2 "X86: VarHandle.Get() intrinsic for static primitive fields.""
This reverts commit ed0acfdaffdbf3c76fa57b15150390dabb4c69aa.
Reason for revert: Failing buildbot test
Change-Id: Ib43f526de492f9a09075c6c57658b7a14d05b168
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index 901424f570..6bfdacfb7f 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -1688,7 +1688,8 @@ void CodeGenerator::ValidateInvokeRuntimeWithoutRecordingPcInfo(HInstruction* in instruction->IsLoadString() || instruction->IsInstanceOf() || instruction->IsCheckCast() || - (instruction->IsInvoke() && instruction->GetLocations()->Intrinsified())) + (instruction->IsInvokeVirtual() && instruction->GetLocations()->Intrinsified()) || + (instruction->IsInvokeStaticOrDirect() && instruction->GetLocations()->Intrinsified())) << "instruction->DebugName()=" << instruction->DebugName() << " slow_path->GetDescription()=" << slow_path->GetDescription(); } |