summaryrefslogtreecommitdiff
path: root/compiler/optimizing/builder.cc
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2015-12-10 13:37:39 -0800
committer android-build-merger <android-build-merger@google.com> 2015-12-10 13:37:39 -0800
commit2b895fd83371fb1a0cd75c7de3411cfb59f442c6 (patch)
tree4ae775d15f51efb704ca5b00a2ee4b6fb6615812 /compiler/optimizing/builder.cc
parent6e0e9c77b0b6109605eef6e5ea2c2b3de30a6ffc (diff)
parent170e01a6b59b3242a5afc76c3a03c00ce288150f (diff)
Merge "Revert "ART: Check invoke-interface earlier in verifier""
am: 170e01a6b5 * commit '170e01a6b59b3242a5afc76c3a03c00ce288150f': Revert "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 e1404ce59c..b156d136ca 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<ClassLinker::kForceICCECheck>(
+ ArtMethod* resolved_method = class_linker->ResolveMethod(
*dex_compilation_unit_->GetDexFile(),
method_idx,
dex_compilation_unit_->GetDexCache(),