commit f9487c039efb4112616d438593a2ab02792e0304
author Dave Allison <dallison@google.com> Tue Apr 08 23:08:12 2014 +0000
committer Dave Allison <dallison@google.com> Wed Apr 09 13:18:07 2014 -0700
tree 95f88645bec774d3e8df170bd0f40e4cd0911a34
parent b24b0e2bb128532945b31ea62715776d7751f84d

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

diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index d19c40c..f48e9d0 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -109,6 +109,7 @@
                             mapping_table,
                             vmap_table,
                             gc_map,
+                            nullptr,
                             nullptr);
 }