commit 075456ea917f70cb729125c92e0b890a9f1207c6
author Nicolas Geoffray <ngeoffray@google.com> Fri Dec 14 08:54:21 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Dec 14 08:54:28 2018 +0000
tree 9cc40d68cf2b053a2bcec7fc026e10bb12d5ee93
parent 344b0d18eb9f9f2f2ef704acadc510a6dd56a282

Revert "Revert "Add a baseline flag to JIT compile.""

This reverts commit 344b0d18eb9f9f2f2ef704acadc510a6dd56a282.

Reason for revert: Not the CL that broke the tests.

Change-Id: I38221d1ac723e5ea71cb398401e2fda8dd2d7db9

compiler/optimizing/intrinsics.h

diff --git a/compiler/optimizing/intrinsics.h b/compiler/optimizing/intrinsics.h
index 5bd1122..50b13c8 100644
--- a/compiler/optimizing/intrinsics.h
+++ b/compiler/optimizing/intrinsics.h
@@ -243,7 +243,8 @@
 // compilation.
 #define UNREACHABLE_INTRINSIC(Arch, Name)                                \
 void IntrinsicLocationsBuilder ## Arch::Visit ## Name(HInvoke* invoke) { \
-  if (!codegen_->GetCompilerOptions().IsBaseline()) {                    \
+  if (Runtime::Current()->IsAotCompiler() &&                             \
+      !codegen_->GetCompilerOptions().IsBaseline()) {                    \
     LOG(FATAL) << "Unreachable: intrinsic " << invoke->GetIntrinsic()    \
                << " should have been converted to HIR";                  \
   }                                                                      \