Merge pull request #3615 from PetarKirov/merge_stable

Merge `stable` in `mater`

Signed-off-by: Iain Buclaw <[email protected]>
Merged-on-behalf-of: Petar Kirov <[email protected]>

Author: dlang-bot

mak/COPY

@@ -260,6 +260,7 @@ COPY=\
 	$(IMPDIR)\core\sys\openbsd\dlfcn.d \
 	$(IMPDIR)\core\sys\openbsd\err.d \
 	$(IMPDIR)\core\sys\openbsd\execinfo.d \
+	$(IMPDIR)\core\sys\openbsd\pthread_np.d \
 	$(IMPDIR)\core\sys\openbsd\stdlib.d \
 	$(IMPDIR)\core\sys\openbsd\string.d \
 	$(IMPDIR)\core\sys\openbsd\time.d \

mak/SRCS

@@ -261,6 +261,7 @@ SRCS=\
 	src\core\sys\openbsd\dlfcn.d \
 	src\core\sys\openbsd\err.d \
 	src\core\sys\openbsd\execinfo.d \
+	src\core\sys\openbsd\pthread_np.d \
 	src\core\sys\openbsd\stdlib.d \
 	src\core\sys\openbsd\string.d \
 	src\core\sys\openbsd\time.d \

posix.mak

@@ -403,11 +403,7 @@ ifeq ($(OS),linux)
   endif
 endif
 
-ifeq ($(OS),freebsd)
 DISABLED_TESTS =
-else
-DISABLED_TESTS =
-endif
 
 $(addprefix $(ROOT)/unittest/,$(DISABLED_TESTS)) :
 	@echo $@ - disabled

src/core/demangle.d

@@ -643,6 +643,7 @@ pure @safe:
         TypeDelegate
         TypeNone
         TypeVoid
+        TypeNoreturn
         TypeByte
         TypeUbyte
         TypeShort
@@ -722,6 +723,9 @@ pure @safe:
     TypeVoid:
         v
 
+    TypeNoreturn
+        Nn
+
     TypeByte:
         g
 
@@ -880,6 +884,10 @@ pure @safe:
             popFront();
             switch ( front )
             {
+            case 'n': // Noreturn
+                popFront();
+                put("noreturn");
+                return dst[beg .. len];
             case 'g': // Wild (Ng Type)
                 popFront();
                 // TODO: Anything needed here?
@@ -1171,9 +1179,11 @@ pure @safe:
             case 'g':
             case 'h':
             case 'k':
+            case 'n':
                 // NOTE: The inout parameter type is represented as "Ng".
                 //       The vector parameter type is represented as "Nh".
                 //       The return parameter type is represented as "Nk".
+                //       The noreturn parameter type is represented as "Nn".
                 //       These make it look like a FuncAttr, but infact
                 //       if we see these, then we know we're really in
                 //       the parameter list.  Rewind and break.
@@ -2690,6 +2700,25 @@ unittest
     assert(s.demangle == expected);
 }
 
+// https://issues.dlang.org/show_bug.cgi?id=22235
+unittest
+{
+    enum parent = __MODULE__ ~ '.' ~ __traits(identifier, __traits(parent, {}));
+
+    static noreturn abort() { assert(false); }
+    assert(demangle(abort.mangleof) == "pure nothrow @nogc @safe noreturn " ~ parent ~ "().abort()");
+
+    static void accept(noreturn) {}
+    assert(demangle(accept.mangleof) == "pure nothrow @nogc @safe void " ~ parent ~ "().accept(noreturn)");
+
+    static void templ(T)(T, T) {}
+    assert(demangle(templ!noreturn.mangleof) == "pure nothrow @nogc @safe void " ~ parent ~ "().templ!(noreturn).templ(noreturn, noreturn)");
+
+    static struct S(T) {}
+    static void aggr(S!noreturn) { assert(0); }
+    assert(demangle(aggr.mangleof) == "pure nothrow @nogc @safe void " ~ parent ~ "().aggr(" ~ parent ~ "().S!(noreturn).S)");
+}
+
 /*
  *
  */

