Merge pull request #3310 from Geod24/move-rt-to-core-internal

dlang-bot · web-flow · commit 362cdc1ada34 · 2020-12-11T16:17:13.000+01:00
Move rt.backtrace to core.internal.backtrace
merged-on-behalf-of: Petar Kirov &lt;PetarKirov@users.noreply.github.com&gt;
diff --git a/mak/COPY b/mak/COPY
@@ -33,6 +33,7 @@ COPY=\
 	$(IMPDIR)\core\internal\moving.d \
 	$(IMPDIR)\core\internal\parseoptions.d \
 	$(IMPDIR)\core\internal\postblit.d \
+	$(IMPDIR)\core\internal\qsort.d \
 	$(IMPDIR)\core\internal\spinlock.d \
 	$(IMPDIR)\core\internal\string.d \
 	$(IMPDIR)\core\internal\switch_.d \
@@ -50,9 +51,18 @@ COPY=\
 	$(IMPDIR)\core\internal\array\operations.d \
 	$(IMPDIR)\core\internal\array\utils.d \
 	\
+	$(IMPDIR)\core\internal\backtrace\dwarf.d \
+	$(IMPDIR)\core\internal\backtrace\elf.d \
+	$(IMPDIR)\core\internal\backtrace\macho.d \
+	\
 	$(IMPDIR)\core\internal\elf\dl.d \
 	$(IMPDIR)\core\internal\elf\io.d \
 	\
+	$(IMPDIR)\core\internal\container\array.d \
+	$(IMPDIR)\core\internal\container\common.d \
+	$(IMPDIR)\core\internal\container\hashtab.d \
+	$(IMPDIR)\core\internal\container\treap.d \
+	\
 	$(IMPDIR)\core\internal\util\array.d \
 	\
 	$(IMPDIR)\core\internal\vararg\aarch64.d \
diff --git a/mak/DOCS b/mak/DOCS
@@ -82,6 +82,16 @@ DOCS=\
 	$(DOCDIR)\core_thread_osthread.html \
 	\
 	$(DOCDIR)\core_internal_execinfo.html \
+	$(DOCDIR)\core_internal_qsort.html \
+	\
+	$(DOCDIR)\core_internal_backtrace_dwarf.html \
+	$(DOCDIR)\core_internal_backtrace_elf.html \
+	$(DOCDIR)\core_internal_backtrace_macho.html \
+	\
+	$(DOCDIR)\core_internal_container_array.html \
+	$(DOCDIR)\core_internal_container_common.html \
+	$(DOCDIR)\core_internal_container_hashtab.html \
+	$(DOCDIR)\core_internal_container_treap.html \
 	\
 	$(DOCDIR)\rt_aaA.html \
 	$(DOCDIR)\rt_aApply.html \
@@ -92,10 +102,6 @@ DOCS=\
 	$(DOCDIR)\rt_arrayassign.html \
 	$(DOCDIR)\rt_arraycat.html \
 	\
-	$(DOCDIR)\rt_backtrace_dwarf.html \
-	$(DOCDIR)\rt_backtrace_elf.html \
-	$(DOCDIR)\rt_backtrace_macho.html \
-	\
 	$(DOCDIR)\rt_cast_.html \
 	$(DOCDIR)\rt_cmath2.html \
 	$(DOCDIR)\rt_config.html \
@@ -115,7 +121,6 @@ DOCS=\
 	$(DOCDIR)\rt_minfo.html \
 	$(DOCDIR)\rt_monitor_.html \
 	$(DOCDIR)\rt_profilegc.html \
-	$(DOCDIR)\rt_qsort.html \
 	$(DOCDIR)\rt_sections_android.html \
 	$(DOCDIR)\rt_sections.html \
 	$(DOCDIR)\rt_sections_darwin_64.html \
@@ -131,10 +136,5 @@ DOCS=\
 	\
 	$(DOCDIR)\rt_unwind.html \
 	\
-	$(DOCDIR)\rt_util_container_array.html \
-	$(DOCDIR)\rt_util_container_common.html \
-	$(DOCDIR)\rt_util_container_hashtab.html \
-	$(DOCDIR)\rt_util_container_treap.html \
 	$(DOCDIR)\rt_util_utility.html \
