Fix the read barrier builds.
A check failure (!UseJit() in ArtMethod::Invoke()) in forced interpret
only mode in the eng build with JIT enabled by default on target.
A build failure (inl header file issues) in the USE_BAKER_READ_BARRIER
build.
Change-Id: Ib13632b10864ad8b4691b66971c0ab5d2ae1e675
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc
index 5e38470..9ec64d4 100644
--- a/runtime/jni_internal.cc
+++ b/runtime/jni_internal.cc
@@ -41,7 +41,7 @@
#include "mirror/art_method-inl.h"
#include "mirror/class-inl.h"
#include "mirror/class_loader.h"
-#include "mirror/field.h"
+#include "mirror/field-inl.h"
#include "mirror/object-inl.h"
#include "mirror/object_array-inl.h"
#include "mirror/string-inl.h"
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc
index 0ca9d24..c893f0a 100644
--- a/runtime/native/java_lang_Class.cc
+++ b/runtime/native/java_lang_Class.cc
@@ -24,7 +24,7 @@
#include "mirror/art_field-inl.h"
#include "mirror/class-inl.h"
#include "mirror/class_loader.h"
-#include "mirror/field.h"
+#include "mirror/field-inl.h"
#include "mirror/object-inl.h"
#include "mirror/object_array-inl.h"
#include "mirror/string-inl.h"
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 23a7db6..9e0ab0c 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1646,6 +1646,10 @@
void Runtime::CreateJit() {
CHECK(!IsAotCompiler());
+ if (GetInstrumentation()->IsForcedInterpretOnly()) {
+ // Don't create JIT if forced interpret only.
+ return;
+ }
std::string error_msg;
jit_.reset(jit::Jit::Create(jit_options_.get(), &error_msg));
if (jit_.get() != nullptr) {