commit 6e4758615308bb525b6350c30468e33a2e1f2274
author Nicolas Geoffray <ngeoffray@google.com> Mon Jun 08 15:52:23 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Jun 08 15:54:14 2015 +0000
tree 0a9fbb0f1f90dfe273d94659f077cc1e6b84966c
parent 1d5006c34d75758752bf3499892e3d5beb11d5dc

Revert "Support for inlining virtual and interface calls."

Fails for some apps.

bug: 21674542

This reverts commit 1d5006c34d75758752bf3499892e3d5beb11d5dc.

Change-Id: Ia74b5e54d59f8ffe9992591324a12f71efb67af4

compiler/optimizing/inliner.h

diff --git a/compiler/optimizing/inliner.h b/compiler/optimizing/inliner.h
index ca71332..b86c1ed 100644
--- a/compiler/optimizing/inliner.h
+++ b/compiler/optimizing/inliner.h
@@ -34,15 +34,13 @@
            const DexCompilationUnit& outer_compilation_unit,
            const DexCompilationUnit& caller_compilation_unit,
            CompilerDriver* compiler_driver,
-           StackHandleScopeCollection* handles,
            OptimizingCompilerStats* stats,
            size_t depth = 0)
       : HOptimization(outer_graph, true, kInlinerPassName, stats),
         outer_compilation_unit_(outer_compilation_unit),
         caller_compilation_unit_(caller_compilation_unit),
         compiler_driver_(compiler_driver),
-        depth_(depth),
-        handles_(handles) {}
+        depth_(depth) {}
 
   void Run() OVERRIDE;
 
@@ -59,7 +57,6 @@
   const DexCompilationUnit& caller_compilation_unit_;
   CompilerDriver* const compiler_driver_;
   const size_t depth_;
-  StackHandleScopeCollection* const handles_;
 
   DISALLOW_COPY_AND_ASSIGN(HInliner);
 };