summaryrefslogtreecommitdiff
path: root/compiler/optimizing/builder.cc
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2015-12-08 22:42:10 +0000
committer android-build-merger <android-build-merger@google.com> 2015-12-08 22:42:10 +0000
commit782ffa9f4fda3f8c9f23aef798d25703d02015a4 (patch)
tree8f655b382e73222e70e30daaeedc3999014aa7ae /compiler/optimizing/builder.cc
parent0b81f1715d6af9f98f982d6511e48973aa5a836a (diff)
parenteb5ddd7b02ce2d25d4f28f85a13aac628526e1c1 (diff)
Merge "ART: Check invoke-interface earlier in verifier"
am: eb5ddd7b02 * commit 'eb5ddd7b02ce2d25d4f28f85a13aac628526e1c1': ART: Check invoke-interface earlier in verifier
Diffstat (limited to 'compiler/optimizing/builder.cc')
-rw-r--r--compiler/optimizing/builder.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index 8e75bdcdc9..2bbf500a98 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -744,7 +744,7 @@ ArtMethod* HGraphBuilder::ResolveMethod(uint16_t method_idx, InvokeType invoke_t
soa.Decode<mirror::ClassLoader*>(dex_compilation_unit_->GetClassLoader())));
Handle<mirror::Class> compiling_class(hs.NewHandle(GetCompilingClass()));
- ArtMethod* resolved_method = class_linker->ResolveMethod(
+ ArtMethod* resolved_method = class_linker->ResolveMethod<ClassLinker::kForceICCECheck>(
*dex_compilation_unit_->GetDexFile(),
method_idx,
dex_compilation_unit_->GetDexCache(),