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
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc
index 6bfdacf..901424f 100644
--- a/compiler/optimizing/code_generator.cc
+++ b/compiler/optimizing/code_generator.cc
@@ -1688,8 +1688,7 @@
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();
}