Merge pull request #2220 from schveiguy/fix18996

Fix issue 18996 - ProtoGC should support removing roots and ranges that were not originally added
dlang · Jun 18, 2018 · 90c140f · 90c140f
2 parents 42e555a + 1b0af1e
commit 90c140f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/gc/impl/proto/gc.d b/src/gc/impl/proto/gc.d
@@ -177,7 +177,6 @@ class ProtoGC : GC
                 return;
             }
         }
-        assert(false);
     }
 
     @property RootIterator rootIter() return @nogc
@@ -211,7 +210,6 @@ class ProtoGC : GC
                 return;
             }
         }
-        assert(false);
     }
 
     @property RangeIterator rangeIter() return @nogc

diff --git a/test/init_fini/Makefile b/test/init_fini/Makefile
@@ -1,6 +1,6 @@
 include ../common.mak
 
-TESTS:=thread_join runtime_args
+TESTS:=thread_join runtime_args test18996
 
 .PHONY: all clean
 all: $(addprefix $(ROOT)/,$(addsuffix .done,$(TESTS)))

diff --git a/test/init_fini/src/test18996.d b/test/init_fini/src/test18996.d
@@ -0,0 +1,13 @@
+// Issue https://issues.dlang.org/show_bug.cgi?id=18996
+// Array!string calls removeRange without first adding the range, but never
+// initializes the GC. The behavior of the default GC is to ignore removing
+// ranges when the range wasn't added. The ProtoGC originally would crash when
+// this happened.
+
+import core.memory;
+
+void main()
+{
+    GC.removeRange(null);
+    GC.removeRoot(null);
+}