Fix #22702 - make compilant with getLinkage returning System or Objec…

…tive-C
dlang · Jan 24, 2022 · 74baf8f · 74baf8f
1 parent e390ba7
commit 74baf8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/demangle.d b/src/core/demangle.d
@@ -2471,7 +2471,7 @@ private template hasPlainMangling(FT) if (is(FT == function))
 {
     enum lnk = __traits(getLinkage, FT);
     // C || Windows
-    enum hasPlainMangling = lnk == "C" || lnk == "Windows";
+    enum hasPlainMangling = lnk == "C" || lnk == "Windows" || lnk == "System";
 }
 
 @safe pure nothrow unittest

diff --git a/src/core/lifetime.d b/src/core/lifetime.d
@@ -2642,7 +2642,7 @@ if (!Init.length ||
  */
 T _d_newThrowable(T, Args...)(auto ref Args args) @trusted
     if (is(T : Throwable) && is(typeof(T.__ctor(forward!args))) &&
-        __traits(getLinkage, T) != "Windows" && __traits(getLinkage, T) != "C++")
+        __traits(getLinkage, T) == "D")
 {
     debug(PRINTF) printf("_d_newThrowable(%s)\n", cast(char*) T.stringof);