commit 1b0adbf7b14973c3f110976de046d75a7d4ed934
author Hiroshi Yamauchi <yamauchi@google.com> Mon Nov 14 17:35:12 2016 -0800
committer Hiroshi Yamauchi <yamauchi@google.com> Wed Nov 16 12:04:19 2016 -0800
tree 35e0e3effe140748982b0ccf295b123c4952dbe8
parent 26c8f54be31ccf99540906746b17fc8bba1bab9a

Ensure CC GC is used for the read barrier config.

To prevent the -Xgc option from causing unsupported GC types to run.

Bug: 12687968
Test: test-art-host with CC.
Change-Id: I10b42190c0888342e9127c52e863ddae82e4d7a1

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 6d849c4..a1b6866 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1023,8 +1023,10 @@
                        runtime_options.GetOrDefault(Opt::NonMovingSpaceCapacity),
                        runtime_options.GetOrDefault(Opt::Image),
                        runtime_options.GetOrDefault(Opt::ImageInstructionSet),
-                       xgc_option.collector_type_,
-                       runtime_options.GetOrDefault(Opt::BackgroundGc),
+                       // Override the collector type to CC if the read barrier config.
+                       kUseReadBarrier ? gc::kCollectorTypeCC : xgc_option.collector_type_,
+                       kUseReadBarrier ? BackgroundGcOption(gc::kCollectorTypeCCBackground)
+                                       : runtime_options.GetOrDefault(Opt::BackgroundGc),
                        runtime_options.GetOrDefault(Opt::LargeObjectSpace),
                        runtime_options.GetOrDefault(Opt::LargeObjectThreshold),
                        runtime_options.GetOrDefault(Opt::ParallelGCThreads),