summaryrefslogtreecommitdiff
path: root/compiler/optimizing/builder.cc
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2015-12-10 16:01:41 -0800
committer android-build-merger <android-build-merger@google.com> 2015-12-10 16:01:41 -0800
commit673fdc77f1242af51e10e7a74975ef57d138b36b (patch)
treec878b89f24f88426291d0b1738e759a6aa0099b6 /compiler/optimizing/builder.cc
parent898e04bc81777772ed269bc89294c3fb54f7a481 (diff)
parent682857fece0425362c4fb55da611e7144c9ec092 (diff)
Merge "ART: Stash a resolved method late in the verifier" am: 748047de83
am: 682857fece * commit '682857fece0425362c4fb55da611e7144c9ec092': ART: Stash a resolved method late in the 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 b156d136ca..e1404ce59c 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(),