-	$(DOCDIR)\rt_util_random.html \
 	$(DOCDIR)\rt_util_typeinfo.html \
diff --git a/mak/SRCS b/mak/SRCS
@@ -33,6 +33,7 @@ SRCS=\
 	src\core\internal\moving.d \
 	src\core\internal\parseoptions.d \
 	src\core\internal\postblit.d \
+	src\core\internal\qsort.d \
 	src\core\internal\spinlock.d \
 	src\core\internal\string.d \
 	src\core\internal\switch_.d \
@@ -50,6 +51,15 @@ SRCS=\
 	src\core\internal\array\operations.d \
 	src\core\internal\array\utils.d \
 	\
+	src\core\internal\backtrace\dwarf.d \
+	src\core\internal\backtrace\elf.d \
+	src\core\internal\backtrace\macho.d \
+	\
+	src\core\internal\container\array.d \
+	src\core\internal\container\common.d \
+	src\core\internal\container\hashtab.d \
+	src\core\internal\container\treap.d \
+	\
 	src\core\internal\elf\dl.d \
 	src\core\internal\elf\io.d \
 	\
@@ -520,7 +530,6 @@ SRCS=\
 	src\rt\msvc.d \
 	src\rt\msvc_math.d \
 	src\rt\profilegc.d \
-	src\rt\qsort.d \
 	src\rt\sections.d \
 	src\rt\sections_android.d \
 	src\rt\sections_darwin_64.d \
@@ -535,16 +544,7 @@ SRCS=\
 	src\rt\tracegc.d \
 	src\rt\unwind.d \
 	\
-	src\rt\backtrace\dwarf.d \
-	src\rt\backtrace\elf.d \
-	src\rt\backtrace\macho.d \
-	\
-	src\rt\util\random.d \
 	src\rt\util\typeinfo.d \
 	src\rt\util\utility.d \
-	src\rt\util\container\array.d \
-	src\rt\util\container\common.d \
-	src\rt\util\container\hashtab.d \
-	src\rt\util\container\treap.d \
 	\
 	src\etc\linux\memoryerror.d
diff --git a/posix.mak b/posix.mak
@@ -159,6 +159,12 @@ $(DOCDIR)/core_gc_%.html : src/core/gc/%.d $(DMD)
 $(DOCDIR)/core_internal_%.html : src/core/internal/%.d $(DMD)
 	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
 
+$(DOCDIR)/core_internal_backtrace_%.html : src/core/internal/backtrace/%.d $(DMD)
+	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
+
+$(DOCDIR)/core_internal_container_%.html : src/core/internal/container/%.d $(DMD)
+	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
+
 $(DOCDIR)/core_internal_elf_%.html : src/core/internal/elf/%.d $(DMD)
 	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
 
@@ -189,15 +195,9 @@ $(DOCDIR)/core_thread_%.html : src/core/thread/%.d $(DMD)
 $(DOCDIR)/rt_%.html : src/rt/%.d $(DMD)
 	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
 
-$(DOCDIR)/rt_backtrace_%.html : src/rt/backtrace/%.d $(DMD)
-	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
-
 $(DOCDIR)/rt_typeinfo_%.html : src/rt/typeinfo/%.d $(DMD)
 	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
 
-$(DOCDIR)/rt_util_container_%.html : src/rt/util/container/%.d $(DMD)
-	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
-
 $(DOCDIR)/rt_util_%.html : src/rt/util/%.d $(DMD)
 	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
 
diff --git a/src/core/internal/backtrace/dwarf.d b/src/core/internal/backtrace/dwarf.d
@@ -47,7 +47,7 @@
  * Source: $(DRUNTIMESRC rt/backtrace/dwarf.d)
  */
 
-module rt.backtrace.dwarf;
+module core.internal.backtrace.dwarf;
 
 import core.internal.execinfo;
 import core.internal.string;
@@ -64,11 +64,11 @@ else version (WatchOS)
     version = Darwin;
 
 version (Darwin)
-    import rt.backtrace.macho;
+    import core.internal.backtrace.macho;
 else
-    import rt.backtrace.elf;
+    import core.internal.backtrace.elf;
 
-import rt.util.container.array;
+import core.internal.container.array;
 import core.stdc.string : strlen, memcpy;
 
 //debug = DwarfDebugMachine;
