summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Calin Juravle <calin@google.com> 2017-03-28 15:31:44 -0700
committer Calin Juravle <calin@google.com> 2017-03-29 16:19:53 -0700
commit8af70893e4f44367cc40837b0411d84a36c7ad7f (patch)
treeccbd5d6e80f07ef5c47443671beeb3f4ad86090d
parentf1e1c7e9b90662282615e165d6a1b06e05df8393 (diff)
(Re)enable the use of inline caches in AOT
Test: m test-art-host (638-checker-inline-caches, 644-checker-deopt) Bug: 36371709 Change-Id: Ic6e1b58845e7f7107be5a7041c47c44702af7b02
-rw-r--r--compiler/optimizing/inliner.cc2
-rw-r--r--test/knownfailures.json6
2 files changed, 1 insertions, 7 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index e1cf2485ab..79cd7048a5 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -63,7 +63,7 @@ static constexpr size_t kMaximumNumberOfCumulatedDexRegisters = 64;
static constexpr size_t kMaximumNumberOfRecursiveCalls = 4;
// Controls the use of inline caches in AOT mode.
-static constexpr bool kUseAOTInlineCaches = false;
+static constexpr bool kUseAOTInlineCaches = true;
// We check for line numbers to make sure the DepthString implementation
// aligns the output nicely.
diff --git a/test/knownfailures.json b/test/knownfailures.json
index 8c7eb111c8..1738acf06d 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -362,12 +362,6 @@
"variant": "interp-ac"
},
{
- "tests": ["638-checker-inline-caches",
- "644-checker-deopt"],
- "description": ["Disabled temporarily until a fix arrives."],
- "bug": "http://b/36371709"
- },
- {
"tests": ["629-vdex-speed",
"634-vdex-duplicate"],
"description": ["Profile driven dexlayout does not work with vdex."],