From 98e6ce44c700abd9375fe17f0aa31fea1e1e938b Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 16 Feb 2016 18:42:15 +0000 Subject: Remove string init map. Partial revert of the String init change. - Make Quick bailout in the presence of String allocation. - Rely on the compiler for knowing when dex registers alias. bug:27173201 Change-Id: I0bf58ba3825c71cef110b53f3a0a6f567cb2ef9a --- compiler/dex/quick/quick_compiler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/dex/quick/quick_compiler.h') diff --git a/compiler/dex/quick/quick_compiler.h b/compiler/dex/quick/quick_compiler.h index 55f45f1ab0..f32cf866ca 100644 --- a/compiler/dex/quick/quick_compiler.h +++ b/compiler/dex/quick/quick_compiler.h @@ -75,7 +75,7 @@ class QuickCompiler : public Compiler { explicit QuickCompiler(CompilerDriver* driver); private: - bool CanCompileInstruction(const MIR* mir, const DexFile& dex_file) const; + bool CanCompileInstruction(const MIR* mir, const DexFile& dex_file, CompilationUnit* cu) const; std::unique_ptr pre_opt_pass_manager_; std::unique_ptr post_opt_pass_manager_; -- cgit v1.2.3-59-g8ed1b