From a5ca888d715cd0c6c421313211caa1928be3e399 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 24 Feb 2015 08:10:57 +0000
Subject: Revert "Add JIT"

Sorry, run-test crashes on target:
0-05 12:15:51.633 I/DEBUG   (27995): Abort message: 'art/runtime/mirror/art_method.cc:349] Check failed: PcIsWithinQuickCode(reinterpret_cast<uintptr_t>(code), pc) java.lang.Throwable java.lang.Throwable.fillInStackTrace() pc=71e3366b code=0x71e3362d size=ad000000'
10-05 12:15:51.633 I/DEBUG   (27995):     r0 00000000  r1 0000542b  r2 00000006  r3 00000000
10-05 12:15:51.633 I/DEBUG   (27995):     r4 00000006  r5 b6f9addc  r6 00000002  r7 0000010c
10-05 12:15:51.633 I/DEBUG   (27995):     r8 b63fe1e8  r9 be8e1418  sl b6427400  fp b63fcce0
10-05 12:15:51.633 I/DEBUG   (27995):     ip 0000542b  sp be8e1358  lr b6e9a27b  pc b6e9c280  cpsr 40070010
10-05 12:15:51.633 I/DEBUG   (27995):

Bug: 17950037
This reverts commit 2535abe7d1fcdd0e6aca782b1f1932a703ed50a4.

Change-Id: I6f88849bc6f2befed0c0aaa0b7b2a08c967a83c3
---
 runtime/runtime.h | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

(limited to 'runtime/runtime.h')

diff --git a/runtime/runtime.h b/runtime/runtime.h
index 3b6df51369..fb9ca401ac 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -48,12 +48,6 @@ namespace gc {
     class GarbageCollector;
   }  // namespace collector
 }  // namespace gc
-
-namespace jit {
-  class Jit;
-  class JitOptions;
-}  // namespace jit
-
 namespace mirror {
   class ArtMethod;
   class ClassLoader;
@@ -101,18 +95,12 @@ class Runtime {
   static bool Create(const RuntimeOptions& options, bool ignore_unrecognized)
       SHARED_TRYLOCK_FUNCTION(true, Locks::mutator_lock_);
 
-  // IsAotCompiler for compilers that don't have a running runtime. Only dex2oat currently.
-  bool IsAotCompiler() const {
-    return !UseJit() && IsCompiler();
-  }
-
-  // IsCompiler is any runtime which has a running compiler, either dex2oat or JIT.
   bool IsCompiler() const {
     return compiler_callbacks_ != nullptr;
   }
 
   bool CanRelocate() const {
-    return !IsAotCompiler() || compiler_callbacks_->IsRelocationPossible();
+    return !IsCompiler() || compiler_callbacks_->IsRelocationPossible();
   }
 
   bool ShouldRelocate() const {
@@ -351,7 +339,9 @@ class Runtime {
     return !imt_conflict_method_.IsNull();
   }
 
-  void SetImtConflictMethod(mirror::ArtMethod* method);
+  void SetImtConflictMethod(mirror::ArtMethod* method) {
+    imt_conflict_method_ = GcRoot<mirror::ArtMethod>(method);
+  }
   void SetImtUnimplementedMethod(mirror::ArtMethod* method) {
     imt_unimplemented_method_ = GcRoot<mirror::ArtMethod>(method);
   }
@@ -431,14 +421,6 @@ class Runtime {
     kUnload,
     kInitialize
   };
-
-  jit::Jit* GetJit() {
-    return jit_.get();
-  }
-  bool UseJit() const {
-    return jit_.get() != nullptr;
-  }
-
   void PreZygoteFork();
   bool InitZygote();
   void DidForkFromZygote(JNIEnv* env, NativeBridgeAction action, const char* isa);
@@ -539,8 +521,6 @@ class Runtime {
     return zygote_max_failed_boots_;
   }
 
-  void CreateJit();
-
  private:
   static void InitPlatformSignalHandlers();
 
@@ -620,9 +600,6 @@ class Runtime {
 
   JavaVMExt* java_vm_;
 
-  std::unique_ptr<jit::Jit> jit_;
-  std::unique_ptr<jit::JitOptions> jit_options_;
-
   // Fault message, printed when we get a SIGSEGV.
   Mutex fault_message_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER;
   std::string fault_message_ GUARDED_BY(fault_message_lock_);
-- 
cgit v1.2.3