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/inliner.cc | |
| parent | 8b3609b4daacfd6d823fe9d9052955db2202aa0f (diff) | |
| parent | c88ef3a10c474045a3476a02ae75d07ddd3230b7 (diff) | |
Merge "Revert "Don't use the compiler driver for method resolution.""
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 6d93be37a7..0363f203b2 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -192,10 +192,6 @@ bool HInliner::TryInline(HInvoke* invoke_instruction) { // We can query the dex cache directly. The verifier has populated it already. ArtMethod* resolved_method; if (invoke_instruction->IsInvokeStaticOrDirect()) { - if (invoke_instruction->AsInvokeStaticOrDirect()->IsStringInit()) { - VLOG(compiler) << "Not inlining a String.<init> method"; - return false; - } MethodReference ref = invoke_instruction->AsInvokeStaticOrDirect()->GetTargetMethod(); mirror::DexCache* const dex_cache = (&caller_dex_file == ref.dex_file) ? caller_compilation_unit_.GetDexCache().Get() |