Merge remote-tracking branch 'upstream/stable' into merge_stable

# Conflicts:
#	src/core/internal/convert.d

Author: MartinNowak

changelog/backtrace_debug_info_macos.dd

@@ -32,7 +32,6 @@ When running the application it will produce an output similar to:
 
 $(CONSOLE
 object.Exception@main.d(3): bar
-
 main.d:3 void main.bar() [0x71afdfb]
 main.d:8 void main.foo() [0x71afe0c]
 main.d:13 _Dmain [0x71afd78]

src/core/internal/convert.d

@@ -581,20 +581,28 @@ const(ubyte)[] toUbyte(T)(ref T val) if (is(Unqual!T == cfloat) || is(Unqual!T =
 }
 
 @trusted pure nothrow @nogc
-const(ubyte)[] toUbyte(T)(ref T val) if (is(T == enum) && is(typeof(toUbyte(cast(V)val)) == const(ubyte)[]))
+const(ubyte)[] toUbyte(T)(ref T val) if (is(T V == enum) && is(typeof(toUbyte(cast(V)val)) == const(ubyte)[]))
 {
     if (__ctfe)
     {
         static if (is(T V == enum)){}
-        V e_val = val;
-        return toUbyte(e_val);
+        return toUbyte(cast(V) val);
     }
     else
     {
         return (cast(const(ubyte)*)&val)[0 .. T.sizeof];
     }
 }
 
+nothrow pure @safe unittest
+{
+    // Issue 19008 - check toUbyte works on enums.
+    enum Month : uint { jan = 1}
+    Month m = Month.jan;
+    const bytes = toUbyte(m);
+    enum ctfe_works = (() => { Month x = Month.jan; return toUbyte(x).length > 0; })();
+}
+
 private bool isNonReference(T)()
 {
     static if (is(T == struct) || is(T == union))

src/core/internal/hash.d

@@ -139,10 +139,11 @@ size_t hashOf(T)(auto ref T val, size_t seed = 0) if (!is(T == enum) && (is(T ==
         {
             return bytesHash(toUbyte(val), seed);
         }
-        else // CTFE unsupproreted for structs with reference fields
+        else // CTFE unsupported
         {
             assert(!__ctfe, "unable to compute hash of "~T.stringof);
-            return bytesHash(toUbyte(val), seed);
+            const(ubyte)[] bytes = (() @trusted => (cast(const(ubyte)*)&val)[0 .. T.sizeof])();
+            return bytesHash(bytes, seed);
         }
     }
 }
@@ -154,6 +155,22 @@ nothrow pure @safe unittest // issue 18925
     auto h = hashOf(S.init);
 }
 
+nothrow pure @safe unittest // issue 19005
+{
+    enum Month : ubyte
+    {
+        jan = 1
+    }
+    static struct Date
+    {
+        short _year;
+        Month _month;
+        ubyte _day;
+    }
+    Date date;
+    auto hash = date.hashOf;
+}
+
 //delegate hash. CTFE unsupported
 @trusted @nogc nothrow pure
 size_t hashOf(T)(auto ref T val, size_t seed = 0) if (!is(T == enum) && is(T == delegate))

src/core/sys/darwin/mach/getsect.d

@@ -440,7 +440,7 @@ const(section)* getsectbynamefromheader(
     in char* sectname
 );
 
-const(section)* getsectbynamefromheaderwithswap_64(
+const(section)* getsectbynamefromheaderwithswap(
     in mach_header* mhp,
     in char* segname,
     in char* section,

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

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)))

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);
+}