Merge remote-tracking branch 'origin/master' into sym-1.38.x

Conflicts:
	packaging/reggae_version

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 #### Big news
 - Frontend, druntime and Phobos are at version [2.108.0+](https://dlang.org/changelog/2.108.0.html). (#4591, #4615, #4619)
-- Support for [LLVM 18](https://releases.llvm.org/18.1.0/docs/ReleaseNotes.html). The prebuilt packages use v18.1.3 (except for Android and macOS arm64). (#4599, #4605, #4607, #4604)
+- Support for [LLVM 18](https://releases.llvm.org/18.1.0/docs/ReleaseNotes.html). The prebuilt packages use v18.1.3 (except for Android and macOS arm64). (#4599, #4605, #4607, #4604, #4622)
 
 #### Platform support
 - Supports LLVM 11 - 18.

dmd/cparse.d

@@ -5873,27 +5873,38 @@ final class CParser(AST) : Parser!AST
 
         const(char)* endp = &slice[length - 7];
 
+        AST.Dsymbols newSymbols;
+
         size_t[void*] defineTab;    // hash table of #define's turned into Symbol's
-                                    // indexed by Identifier, returns index into symbols[]
+                                    // indexed by Identifier, returns index into newSymbols[]
                                     // The memory for this is leaked
 
-        void addVar(AST.Dsymbol s)
+        void addSym(AST.Dsymbol s)
         {
-            //printf("addVar() %s\n", s.toChars());
+            //printf("addSym() %s\n", s.toChars());
             if (auto v = s.isVarDeclaration())
                 v.isCmacro(true);       // mark it as coming from a C #define
             /* If it's already defined, replace the earlier
              * definition
              */
             if (size_t* pd = cast(void*)s.ident in defineTab)
             {
-                //printf("replacing %s\n", v.toChars());
-                (*symbols)[*pd] = s;
+                //printf("replacing %s\n", s.toChars());
+                newSymbols[*pd] = s;
                 return;
             }
-            assert(symbols, "symbols is null");
-            defineTab[cast(void*)s.ident] = symbols.length;
-            symbols.push(s);
+            defineTab[cast(void*)s.ident] = newSymbols.length;
+            newSymbols.push(s);
+        }
+
+        void removeSym(Identifier ident)
+        {
+            //printf("removeSym() %s\n", ident.toChars());
+            if (size_t* pd = cast(void*)ident in defineTab)
+            {
+                //printf("removing %s\n", ident.toChars());
+                newSymbols[*pd] = null;
+            }
         }
 
         while (p < endp)
@@ -5937,7 +5948,7 @@ final class CParser(AST) : Parser!AST
                                  */
                                 AST.Expression e = new AST.IntegerExp(scanloc, intvalue, t);
                                 auto v = new AST.VarDeclaration(scanloc, t, id, new AST.ExpInitializer(scanloc, e), STC.manifest);
-                                addVar(v);
+                                addSym(v);
                                 ++p;
                                 continue;
                             }
@@ -5960,7 +5971,7 @@ final class CParser(AST) : Parser!AST
                                  */
                                 AST.Expression e = new AST.RealExp(scanloc, floatvalue, t);
                                 auto v = new AST.VarDeclaration(scanloc, t, id, new AST.ExpInitializer(scanloc, e), STC.manifest);
-                                addVar(v);
+                                addSym(v);
                                 ++p;
                                 continue;
                             }
@@ -5978,7 +5989,7 @@ final class CParser(AST) : Parser!AST
                                  */
                                 AST.Expression e = new AST.StringExp(scanloc, str[0 .. len], len, 1, postfix);
                                 auto v = new AST.VarDeclaration(scanloc, null, id, new AST.ExpInitializer(scanloc, e), STC.manifest);
-                                addVar(v);
+                                addSym(v);
                                 ++p;
                                 continue;
                             }
@@ -6014,7 +6025,7 @@ final class CParser(AST) : Parser!AST
                             AST.TemplateParameters* tpl = new AST.TemplateParameters();
                             AST.Expression constraint = null;
                             auto tempdecl = new AST.TemplateDeclaration(exp.loc, id, tpl, constraint, decldefs, false);
-                            addVar(tempdecl);
+                            addSym(tempdecl);
                             ++p;
                             continue;
                         }
