commit d16da8bd8106452eea82408748dc6b3fd64bcb80
author Nicolas Geoffray <ngeoffray@google.com> Fri Feb 03 10:35:47 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Feb 03 10:35:47 2017 +0000
tree 027c5bfdea98ec8726436e695b5eb4d9572bbaf5
parent f290c01c61f8a2979efa74ffcd2f54c5e426a3d0

Revert "Inline across dex files for JIT."

Broke hikey build.

bug:30933338

This reverts commit f290c01c61f8a2979efa74ffcd2f54c5e426a3d0.

Change-Id: I3363d703c54d0f9b69197a29395cc08f60c8b2ac

compiler/optimizing/stack_map_stream.cc

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