Move MethodLoadKind out of HInvokeStaticOrDirect.
To prepare for using it in HInvokeInterface. For consistency, also move
CodePtrLocation.
Test: test.py
Change-Id: I84f973764275002e2adb71080ebc833b2bafb975
diff --git a/compiler/optimizing/critical_native_abi_fixup_arm.cc b/compiler/optimizing/critical_native_abi_fixup_arm.cc
index 94a9730..bf9233f 100644
--- a/compiler/optimizing/critical_native_abi_fixup_arm.cc
+++ b/compiler/optimizing/critical_native_abi_fixup_arm.cc
@@ -29,8 +29,7 @@
// Fix up FP arguments passed in core registers for call to @CriticalNative by inserting fake calls
// to Float.floatToRawIntBits() or Double.doubleToRawLongBits() to satisfy type consistency checks.
static void FixUpArguments(HInvokeStaticOrDirect* invoke) {
- DCHECK_EQ(invoke->GetCodePtrLocation(),
- HInvokeStaticOrDirect::CodePtrLocation::kCallCriticalNative);
+ DCHECK_EQ(invoke->GetCodePtrLocation(), CodePtrLocation::kCallCriticalNative);
size_t reg = 0u;
for (size_t i = 0, num_args = invoke->GetNumberOfArguments(); i != num_args; ++i) {
HInstruction* input = invoke->InputAt(i);
@@ -58,8 +57,8 @@
}
// Use arbitrary dispatch info that does not require the method argument.
HInvokeStaticOrDirect::DispatchInfo dispatch_info = {
- HInvokeStaticOrDirect::MethodLoadKind::kBssEntry,
- HInvokeStaticOrDirect::CodePtrLocation::kCallArtMethod,
+ MethodLoadKind::kBssEntry,
+ CodePtrLocation::kCallArtMethod,
/*method_load_data=*/ 0u
};
HBasicBlock* block = invoke->GetBlock();
@@ -98,7 +97,7 @@
HInstruction* instruction = it.Current();
if (instruction->IsInvokeStaticOrDirect() &&
instruction->AsInvokeStaticOrDirect()->GetCodePtrLocation() ==
- HInvokeStaticOrDirect::CodePtrLocation::kCallCriticalNative) {
+ CodePtrLocation::kCallCriticalNative) {
FixUpArguments(instruction->AsInvokeStaticOrDirect());
}
}