Merge commit 'f7dab643ff254ead592d7bd038d858ebc9f2570c' into analyzer

Author: stereotype441

runtime/vm/flag_list.h

@@ -68,6 +68,8 @@ constexpr bool kDartPrecompiledRuntime = false;
   P(compilation_counter_threshold, int, 10,                                    \
     "Function's usage-counter value before interpreted function is compiled, " \
     "-1 means never")                                                          \
+  P(concurrent_mark, bool, USING_MULTICORE,                                    \
+    "Concurrent mark for old generation.")                                     \
   P(concurrent_sweep, bool, USING_MULTICORE,                                   \
     "Concurrent sweep for old generation.")                                    \
   R(dedup_instructions, true, bool, false,                                     \

runtime/vm/heap/become.h

@@ -80,17 +80,16 @@ class Become : public AllStatic {
   // Useful for atomically applying behavior and schema changes.
   static void ElementsForwardIdentity(const Array& before, const Array& after);
 
-  // Update any references pointing to forwarding objects to point the
-  // forwarding objects' targets. Used by the implementation of become and the
-  // simplistic compactor.
-  static void FollowForwardingPointers(Thread* thread);
-
   // Convert and instance object into a dummy object,
   // making the instance independent of its class.
   // (used for morphic instances during reload).
   static void MakeDummyObject(const Instance& instance);
 
  private:
+  // Update any references pointing to forwarding objects to point the
+  // forwarding objects' targets.
+  static void FollowForwardingPointers(Thread* thread);
+
   static void CrashDump(RawObject* before_obj, RawObject* after_obj);
 };
 

runtime/vm/heap/pages.cc

@@ -1002,7 +1002,8 @@ void PageSpace::CollectGarbage(bool compact, bool finalize) {
 #if defined(TARGET_ARCH_IA32)
     return;  // Barrier not implemented.
 #else
-    if (FLAG_marker_tasks == 0) return;   // Concurrent marking disabled.
+    if (!FLAG_concurrent_mark) return;    // Disabled.
+    if (FLAG_marker_tasks == 0) return;   // Disabled.
     if (FLAG_write_protect_code) return;  // Not implemented.
 #endif
   }

runtime/vm/isolate.cc

@@ -82,9 +82,9 @@ DEFINE_FLAG_HANDLER(CheckedModeHandler, checked, "Enable checked mode.");
 
 static void DeterministicModeHandler(bool value) {
   if (value) {
-    FLAG_marker_tasks = 0;                // Timing dependent.
     FLAG_background_compilation = false;  // Timing dependent.
     FLAG_collect_code = false;            // Timing dependent.
+    FLAG_concurrent_mark = false;         // Timing dependent.
     FLAG_concurrent_sweep = false;        // Timing dependent.
     FLAG_random_seed = 0x44617274;  // "Dart"
 #if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)