From 0e5e1772fb6ed3dcbd1cdaf09e3c8cd2020091d5 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Tue, 11 Aug 2020 23:03:59 +0000 Subject: Revert "Revert^2 "X86: VarHandle.Get() intrinsic for static primitive fields."" This reverts commit ed0acfdaffdbf3c76fa57b15150390dabb4c69aa. Reason for revert: Failing buildbot test Change-Id: Ib43f526de492f9a09075c6c57658b7a14d05b168 --- compiler/optimizing/code_generator.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler/optimizing/code_generator.cc') 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(); } -- cgit v1.2.3-59-g8ed1b