Merge pull request #3111 from kinke/cleanup_upstream

dlang-bot · web-flow · commit 86e5cf3fa15a · 2020-05-25T09:00:34.000+02:00
Upstream a few things from LDC to reduce the diff
merged-on-behalf-of: Nicholas Wilson &lt;thewilsonator@users.noreply.github.com&gt;
diff --git a/src/core/atomic.d b/src/core/atomic.d
@@ -926,11 +926,11 @@ version (CoreUnittest)
 
         testXCHG!(shared int)(42);
 
-        testType!(float)(1.0f);
+        testType!(float)(0.1f);
 
         static if (has64BitCAS)
         {
-            testType!(double)(1.0);
+            testType!(double)(0.1);
             testType!(long)();
             testType!(ulong)();
         }
@@ -970,15 +970,15 @@ version (CoreUnittest)
         atomicOp!"-="(i, cast(size_t) 1);
         assert(i == 0);
 
-        shared float f = 0;
-        atomicOp!"+="(f, 1);
-        assert(f == 1);
+        shared float f = 0.1f;
+        atomicOp!"+="(f, 0.1f);
+        assert(f > 0.1999f && f < 0.2001f);
 
         static if (has64BitCAS)
         {
-            shared double d = 0;
-            atomicOp!"+="(d, 1);
-            assert(d == 1);
+            shared double d = 0.1;
+            atomicOp!"+="(d, 0.1);
+            assert(d > 0.1999 && d < 0.2001);
         }
     }
 
diff --git a/src/core/runtime.d b/src/core/runtime.d
@@ -820,7 +820,7 @@ static if (hasExecinfo) private class DefaultTraceInfo : Throwable.TraceInfo
 
             alias traceHandlerOpApplyImpl = externDFunc!(
                 "rt.backtrace.dwarf.traceHandlerOpApplyImpl",
-                int function(const void*[], scope int delegate(ref size_t, ref const(char[])))
+                int function(const(void*)[], scope int delegate(ref size_t, ref const(char[])))
                 );
 
             if (numframes >= FIRSTFRAME)
diff --git a/src/core/simd.d b/src/core/simd.d
@@ -38,41 +38,53 @@ template Vector(T)
 
 /* Handy aliases
  */
