From 6d69b52f331f788cbd1f21ffd5b87cb3b39965e4 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 23 Sep 2020 14:47:28 +0100 Subject: Move MethodLoadKind out of HInvokeStaticOrDirect. To prepare for using it in HInvokeInterface. For consistency, also move CodePtrLocation. Test: test.py Change-Id: I84f973764275002e2adb71080ebc833b2bafb975 --- compiler/optimizing/intrinsics_utils.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'compiler/optimizing/intrinsics_utils.h') diff --git a/compiler/optimizing/intrinsics_utils.h b/compiler/optimizing/intrinsics_utils.h index d900b21073..8c9dd14b19 100644 --- a/compiler/optimizing/intrinsics_utils.h +++ b/compiler/optimizing/intrinsics_utils.h @@ -63,10 +63,9 @@ class IntrinsicSlowPath : public TSlowPathCode { if (invoke_->IsInvokeStaticOrDirect()) { HInvokeStaticOrDirect* invoke_static_or_direct = invoke_->AsInvokeStaticOrDirect(); - DCHECK_NE(invoke_static_or_direct->GetMethodLoadKind(), - HInvokeStaticOrDirect::MethodLoadKind::kRecursive); + DCHECK_NE(invoke_static_or_direct->GetMethodLoadKind(), MethodLoadKind::kRecursive); DCHECK_NE(invoke_static_or_direct->GetCodePtrLocation(), - HInvokeStaticOrDirect::CodePtrLocation::kCallCriticalNative); + CodePtrLocation::kCallCriticalNative); codegen->GenerateStaticOrDirectCall(invoke_static_or_direct, method_loc, this); } else if (invoke_->IsInvokeVirtual()) { codegen->GenerateVirtualCall(invoke_->AsInvokeVirtual(), method_loc, this); -- cgit v1.2.3-59-g8ed1b