@@ -6105,7 +6116,7 @@ final class CParser(AST) : Parser!AST
                             AST.Dsymbols* decldefs = new AST.Dsymbols();
                             decldefs.push(fd);
                             auto tempdecl = new AST.TemplateDeclaration(exp.loc, id, tpl, null, decldefs, false);
-                            addVar(tempdecl);
+                            addSym(tempdecl);
 
                             ++p;
                             continue;
@@ -6116,13 +6127,31 @@ final class CParser(AST) : Parser!AST
                     }
                 }
             }
+            else if (p[0 .. 6] == "#undef")
+            {
+                p += 6;
+                nextToken();
+                //printf("undef %s\n", token.toChars());
+                if (token.value == TOK.identifier)
+                    removeSym(token.ident);
+            }
             // scan to end of line
             while (*p)
                 ++p;
             ++p; // advance to start of next line
             scanloc.linnum = scanloc.linnum + 1;
         }
 
+        if (newSymbols.length)
+        {
+            assert(symbols, "symbols is null");
+            symbols.reserve(newSymbols.length);
+
+            foreach (sym; newSymbols)
+                if (sym) // undefined entries are null
+                    symbols.push(sym);
+        }
+
         scanloc = scanlocSave;
         eSink = save;
         defines = buf;

dmd/traits.d