-static if (is(Vector!(void[8])))    alias Vector!(void[8])  void8;          ///
-static if (is(Vector!(double[1])))  alias Vector!(double[1]) double1;       ///
-static if (is(Vector!(float[2])))   alias Vector!(float[2])  float2;        ///
-static if (is(Vector!(byte[8])))    alias Vector!(byte[8])  byte8;          ///
-static if (is(Vector!(ubyte[8])))   alias Vector!(ubyte[8]) ubyte8;         ///
-static if (is(Vector!(short[4])))   alias Vector!(short[4])  short4;        ///
-static if (is(Vector!(ushort[4])))  alias Vector!(ushort[4]) ushort4;       ///
-static if (is(Vector!(int[2])))     alias Vector!(int[2])    int2;          ///
-static if (is(Vector!(uint[2])))    alias Vector!(uint[2])   uint2;         ///
-static if (is(Vector!(long[1])))    alias Vector!(long[1])   long1;         ///
-static if (is(Vector!(ulong[1])))   alias Vector!(ulong[1])  ulong1;        ///
-
-static if (is(Vector!(void[16])))   alias Vector!(void[16])  void16;        ///
-static if (is(Vector!(double[2])))  alias Vector!(double[2]) double2;       ///
-static if (is(Vector!(float[4])))   alias Vector!(float[4])  float4;        ///
-static if (is(Vector!(byte[16])))   alias Vector!(byte[16])  byte16;        ///
-static if (is(Vector!(ubyte[16])))  alias Vector!(ubyte[16]) ubyte16;       ///
-static if (is(Vector!(short[8])))   alias Vector!(short[8])  short8;        ///
-static if (is(Vector!(ushort[8])))  alias Vector!(ushort[8]) ushort8;       ///
-static if (is(Vector!(int[4])))     alias Vector!(int[4])    int4;          ///
-static if (is(Vector!(uint[4])))    alias Vector!(uint[4])   uint4;         ///
-static if (is(Vector!(long[2])))    alias Vector!(long[2])   long2;         ///
-static if (is(Vector!(ulong[2])))   alias Vector!(ulong[2])  ulong2;        ///
-
-static if (is(Vector!(void[32])))   alias Vector!(void[32])   void32;        ///
-static if (is(Vector!(double[4])))  alias Vector!(double[4])  double4;       ///
-static if (is(Vector!(float[8])))   alias Vector!(float[8])   float8;        ///
-static if (is(Vector!(byte[32])))   alias Vector!(byte[32])   byte32;        ///
-static if (is(Vector!(ubyte[32])))  alias Vector!(ubyte[32])  ubyte32;       ///
-static if (is(Vector!(short[16])))  alias Vector!(short[16])  short16;       ///
-static if (is(Vector!(ushort[16]))) alias Vector!(ushort[16]) ushort16;      ///
-static if (is(Vector!(int[8])))     alias Vector!(int[8])     int8;          ///
-static if (is(Vector!(uint[8])))    alias Vector!(uint[8])    uint8;         ///
-static if (is(Vector!(long[4])))    alias Vector!(long[4])    long4;         ///
-static if (is(Vector!(ulong[4])))   alias Vector!(ulong[4])   ulong4;        ///
+static if (is(Vector!(void[8])))    alias Vector!(void[8])    void8;        ///
+static if (is(Vector!(double[1])))  alias Vector!(double[1])  double1;      ///
+static if (is(Vector!(float[2])))   alias Vector!(float[2])   float2;       ///
+static if (is(Vector!(byte[8])))    alias Vector!(byte[8])    byte8;        ///
+static if (is(Vector!(ubyte[8])))   alias Vector!(ubyte[8])   ubyte8;       ///
+static if (is(Vector!(short[4])))   alias Vector!(short[4])   short4;       ///
+static if (is(Vector!(ushort[4])))  alias Vector!(ushort[4])  ushort4;      ///
+static if (is(Vector!(int[2])))     alias Vector!(int[2])     int2;         ///
+static if (is(Vector!(uint[2])))    alias Vector!(uint[2])    uint2;        ///
+static if (is(Vector!(long[1])))    alias Vector!(long[1])    long1;        ///
+static if (is(Vector!(ulong[1])))   alias Vector!(ulong[1])   ulong1;       ///
+
+static if (is(Vector!(void[16])))   alias Vector!(void[16])   void16;       ///
+static if (is(Vector!(double[2])))  alias Vector!(double[2])  double2;      ///
+static if (is(Vector!(float[4])))   alias Vector!(float[4])   float4;       ///
+static if (is(Vector!(byte[16])))   alias Vector!(byte[16])   byte16;       ///
+static if (is(Vector!(ubyte[16])))  alias Vector!(ubyte[16])  ubyte16;      ///
+static if (is(Vector!(short[8])))   alias Vector!(short[8])   short8;       ///
+static if (is(Vector!(ushort[8])))  alias Vector!(ushort[8])  ushort8;      ///
+static if (is(Vector!(int[4])))     alias Vector!(int[4])     int4;         ///
+static if (is(Vector!(uint[4])))    alias Vector!(uint[4])    uint4;        ///
+static if (is(Vector!(long[2])))    alias Vector!(long[2])    long2;        ///
+static if (is(Vector!(ulong[2])))   alias Vector!(ulong[2])   ulong2;       ///
+
+static if (is(Vector!(void[32])))   alias Vector!(void[32])   void32;       ///
+static if (is(Vector!(double[4])))  alias Vector!(double[4])  double4;      ///
+static if (is(Vector!(float[8])))   alias Vector!(float[8])   float8;       ///
+static if (is(Vector!(byte[32])))   alias Vector!(byte[32])   byte32;       ///
+static if (is(Vector!(ubyte[32])))  alias Vector!(ubyte[32])  ubyte32;      ///
+static if (is(Vector!(short[16])))  alias Vector!(short[16])  short16;      ///
+static if (is(Vector!(ushort[16]))) alias Vector!(ushort[16]) ushort16;     ///
+static if (is(Vector!(int[8])))     alias Vector!(int[8])     int8;         ///
+static if (is(Vector!(uint[8])))    alias Vector!(uint[8])    uint8;        ///
+static if (is(Vector!(long[4])))    alias Vector!(long[4])    long4;        ///
+static if (is(Vector!(ulong[4])))   alias Vector!(ulong[4])   ulong4;       ///
+
+static if (is(Vector!(void[64])))   alias Vector!(void[64])   void64;       ///
+static if (is(Vector!(double[8])))  alias Vector!(double[8])  double8;      ///
+static if (is(Vector!(float[16])))  alias Vector!(float[16])  float16;      ///
+static if (is(Vector!(byte[64])))   alias Vector!(byte[64])   byte64;       ///
+static if (is(Vector!(ubyte[64])))  alias Vector!(ubyte[64])  ubyte64;      ///
+static if (is(Vector!(short[32])))  alias Vector!(short[32])  short32;      ///
+static if (is(Vector!(ushort[32]))) alias Vector!(ushort[32]) ushort32;     ///
+static if (is(Vector!(int[16])))    alias Vector!(int[16])    int16;        ///
+static if (is(Vector!(uint[16])))   alias Vector!(uint[16])   uint16;       ///
+static if (is(Vector!(long[8])))    alias Vector!(long[8])    long8;        ///
+static if (is(Vector!(ulong[8])))   alias Vector!(ulong[8])   ulong8;       ///
 
 version (D_SIMD)
 {
diff --git a/src/core/thread/osthread.d b/src/core/thread/osthread.d
@@ -159,12 +159,12 @@ else version (Windows)
  */
 class ThreadException : Exception
 {
-    @safe pure nothrow this(string msg, string file = __FILE__, size_t line = __LINE__, Throwable next = null)
+    @nogc @safe pure nothrow this(string msg, string file = __FILE__, size_t line = __LINE__, Throwable next = null)
     {
         super(msg, file, line, next);
     }
 
-    @safe pure nothrow this(string msg, Throwable next, string file = __FILE__, size_t line = __LINE__)
+    @nogc @safe pure nothrow this(string msg, Throwable next, string file = __FILE__, size_t line = __LINE__)
     {
         super(msg, file, line, next);
     }
@@ -176,12 +176,12 @@ class ThreadException : Exception
 */
 class ThreadError : Error
 {
-    @safe pure nothrow this(string msg, string file = __FILE__, size_t line = __LINE__, Throwable next = null)
+    @nogc @safe pure nothrow this(string msg, string file = __FILE__, size_t line = __LINE__, Throwable next = null)
     {
         super(msg, file, line, next);
     }
 
-    @safe pure nothrow this(string msg, Throwable next, string file = __FILE__, size_t line = __LINE__)
+    @nogc @safe pure nothrow this(string msg, Throwable next, string file = __FILE__, size_t line = __LINE__)
     {
         super(msg, file, line, next);
     }
diff --git a/src/rt/backtrace/dwarf.d b/src/rt/backtrace/dwarf.d
@@ -81,7 +81,7 @@ struct Location
     size_t address;
 }
 
-int traceHandlerOpApplyImpl(const void*[] callstack, scope int delegate(ref size_t, ref const(char[])) dg)
+int traceHandlerOpApplyImpl(const(void*)[] callstack, scope int delegate(ref size_t, ref const(char[])) dg)
 {
     import core.stdc.stdio : snprintf;
     import core.sys.posix.stdlib : free;
diff --git a/src/rt/sections_android.d b/src/rt/sections_android.d
@@ -44,6 +44,7 @@ struct SectionGroup
         return _moduleGroup;
     }
 
+    version (DigitalMars)
     @property immutable(FuncTable)[] ehTables() const nothrow @nogc
     {
         auto pbeg = cast(immutable(FuncTable)*)&__start_deh;
diff --git a/src/rt/sections_darwin_64.d b/src/rt/sections_darwin_64.d
@@ -11,10 +11,6 @@
  */
 module rt.sections_darwin_64;
 
-import core.sys.darwin.mach.dyld;
-import core.sys.darwin.mach.getsect;
-import core.sys.posix.pthread;
-
 version (OSX)
     version = Darwin;
 else version (iOS)
@@ -27,6 +23,12 @@ else version (WatchOS)
 version (Darwin):
 version (D_LP64):
 
+import core.sys.darwin.mach.dyld;
+import core.sys.darwin.mach.getsect;
+import core.sys.posix.pthread;
+
+import rt.util.utility : safeAssert;
+
 extern (C) size_t malloc_size(const void* ptr) nothrow @nogc;
 
 /**
@@ -176,3 +178,28 @@ const(section_64)[] sections(const segment_command_64* segment) pure nothrow @no
     const firstSection = cast(const(section_64)*)(cast(ubyte*) segment + size);
     return firstSection[0 .. segment.nsects];
 }
+
+/// Invokes the specified delegate for each (non-empty) data section.
+void foreachDataSection(in mach_header* header, intptr_t slide,
+                        scope void delegate(void[] sectionData) processor)
+{
+    foreach (section; [ SECT_DATA, SECT_BSS, SECT_COMMON ])
+    {
+        auto data = getSection(header, slide, SEG_DATA.ptr, section.ptr);
+        if (data !is null)
+            processor(data);
+    }
+}
+
+/// Returns a section's memory range, or null if not found or empty.
+void[] getSection(in mach_header* header, intptr_t slide,
+                  in char* segmentName, in char* sectionName)
+{
+    safeAssert(header.magic == MH_MAGIC_64, "Unsupported header.");
+    auto sect = getsectbynamefromheader_64(cast(mach_header_64*) header,
+                                           segmentName, sectionName);
+
+    if (sect !is null && sect.size > 0)
+        return (cast(void*)sect.addr + slide)[0 .. cast(size_t) sect.size];
+    return null;
+}
diff --git a/src/rt/sections_elf_shared.d b/src/rt/sections_elf_shared.d
@@ -95,6 +95,7 @@ struct DSO
         return _moduleGroup;
     }
 
+    version (DigitalMars)
     @property immutable(FuncTable)[] ehTables() const nothrow @nogc
     {
         return null;
diff --git a/src/rt/sections_osx_x86_64.d b/src/rt/sections_osx_x86_64.d
@@ -30,10 +30,11 @@ import core.sys.posix.pthread;
 import core.sys.darwin.mach.dyld;
 import core.sys.darwin.mach.getsect;
 
-import rt.deh, rt.minfo;
+import rt.deh;
+import rt.minfo;
+import rt.sections_darwin_64;
 import rt.util.container.array;
 import rt.util.utility : safeAssert;
-import rt.sections_darwin_64 : getTLSRange;
 
 struct SectionGroup
 {
@@ -121,12 +122,7 @@ __gshared SectionGroup _sections;
 
 extern (C) void sections_osx_onAddImage(const scope mach_header* h, intptr_t slide)
 {
-    foreach (e; dataSegs)
-    {
-        auto sect = getSection(h, slide, e.seg.ptr, e.sect.ptr);
-        if (sect != null)
-            _sections._gcRanges.insertBack((cast(void*)sect.ptr)[0 .. sect.length]);
-    }
+    foreachDataSection(h, slide, (sectionData) { _sections._gcRanges.insertBack(sectionData); });
 
     auto minfosect = getSection(h, slide, "__DATA", "__minfodata");
     if (minfosect != null)
@@ -160,26 +156,3 @@ extern (C) void sections_osx_onAddImage(const scope mach_header* h, intptr_t sli
         _sections._ehTables = p[0 .. len];
     }
 }
-
-struct SegRef
-{
-    string seg;
-    string sect;
-}
-
-static immutable SegRef[] dataSegs = [{SEG_DATA, SECT_DATA},
-                                      {SEG_DATA, SECT_BSS},
-                                      {SEG_DATA, SECT_COMMON}];
-
-ubyte[] getSection(in mach_header* header, intptr_t slide,
-                   in char* segmentName, in char* sectionName)
-{
-    safeAssert(header.magic == MH_MAGIC_64, "Unsupported header.");
-    auto sect = getsectbynamefromheader_64(cast(mach_header_64*)header,
-                                        segmentName,
-                                        sectionName);
-
-    if (sect !is null && sect.size > 0)
-        return (cast(ubyte*)sect.addr + slide)[0 .. cast(size_t)sect.size];
-    return null;
-}
diff --git a/src/rt/sections_win64.d b/src/rt/sections_win64.d
@@ -41,6 +41,7 @@ struct SectionGroup
         return _moduleGroup;
     }
 
+    version (DigitalMars)
     version (Win64)
     @property immutable(FuncTable)[] ehTables() const nothrow @nogc
     {

Original file line number	Diff line number	Diff line change
`@@ -926,11 +926,11 @@ version (CoreUnittest)`
`926`	`926`
`927`	`927`	`testXCHG!(shared int)(42);`
`928`	`928`
`929`		`- testType!(float)(1.0f);`
	`929`	`+ testType!(float)(0.1f);`
`930`	`930`
`931`	`931`	`static if (has64BitCAS)`
`932`	`932`	`{`
`933`		`- testType!(double)(1.0);`
	`933`	`+ testType!(double)(0.1);`
`934`	`934`	`testType!(long)();`
`935`	`935`	`testType!(ulong)();`
`936`	`936`	`}`
`@@ -970,15 +970,15 @@ version (CoreUnittest)`
`970`	`970`	`atomicOp!"-="(i, cast(size_t) 1);`
`971`	`971`	`assert(i == 0);`
`972`	`972`
`973`		`- shared float f = 0;`
`974`		`- atomicOp!"+="(f, 1);`
`975`		`- assert(f == 1);`
	`973`	`+ shared float f = 0.1f;`
	`974`	`+ atomicOp!"+="(f, 0.1f);`
	`975`	`+ assert(f > 0.1999f && f < 0.2001f);`
`976`	`976`
`977`	`977`	`static if (has64BitCAS)`
`978`	`978`	`{`
`979`		`- shared double d = 0;`
`980`		`- atomicOp!"+="(d, 1);`
`981`		`- assert(d == 1);`
	`979`	`+ shared double d = 0.1;`
	`980`	`+ atomicOp!"+="(d, 0.1);`
	`981`	`+ assert(d > 0.1999 && d < 0.2001);`
`982`	`982`	`}`
`983`	`983`	`}`
`984`	`984`
Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,12 @@ else version (Windows)`
`159`	`159`	`*/`
`160`	`160`	`class ThreadException : Exception`
`161`	`161`	`{`
`162`		`- @safe pure nothrow this(string msg, string file = __FILE__, size_t line = __LINE__, Throwable next = null)`
	`162`	`+ @nogc @safe pure nothrow this(string msg, string file = __FILE__, size_t line = __LINE__, Throwable next = null)`
`163`	`163`	`{`
`164`	`164`	`super(msg, file, line, next);`
`165`	`165`	`}`
`166`	`166`
`167`		`- @safe pure nothrow this(string msg, Throwable next, string file = __FILE__, size_t line = __LINE__)`
	`167`	`+ @nogc @safe pure nothrow this(string msg, Throwable next, string file = __FILE__, size_t line = __LINE__)`
`168`	`168`	`{`
`169`	`169`	`super(msg, file, line, next);`
`170`	`170`	`}`
`@@ -176,12 +176,12 @@ class ThreadException : Exception`
`176`	`176`	`*/`
`177`	`177`	`class ThreadError : Error`
`178`	`178`	`{`
`179`		`- @safe pure nothrow this(string msg, string file = __FILE__, size_t line = __LINE__, Throwable next = null)`
	`179`	`+ @nogc @safe pure nothrow this(string msg, string file = __FILE__, size_t line = __LINE__, Throwable next = null)`
`180`	`180`	`{`
`181`	`181`	`super(msg, file, line, next);`
`182`	`182`	`}`
`183`	`183`
`184`		`- @safe pure nothrow this(string msg, Throwable next, string file = __FILE__, size_t line = __LINE__)`
	`184`	`+ @nogc @safe pure nothrow this(string msg, Throwable next, string file = __FILE__, size_t line = __LINE__)`
`185`	`185`	`{`
`186`	`186`	`super(msg, file, line, next);`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ struct Location`
`81`	`81`	`size_t address;`
`82`	`82`	`}`
`83`	`83`
`84`		`-int traceHandlerOpApplyImpl(const void*[] callstack, scope int delegate(ref size_t, ref const(char[])) dg)`
	`84`	`+int traceHandlerOpApplyImpl(const(void*)[] callstack, scope int delegate(ref size_t, ref const(char[])) dg)`
`85`	`85`	`{`
`86`	`86`	`import core.stdc.stdio : snprintf;`
`87`	`87`	`import core.sys.posix.stdlib : free;`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ struct SectionGroup`
`44`	`44`	`return _moduleGroup;`
`45`	`45`	`}`
`46`	`46`
	`47`	`+ version (DigitalMars)`
`47`	`48`	`@property immutable(FuncTable)[] ehTables() const nothrow @nogc`
`48`	`49`	`{`
`49`	`50`	`auto pbeg = cast(immutable(FuncTable)*)&__start_deh;`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ struct DSO`
`95`	`95`	`return _moduleGroup;`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ version (DigitalMars)`
`98`	`99`	`@property immutable(FuncTable)[] ehTables() const nothrow @nogc`
`99`	`100`	`{`
`100`	`101`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ struct SectionGroup`
`41`	`41`	`return _moduleGroup;`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ version (DigitalMars)`
`44`	`45`	`version (Win64)`
`45`	`46`	`@property immutable(FuncTable)[] ehTables() const nothrow @nogc`
`46`	`47`	`{`