Make change and version bump to aml_art_341311010 for mainline module file: build/apex/manifest-art.json

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25383990', 'googleplex-android-review.googlesource.com/25411821'] into sparse-11063820-L20700030000403937.
SPARSE_CHANGE: I63e819488fb980db95080fa17400712bd8efdbe5
SPARSE_CHANGE: I91a7f9cbb3e10c5495c543802414bffb89fbbb9a

Change-Id: I47d5eef04ec1527cd7c5d1a9ff2d559bd1a9db0d

8 files changed, 19 insertions, 20 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index d9d5431e3e..084f3d7386 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -455,9 +455,6 @@
       "name": "art-run-test-2244-checker-remove-try-boundary[com.google.android.art.apex]"
     },
     {
-      "name": "art-run-test-2247-checker-write-barrier-elimination[com.google.android.art.apex]"
-    },
-    {
       "name": "art-run-test-2249-checker-return-try-boundary-exit-in-loop[com.google.android.art.apex]"
     },
     {
@@ -1880,9 +1877,6 @@
       "name": "art-run-test-2244-checker-remove-try-boundary"
     },
     {
-      "name": "art-run-test-2247-checker-write-barrier-elimination"
-    },
-    {
       "name": "art-run-test-2249-checker-return-try-boundary-exit-in-loop"
     },
     {
@@ -3289,9 +3283,6 @@
       "name": "art-run-test-2244-checker-remove-try-boundary"
     },
     {
-      "name": "art-run-test-2247-checker-write-barrier-elimination"
-    },
-    {
       "name": "art-run-test-2249-checker-return-try-boundary-exit-in-loop"
     },
     {
diff --git a/build/apex/manifest-art.json b/build/apex/manifest-art.json
index 64d186674b..6c4e3e7512 100644
--- a/build/apex/manifest-art.json
+++ b/build/apex/manifest-art.json
@@ -3,7 +3,7 @@
 
   // Placeholder module version to be replaced during build.
   // Do not change!
-  "version": 341311000,
+  "version": 341311010,
 
   "provideNativeLibs": [
     "libjdwp.so"
diff --git a/compiler/optimizing/write_barrier_elimination.cc b/compiler/optimizing/write_barrier_elimination.cc
index eb70b670fe..6182125b74 100644
--- a/compiler/optimizing/write_barrier_elimination.cc
+++ b/compiler/optimizing/write_barrier_elimination.cc
@@ -21,6 +21,9 @@
 #include "base/scoped_arena_containers.h"
 #include "optimizing/nodes.h"
 
+// TODO(b/310755375, solanes): Disable WBE while we investigate crashes.
+constexpr bool kWBEEnabled = false;
+
 namespace art HIDDEN {
 
 class WBEVisitor final : public HGraphVisitor {
@@ -153,8 +156,10 @@ class WBEVisitor final : public HGraphVisitor {
 };
 
 bool WriteBarrierElimination::Run() {
-  WBEVisitor wbe_visitor(graph_, stats_);
-  wbe_visitor.VisitReversePostOrder();
+  if (kWBEEnabled) {
+    WBEVisitor wbe_visitor(graph_, stats_);
+    wbe_visitor.VisitReversePostOrder();
+  }
   return true;
 }
 
diff --git a/runtime/javaheapprof/javaheapsampler.cc b/runtime/javaheapprof/javaheapsampler.cc
index a73ed0b719..74671347c7 100644
--- a/runtime/javaheapprof/javaheapsampler.cc
+++ b/runtime/javaheapprof/javaheapsampler.cc
@@ -131,10 +131,6 @@ void HeapSampler::AdjustSampleOffset(size_t adjustment) {
              << " next_bytes_until_sample = " << next_bytes_until_sample;
 }
 
-bool HeapSampler::IsEnabled() {
-  return enabled_.load(std::memory_order_acquire);
-}
-
 int HeapSampler::GetSamplingInterval() {
   return p_sampling_interval_.load(std::memory_order_acquire);
 }
diff --git a/runtime/javaheapprof/javaheapsampler.h b/runtime/javaheapprof/javaheapsampler.h
index 618893cad0..41514726cd 100644
--- a/runtime/javaheapprof/javaheapsampler.h
+++ b/runtime/javaheapprof/javaheapsampler.h
@@ -68,7 +68,7 @@ class HeapSampler {
   // of new Tlab after Reset.
   void AdjustSampleOffset(size_t adjustment);
   // Is heap sampler enabled?
-  bool IsEnabled();
+  bool IsEnabled() { return enabled_.load(std::memory_order_acquire); }
   // Set the sampling interval.
   void SetSamplingInterval(int sampling_interval) REQUIRES(!geo_dist_rng_lock_);
   // Return the sampling interval.
@@ -80,7 +80,7 @@ class HeapSampler {
   // possibly decreasing sample intervals by sample_adj_bytes.
   size_t PickAndAdjustNextSample(size_t sample_adj_bytes = 0) REQUIRES(!geo_dist_rng_lock_);
 
-  std::atomic<bool> enabled_;
+  std::atomic<bool> enabled_{false};
   // Default sampling interval is 4kb.
   // Writes guarded by geo_dist_rng_lock_.
   std::atomic<int> p_sampling_interval_{4 * 1024};
diff --git a/test/2247-checker-write-barrier-elimination/Android.bp b/test/2247-checker-write-barrier-elimination/Android.bp
index c9744e9b00..5848cb496e 100644
--- a/test/2247-checker-write-barrier-elimination/Android.bp
+++ b/test/2247-checker-write-barrier-elimination/Android.bp
@@ -15,7 +15,7 @@ package {
 java_test {
     name: "art-run-test-2247-checker-write-barrier-elimination",
     defaults: ["art-run-test-defaults"],
-    test_config_template: ":art-run-test-target-template",
+    test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
     data: [
         ":art-run-test-2247-checker-write-barrier-elimination-expected-stdout",
diff --git a/test/knownfailures.json b/test/knownfailures.json
index f6c0e25ebe..91cf968413 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -1,5 +1,10 @@
 [
     {
+        "tests": "2247-checker-write-barrier-elimination",
+        "description": ["Disable 2247- until we fix the WBE issue."],
+        "bug": "http://b/310755375"
+    },
+    {
         "tests": "153-reference-stress",
         "description": ["Disable 153-reference-stress temporarily until a fix",
                         "arrives."],
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index d047c2354a..64846a7ef9 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -215,7 +215,9 @@ known_failing_tests = frozenset([
   "993-breakpoints-non-debuggable",
   "2243-single-step-default",
   "2262-miranda-methods",
-  "2262-default-conflict-methods"
+  "2262-default-conflict-methods",
+  # 2247-checker-write-barrier-elimination: Disabled while we investigate failures
+  "2247-checker-write-barrier-elimination"
 ])
 
 known_failing_on_hwasan_tests = frozenset([