src/core/internal/dassert.d

@@ -191,7 +191,7 @@ private string miniFormat(V)(const scope ref V v)
         }
 
         // Fall back to a simple cast - we're violating the type system anyways
-        return miniFormat(__ctfe ? cast(const T) v : *cast(const T*) &v);
+        return miniFormat(*cast(const T*) &v);
     }
     // Format enum members using their name
     else static if (is(V BaseType == enum))

src/core/runtime.d

@@ -783,6 +783,7 @@ else static if (hasExecinfo) private class DefaultTraceInfo : Throwable.TraceInf
         version (linux) enum enableDwarf = true;
         else version (FreeBSD) enum enableDwarf = true;
         else version (DragonFlyBSD) enum enableDwarf = true;
+        else version (OpenBSD) enum enableDwarf = true;
         else version (Darwin) enum enableDwarf = true;
         else enum enableDwarf = false;
 

src/core/sys/openbsd/pthread_np.d

@@ -0,0 +1,23 @@
+/**
+  * D header file for OpenBSD pthread_np.h.
+  *
+  * Copyright: Copyright © 2021, The D Language Foundation
+  * License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
+  * Authors: Brian Callahan
+  */
+module core.sys.openbsd.pthread_np;
+
+version (OpenBSD):
+extern (C):
+nothrow:
+@nogc:
+
+public import core.sys.posix.sys.types;
+import core.sys.posix.signal : stack_t;
+
+int pthread_mutexattr_getkind_np(pthread_mutexattr_t);
+int pthread_mutexattr_setkind_np(pthread_mutexattr_t*, int);
+void pthread_get_name_np(pthread_t, char*, size_t);
+void pthread_set_name_np(pthread_t, const(char)*);
+int pthread_stackseg_np(pthread_t, stack_t*);
+int pthread_main_np();

src/core/sys/openbsd/stdlib.d

@@ -13,5 +13,11 @@ extern (C):
 nothrow:
 @nogc:
 
+void freezero(void*, size_t);
+void* calloc_conceal(size_t, size_t);
+void* malloc_conceal(size_t);
+void* reallocarray(void*, size_t, size_t);
+void* recallocarray(void*, size_t, size_t, size_t);
+
 const(char)* getprogname();
-void setprogname(scope const char* name);
+void setprogname(scope const char*);

src/core/sys/openbsd/string.d

@@ -17,7 +17,13 @@ nothrow:
 
 static if (__BSD_VISIBLE)
 {
+    void explicit_bzero(void*, size_t);
     pure void* memmem(return const void* haystack, size_t haystacklen, scope const void* needle, size_t needlelen);
+    void* memrchr(scope const void*, int, size_t);
+    size_t strlcat(char*, scope const char*, size_t);
+    size_t strlcpy(char*, scope const char*, size_t);
+    void strmode(int, char*);
+    char* strsep(char**, scope const char*);
     pure int timingsafe_bcmp(scope const void*, scope const void*, size_t);
     pure int timingsafe_memcmp(scope const void*, scope const void*, size_t);
 }

src/core/sys/openbsd/sys/mman.d

@@ -19,11 +19,12 @@ import core.sys.posix.sys.types;
 // enum MAP_PRIVATE = 0x0002;
 // enum MAP_FIXED = 0x0010;
 // enum MAP_ANON = 0x1000;
+// enum MAP_STACK = 0x4000;
 
 alias MAP_ANONYMOUS = MAP_ANON;
-enum MAP_STACK = 0x4000;
+enum MAP_CONCEAL = 0x8000;
 
-enum MAP_FLAGMASK = 0x7ff7;
+enum MAP_FLAGMASK = 0xfff7;
 
 alias MAP_COPY = MAP_PRIVATE;
 enum MAP_FILE = 0;
@@ -45,7 +46,6 @@ static if (__BSD_VISIBLE)
     enum MADV_FREE = 6;
 
     int madvise(void *, size_t, int);
-    int mincore(const(void) *, size_t, char *);
     int minherit(void *, size_t, int);
     void* mquery(void *, size_t, int, int, int, off_t);
 }