commit fbdfa6d7485534eedbd3fb32cf572529ebddb63c
author Nicolas Geoffray <ngeoffray@google.com> Fri Feb 03 10:43:13 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Feb 06 08:26:48 2017 +0000
tree 4835ed17e31443c3e220a2eaff8d88c6c16b9cd0
parent 8781fe65fe41d971173bb2d05afe0dc00b5c08ce

Revert "Revert "Inline across dex files for JIT.""

bug:30933338

This reverts commit d16da8bd8106452eea82408748dc6b3fd64bcb80.

Change-Id: I6a30354d6d00442cb1a542af063c7769865e369d

compiler/optimizing/stack_map_stream.cc

diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc
index e4d4800..10f5cab 100644
--- a/compiler/optimizing/stack_map_stream.cc
+++ b/compiler/optimizing/stack_map_stream.cc
@@ -20,6 +20,7 @@
 
 #include "art_method-inl.h"
 #include "base/stl_util.h"
+#include "optimizing/optimizing_compiler.h"
 #include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
 
@@ -107,11 +108,6 @@
   current_dex_register_++;
 }
 
-static bool EncodeArtMethodInInlineInfo(ArtMethod* method ATTRIBUTE_UNUSED) {
-  // Note: the runtime is null only for unit testing.
-  return Runtime::Current() == nullptr || !Runtime::Current()->IsAotCompiler();
-}
-
 void StackMapStream::BeginInlineInfoEntry(ArtMethod* method,
                                           uint32_t dex_pc,
                                           uint32_t num_dex_registers,