From e74df4c3f269f2f624fa6f093c48f901fe971002 Mon Sep 17 00:00:00 2001 From: Andra Danciu Date: Mon, 10 Aug 2020 09:35:51 +0000 Subject: Revert "X86: VarHandle.Get() intrinsic for static primitive fields." This reverts commit d9af38a3b76fc54909148456da2701666bade6e0. Reason for revert: Broken build git_master-art-host/art-read-barrier-table-lookup @ 6749888 Change-Id: I17f5717e3a9a204568526fc72bce5d56a383e38d --- 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