From f9487c039efb4112616d438593a2ab02792e0304 Mon Sep 17 00:00:00 2001 From: Dave Allison Date: Tue, 8 Apr 2014 23:08:12 +0000 Subject: Revert "Revert "Use trampolines for calls to helpers"" This reverts commit 081f73e888b3c246cf7635db37b7f1105cf1a2ff. Change-Id: Ibd777f8ce73cf8ed6c4cb81d50bf6437ac28cb61 Conflicts: compiler/dex/quick/mir_to_lir.h --- compiler/optimizing/optimizing_compiler.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'compiler/optimizing/optimizing_compiler.cc') diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index d19c40c291..f48e9d04cd 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -109,6 +109,7 @@ CompiledMethod* OptimizingCompiler::TryCompile(CompilerDriver& driver, mapping_table, vmap_table, gc_map, + nullptr, nullptr); } -- cgit v1.2.3-59-g8ed1b