@@ -1245,7 +1245,7 @@ Expression semanticTraits(TraitsExp e, Scope* sc)
             // @@@DEPRECATION 2.100.2
             if (auto td = s.isTemplateDeclaration())
             {
-                if (td.overnext || td.overroot)
+                if (td.overnext)
                 {
                     deprecation(e.loc, "`__traits(getAttributes)` may only be used for individual functions, not the overload set `%s`", td.ident.toChars());
                     deprecationSupplemental(e.loc, "the result of `__traits(getOverloads)` may be used to select the desired function to extract attributes from");

gen/uda.cpp

@@ -328,6 +328,9 @@ void applyAttrTarget(StructLiteralExp *sle, llvm::Function *func,
   llvm::StringRef CPU;
   std::vector<std::string> features;
 
+  // Preserve the order of the features as they appear in the source
+  // code. `hasFnAttribute` returns all the features accumulated
+  // so far and they should remain at the beginning of the result.
   if (func->hasFnAttribute("target-features")) {
     auto attr = func->getFnAttribute("target-features");
     features.push_back(std::string(attr.getValueAsString()));
@@ -371,10 +374,6 @@ void applyAttrTarget(StructLiteralExp *sle, llvm::Function *func,
   }
 
   if (!features.empty()) {
-    // Sorting the features puts negative features ("-") after positive features
-    // ("+"). This provides the desired behavior of negative features overriding
-    // positive features regardless of their order in the source code.
-    sort(features.begin(), features.end());
     func->addFnAttr("target-features",
                     llvm::join(features.begin(), features.end(), ","));
     irFunc->targetFeaturesOverridden = true;

tests/codegen/attr_target_overrides_mattr_x86.d

@@ -0,0 +1,35 @@
+// Test that @target attribute overrides command line -mattr
+
+// REQUIRES: target_X86
+
+// RUN: %ldc -O -c -mattr=sse -mcpu=i386 -mtriple=i386-linux-gnu -output-ll -of=%t.sse.ll %s && FileCheck %s --check-prefix LLVM-SSE < %t.sse.ll
+// RUN: %ldc -O -c -mattr=-sse -mcpu=i386 -mtriple=i386-linux-gnu -output-ll -of=%t.nosse.ll %s && FileCheck %s --check-prefix LLVM-NOSSE < %t.nosse.ll
+
+import ldc.attributes;
+
+// LLVM-SSE-LABEL: define{{.*}} void @{{.*}}foo_nosse
+// LLVM-SSE-SAME: #[[NOSSE:[0-9]+]]
+// LLVM-NOSSE-LABEL: define{{.*}} void @{{.*}}foo_nosse
+// LLVM-NOSSE-SAME: #[[NOSSE:[0-9]+]]
+@target("no-sse")
+void foo_nosse(float *A, float *B, float K) {
+    for (int i = 0; i < 128; ++ i)
+	A[i] *= B[i] + K;
+}
+
+// LLVM-SSE-LABEL: define{{.*}} void @{{.*}}foo_sse
+// LLVM-SSE-SAME: #[[SSE:[0-9]+]]
+// LLVM-NOSSE-LABEL: define{{.*}} void @{{.*}}foo_sse
+// LLVM-NOSSE-SAME: #[[SSE:[0-9]+]]
+@target("sse")
+void foo_sse(float *A, float *B, float K) {
+    for (int i = 0; i < 128; ++ i)
+	A[i] *= B[i] + K;
+}
+
+// The -mattr feature should come before the @target one in the "target-features" below.
+
+// LLVM-SSE-DAG: attributes #[[SSE]] = {{.*}} "target-features"="+sse,+sse"
+// LLVM-SSE-DAG: attributes #[[NOSSE]] = {{.*}} "target-features"="+sse,-sse"
+// LLVM-NOSSE-DAG: attributes #[[SSE]] = {{.*}} "target-features"="-sse,+sse"
+// LLVM-NOSSE-DAG: attributes #[[NOSSE]] = {{.*}} "target-features"="-sse,-sse"

tests/codegen/attr_target_x86.d

@@ -25,18 +25,21 @@ void foo_sse(float *A, float* B, float K) {
 // ASM: addps
 }
 
-// Make sure that no-sse overrides sse (attribute sorting). Also tests multiple @target attribs.
-// LLVM-LABEL: define{{.*}} void @{{.*}}foo_nosse
-// LLVM-SAME: #[[NOSSE:[0-9]+]]
-// ASM-LABEL: _D15attr_target_x869foo_nosseFPfQcfZv:
+// `sse` should take precedence over `no-sse` since it appears later.
+// LLVM-LABEL: define{{.*}} void @{{.*}}bar_sse
+// LLVM-SAME: #[[SSE2:[0-9]+]]
+// ASM-LABEL: _D15attr_target_x867bar_sseFPfQcfZv:
 @(target("no-sse\n  , \tsse  "))
-void foo_nosse(float *A, float* B, float K) {
+void bar_sse(float *A, float* B, float K) {
     for (int i = 0; i < 128; ++i)
         A[i] *= B[i] + K;
-// ASM-NOT: addps
+// ASM: addps
 }
+
+
+// Same reason as above, except the other way around
 // LLVM-LABEL: define{{.*}} void @{{.*}}bar_nosse
-// LLVM-SAME: #[[NOSSE]]
+// LLVM-SAME: #[[NOSSE:[0-9]+]]
 // ASM-LABEL: _D15attr_target_x869bar_nosseFPfQcfZv:
 @(target("sse"))
 @(target("  no-sse"))
@@ -58,5 +61,6 @@ void haswell(float *A, float* B, float K) {
 
 
 // LLVM-DAG: attributes #[[SSE]] = {{.*}} "target-features"="+sse"
+// LLVM-DAG: attributes #[[SSE2]] = {{.*}} "target-features"="-sse,+sse"
 // LLVM-DAG: attributes #[[NOSSE]] = {{.*}} "target-features"="+sse,-sse"
 // LLVM-DAG: attributes #[[HSW]] = {{.*}} "target-cpu"="haswell"

tests/dmd/compilable/test24479.d

@@ -0,0 +1,35 @@
+// https://issues.dlang.org/show_bug.cgi?id=24479
+
+/*
+TEST_OUTPUT:
+---
+1
+2
+---
+*/
+
+struct S
+{
+    @1
+    S opBinary(string op: "-")(S rhs) const pure nothrow @nogc
+    {
+        return rhs;
+    }
+    @2
+    S opBinary(string op: "*")(S dur) const pure nothrow @nogc
+    {
+        return dur;
+    }
+}
+
+private enum hasExternalUDA(alias A) = is(A == External) || is(typeof(A) == External);
+
+void foo()
+{
+    static foreach (t; __traits(getOverloads, S, "opBinary", true))
+        static foreach(attr; __traits(getAttributes, t))
+            pragma(msg, attr);
+
+    static assert(__traits(getOverloads, S, "opBinary", true).length == 2);
+    alias A = __traits(getAttributes, __traits(getOverloads, S, "opBinary", true)[1]);
+}

tests/dmd/compilable/test24505.c

@@ -0,0 +1,15 @@
+// https://issues.dlang.org/show_bug.cgi?id=24505
+
+// PERMUTE_ARGS:
+
+struct stat { int x; };
+
+void __stat(int x, int y);
+#define stat(x, y) __stat(x, y)
+
+// reversed order:
+#define stat2(x, y) __stat(x, y)
+struct stat2 { int x; };
+
+#undef stat
+#undef stat2