commit f290c01c61f8a2979efa74ffcd2f54c5e426a3d0
author Nicolas Geoffray <ngeoffray@google.com> Fri Jan 27 23:09:22 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Feb 02 15:48:23 2017 +0000
tree 73c3f221a0d0299f8a595fe3e4b60aff2b632b27
parent de09f06e243f9548e58feec79b0cd249065a5f28

Inline across dex files for JIT.

bug:30933338
test: ART_TEST_JIT=true test-art-host test-art-target

Change-Id: I4ac708d70d90c2db4139d99a75bf4665a810c206

compiler/optimizing/stack_map_stream.cc

diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc
index a9a1e6f..48037b3 100644
--- a/compiler/optimizing/stack_map_stream.cc
+++ b/compiler/optimizing/stack_map_stream.cc
@@ -17,6 +17,7 @@
 #include "stack_map_stream.h"
 
 #include "art_method.h"
+#include "optimizing/optimizing_compiler.h"
 #include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
 
@@ -103,11 +104,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,