diff --git a/src/core/internal/backtrace/elf.d b/src/core/internal/backtrace/elf.d
@@ -9,7 +9,7 @@
  * Source: $(DRUNTIMESRC rt/backtrace/elf.d)
  */
 
-module rt.backtrace.elf;
+module core.internal.backtrace.elf;
 
 version (linux)
 {
diff --git a/src/core/internal/backtrace/macho.d b/src/core/internal/backtrace/macho.d
@@ -6,7 +6,7 @@
  * Authors:   Jacob Carlborg
  * Source:    $(DRUNTIMESRC rt/backtrace/macho.d)
  */
-module rt.backtrace.macho;
+module core.internal.backtrace.macho;
 
 version (OSX)
     version = Darwin;
diff --git a/src/core/internal/container/array.d b/src/core/internal/container/array.d
@@ -5,9 +5,9 @@
  * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Martin Nowak
  */
-module rt.util.container.array;
+module core.internal.container.array;
 
-static import common = rt.util.container.common;
+static import common = core.internal.container.common;
 
 import core.exception : onOutOfMemoryErrorNoGC;
 
diff --git a/src/core/internal/container/common.d b/src/core/internal/container/common.d
@@ -5,7 +5,7 @@
  * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Martin Nowak
  */
-module rt.util.container.common;
+module core.internal.container.common;
 
 import core.stdc.stdlib : malloc, realloc;
 public import core.stdc.stdlib : free;
diff --git a/src/core/internal/container/hashtab.d b/src/core/internal/container/hashtab.d
@@ -5,10 +5,10 @@
  * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Martin Nowak
  */
-module rt.util.container.hashtab;
+module core.internal.container.hashtab;
 
-import rt.util.container.array;
-static import common = rt.util.container.common;
+import core.internal.container.array;
+static import common = core.internal.container.common;
 
 struct HashTab(Key, Value)
 {
diff --git a/src/core/internal/container/treap.d b/src/core/internal/container/treap.d
@@ -4,11 +4,10 @@
  * Copyright: Copyright Digital Mars 2014 - 2014.
  * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  */
-module rt.util.container.treap;
+module core.internal.container.treap;
 
-static import common = rt.util.container.common;
-import rt.util.random;
-import rt.qsort;
+static import common = core.internal.container.common;
+import core.internal.qsort;
 
 struct Treap(E)
 {
@@ -337,3 +336,33 @@ initialLoop:
     data.length = 0;
     assert(treap == data);
 }
+
+/// Random number generators for internal usage.
+private struct Rand
+{
+    private ulong rng_state;
+
+@safe @nogc nothrow:
+pure:
+
+    auto opCall()
+    {
+        auto result = front;
+        popFront();
+        return result;
+    }
+
+    @property uint front()
+    {
+        return cast(uint)(rng_state >> 32);
+    }
+
+    void popFront()
+    {
+        immutable ulong a = 2862933555777941757;
+        immutable ulong c = 1;
+        rng_state = a * rng_state + c;
+    }
+
+    enum empty = false;
+}
diff --git a/src/core/internal/qsort.d b/src/core/internal/qsort.d
@@ -6,17 +6,11 @@
  * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Walter Bright, Martin Nowak
  */
-
-/*          Copyright Digital Mars 2000 - 2010.
- * Distributed under the Boost Software License, Version 1.0.
- *    (See accompanying file LICENSE_1_0.txt or copy at
- *          http://www.boost.org/LICENSE_1_0.txt)
- */
-module rt.qsort;
+module core.internal.qsort;
 
 //debug=qsort;
 
-private import core.stdc.stdlib;
+import core.stdc.stdlib;
 
 version (OSX)
     version = Darwin;
diff --git a/src/core/runtime.d b/src/core/runtime.d
@@ -816,12 +816,7 @@ static if (hasExecinfo) private class DefaultTraceInfo : Throwable.TraceInfo
 
         static if (enableDwarf)
         {
-            import core.internal.traits : externDFunc;
-
-            alias traceHandlerOpApplyImpl = externDFunc!(
-                "rt.backtrace.dwarf.traceHandlerOpApplyImpl",
-                int function(const(void*)[], scope int delegate(ref size_t, ref const(char[])))
-                );
+            import core.internal.backtrace.dwarf;
 
             if (numframes >= FIRSTFRAME)
             {
diff --git a/src/gc/impl/conservative/gc.d b/src/gc/impl/conservative/gc.d
@@ -40,7 +40,7 @@ import gc.os;
 import core.gc.config;
 import core.gc.gcinterface;
 
-import rt.util.container.treap;
+import core.internal.container.treap;
 
 import cstdlib = core.stdc.stdlib : calloc, free, malloc, realloc;
 import core.stdc.string : memcpy, memset, memmove;
diff --git a/src/gc/impl/manual/gc.d b/src/gc/impl/manual/gc.d
@@ -27,7 +27,7 @@ module gc.impl.manual.gc;
 
 import core.gc.gcinterface;
 
-import rt.util.container.array;
+import core.internal.container.array;
 
 import cstdlib = core.stdc.stdlib : calloc, free, malloc, realloc;
 static import core.memory;
diff --git a/src/gc/impl/proto/gc.d b/src/gc/impl/proto/gc.d
@@ -3,7 +3,7 @@ module gc.impl.proto.gc;
 
 import core.gc.gcinterface;
 
-import rt.util.container.array;
+import core.internal.container.array;
 
 import cstdlib = core.stdc.stdlib : calloc, free, malloc, realloc;
 static import core.memory;
diff --git a/src/rt/minfo.d b/src/rt/minfo.d
@@ -165,7 +165,7 @@ struct ModuleGroup
     void sortCtors(string cycleHandling)
     {
         import core.bitop : bts, btr, bt, BitRange;
-        import rt.util.container.hashtab;
+        import core.internal.container.hashtab;
 
         enum OnCycle
         {
@@ -566,7 +566,7 @@ struct ModuleGroup
         }
 
         auto stack = (cast(StackRec*).calloc(len, StackRec.sizeof))[0 .. len];
-        // TODO: reuse GCBits by moving it to rt.util.container or core.internal
+        // TODO: reuse GCBits by moving it to core.internal.container
         immutable nwords = (len + 8 * size_t.sizeof - 1) / (8 * size_t.sizeof);
         auto ctorstart = cast(size_t*).malloc(nwords * size_t.sizeof);
         auto ctordone = cast(size_t*).malloc(nwords * size_t.sizeof);
diff --git a/src/rt/profilegc.d b/src/rt/profilegc.d
@@ -20,7 +20,7 @@ import core.stdc.stdlib;
 import core.stdc.string;
 
 import core.exception : onOutOfMemoryError;
-import rt.util.container.hashtab;
+import core.internal.container.hashtab;
 
 struct Entry { ulong count, size; }
 
diff --git a/src/rt/sections_elf_shared.d b/src/rt/sections_elf_shared.d
@@ -58,8 +58,8 @@ import core.sys.posix.pthread;
 import rt.deh;
 import rt.dmain2;
 import rt.minfo;
-import rt.util.container.array;
-import rt.util.container.hashtab;
+import core.internal.container.array;
+import core.internal.container.hashtab;
 import rt.util.utility : safeAssert;
 
 alias DSO SectionGroup;
diff --git a/src/rt/sections_osx_x86.d b/src/rt/sections_osx_x86.d
@@ -30,7 +30,7 @@ import core.sys.posix.pthread;
 import core.sys.darwin.mach.dyld;
 import core.sys.darwin.mach.getsect;
 import rt.deh, rt.minfo;
-import rt.util.container.array;
+import core.internal.container.array;
 
 struct SectionGroup
 {
diff --git a/src/rt/sections_osx_x86_64.d b/src/rt/sections_osx_x86_64.d
@@ -33,7 +33,7 @@ import core.sys.darwin.mach.getsect;
 import rt.deh;
 import rt.minfo;
 import rt.sections_darwin_64;
-import rt.util.container.array;
+import core.internal.container.array;
 import rt.util.utility : safeAssert;
 
 struct SectionGroup
diff --git a/src/rt/util/random.d b/src/rt/util/random.d

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* Source: $(DRUNTIMESRC rt/backtrace/elf.d)`
`10`	`10`	`*/`
`11`	`11`
`12`		`-module rt.backtrace.elf;`
	`12`	`+module core.internal.backtrace.elf;`
`13`	`13`
`14`	`14`	`version (linux)`
`15`	`15`	`{`