[build fix] Finish removing Cheney GC

oilshell · Aug 10, 2023 · ed3f1ff · ed3f1ff
1 parent 3f68531
commit ed3f1ff
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/build/native.sh b/build/native.sh
@@ -63,11 +63,9 @@ soil-run() {
 
   ./NINJA-config.sh
 
-  # Keep the Cheney build compiling
   ninja _bin/cxx-dbg/oils-for-unix \
         _bin/cxx-asan/oils-for-unix \
-        _bin/cxx-opt/oils-for-unix.stripped \
-        _bin/cxx-opt+cheney/oils-for-unix
+        _bin/cxx-opt/oils-for-unix.stripped
 }
 
 oil-slice-demo() {

diff --git a/build/ninja-rules-cpp.sh b/build/ninja-rules-cpp.sh
@@ -79,7 +79,7 @@ setglobal_compile_flags() {
   fi
 
   case $variant in
-    *+bumpleak|*+bumproot|*+cheney)
+    *+bumpleak|*+bumproot)
       ;;
     *)
       flags="$flags -D MARK_SWEEP"
@@ -148,10 +148,6 @@ setglobal_compile_flags() {
       flags="$flags -D GC_ALWAYS"
       ;;
 
-    *+cheney)
-      flags="$flags -D CHENEY_GC"
-      ;;
-
     *+tcmalloc)
       flags="$flags -D TCMALLOC"
       ;;

diff --git a/metrics/source-code.sh b/metrics/source-code.sh
@@ -162,10 +162,10 @@ cpp-counts() {
     "$@"
 
   # Remove code that isn't "in production"
-  ls mycpp/*.{cc,h} | egrep -v '_test.cc|cheney_heap|bump_leak_heap' \
+  ls mycpp/*.{cc,h} | egrep -v '_test.cc|bump_leak_heap' \
     | $count \
     'Garbage-Collected Runtime' \
-    'Uses a simple Cheney / semi-space collector.' \
+    'Uses a fork-friendly Mark-Sweep collector.' \
     "$@"
 
   ls mycpp/*_test.cc cpp/*_test.cc | $count \

diff --git a/test/coverage.sh b/test/coverage.sh
@@ -54,7 +54,6 @@ html-report() {
     --ignore-filename-regex '_gen/' \
     --ignore-filename-regex 'mycpp/demo' \
     --ignore-filename-regex 'mycpp/examples' \
-    --ignore-filename-regex 'mycpp/cheney' \
     --ignore-filename-regex 'prebuilt/' \
   )