diff options
| author | 2018-12-14 08:54:21 +0000 | |
|---|---|---|
| committer | 2018-12-14 08:54:28 +0000 | |
| commit | 075456ea917f70cb729125c92e0b890a9f1207c6 (patch) | |
| tree | 9cc40d68cf2b053a2bcec7fc026e10bb12d5ee93 /compiler/optimizing/intrinsics.h | |
| parent | 344b0d18eb9f9f2f2ef704acadc510a6dd56a282 (diff) | |
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
Diffstat (limited to 'compiler/optimizing/intrinsics.h')
| -rw-r--r-- | compiler/optimizing/intrinsics.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/intrinsics.h b/compiler/optimizing/intrinsics.h index 5bd1122698..50b13c842b 100644 --- a/compiler/optimizing/intrinsics.h +++ b/compiler/optimizing/intrinsics.h @@ -243,7 +243,8 @@ void IntrinsicCodeGenerator ## Arch::Visit ## Name(HInvoke* invoke ATTRIBUTE_UNU // 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"; \ } \ |