diff options
| author | 2015-12-01 16:28:28 +0000 | |
|---|---|---|
| committer | 2015-12-01 16:28:28 +0000 | |
| commit | 1cfe7fd885fc21292dfe74b554c38b07304cb10e (patch) | |
| tree | 5a809d58debfe5265bb40c2ae71f67a0532dd974 /compiler/optimizing/intrinsics.cc | |
| parent | 8b3609b4daacfd6d823fe9d9052955db2202aa0f (diff) | |
| parent | c88ef3a10c474045a3476a02ae75d07ddd3230b7 (diff) | |
Merge "Revert "Don't use the compiler driver for method resolution.""
Diffstat (limited to 'compiler/optimizing/intrinsics.cc')
| -rw-r--r-- | compiler/optimizing/intrinsics.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc index 834081188b..b01324ec3b 100644 --- a/compiler/optimizing/intrinsics.cc +++ b/compiler/optimizing/intrinsics.cc @@ -384,7 +384,7 @@ static bool CheckInvokeType(Intrinsics intrinsic, HInvoke* invoke, const DexFile // InvokeStaticOrDirect. InvokeType intrinsic_type = GetIntrinsicInvokeType(intrinsic); InvokeType invoke_type = invoke->IsInvokeStaticOrDirect() ? - invoke->AsInvokeStaticOrDirect()->GetOptimizedInvokeType() : + invoke->AsInvokeStaticOrDirect()->GetInvokeType() : invoke->IsInvokeVirtual() ? kVirtual : kSuper; switch (intrinsic_type) { case kStatic: |