Merge pull request #4854 from kinke/merge_stable

Merge upstream stable

Author: kinke

CHANGELOG.md

@@ -1,6 +1,7 @@
 # LDC master
 
 #### Big news
+- Latest frontend and druntime patches from DMD stable (v2.110.0-rc.1+). (#4854)
 - LLVM for prebuilt packages bumped to v19.1.7. (#4822)
 - New prebuilt package for Alpine Linux x86_64 with musl libc. It's currently generated on Alpine v3.20, using its default LLVM 17. Most bundled executables are fully static and can be run on ~all distros. (#4826)
 - Revived dynamic-compile (JIT) functionality (formerly unsupported since LLVM 12), supporting LLVM 18+ now. (#4774)

dmd/aggregate.h

@@ -307,9 +307,11 @@ class ClassDeclaration : public AggregateDeclaration
 
     void addObjcSymbols(ClassDeclarations *classes, ClassDeclarations *categories) override final;
 
+#if !IN_LLVM
     // Back end
     Dsymbol *vtblsym;
     Dsymbol *vtblSymbol();
+#endif
 
     ClassDeclaration *isClassDeclaration() override final { return (ClassDeclaration *)this; }
     void accept(Visitor *v) override { v->visit(this); }

dmd/dcast.d

@@ -703,6 +703,12 @@ MATCH implicitConvTo(Expression e, Type t)
                 if (!tn.isConst() && !tn.isImmutable())
                     return MATCH.nomatch;
                 m = MATCH.constant;
+
+                // After converting e.g. ubyte[] to const(ubyte)[], don't change
+                // to MATCH.convert, return MATCH.constant
+                //  https://github.com/dlang/dmd/issues/20635
+                if (e.type.ty == t.ty && e.type.nextOf().ty == tn.ty)
+                    return m;
             }
             if (e.type != t && e.hexString && tn.isintegral && (tn.size == e.sz || (!e.committed && (e.len % tn.size) == 0)))
             {

dmd/dclass.d

@@ -922,6 +922,8 @@ version (IN_LLVM) {} else
         .objc.addSymbols(this, classes, categories);
     }
 
+version (IN_LLVM) { /* not needed */ } else
+{
     // Back end
     Dsymbol vtblsym;
 
@@ -939,6 +941,7 @@ version (IN_LLVM) {} else
         }
         return vtblsym;
     }
+}
 
     extern (D) final bool isErrorException()
     {

dmd/dsymbolsem.d

@@ -4169,7 +4169,8 @@ private extern(C++) class AddMemberVisitor : Visitor
             }
 
             // If using C tag/prototype/forward declaration rules
-            if (sc.flags & SCOPE.Cfile && !dsym.isImport())
+            if (sc && sc.flags & SCOPE.Cfile && !dsym.isImport())
+            // When merging master, replace with: if (sc && sc.inCfile && !dsym.isImport())
             {
                 if (handleTagSymbols(*sc, dsym, s2, sds))
                     return;

dmd/expressionsem.d

@@ -1363,11 +1363,6 @@ private Expression resolveUFCSProperties(Scope* sc, Expression e1, Expression e2
         auto arguments = new Expressions(1);
         (*arguments)[0] = eleft;
         e = new CallExp(loc, e, arguments);
-
-        // https://issues.dlang.org/show_bug.cgi?id=24017
-        if (sc.flags & SCOPE.debug_)
-            e.isCallExp().inDebugStatement = true;
-
         e = e.expressionSemantic(sc);
         return e;
     }
@@ -13364,6 +13359,11 @@ version (IN_LLVM)
             error(exp.loc, "compare not defined for complex operands");
             return setError();
         }
+        else if (t1.isTypeFunction() || t2.isTypeFunction())
+        {
+            error(exp.loc, "comparison is not defined for function types");
+            return setError();
+        }
         else if (t1.ty == Taarray || t2.ty == Taarray)
         {
             error(exp.loc, "`%s` is not defined for associative arrays", EXPtoString(exp.op).ptr);
@@ -13684,6 +13684,12 @@ version (IN_LLVM)
             return;
         }
 
+        if (t1.isTypeFunction() || t2.isTypeFunction())
+        {
+            error(exp.loc, "operator `==` is not defined for function types");
+            return setError();
+        }
+
         if (auto tv = t1.isTypeVector())
             exp.type = tv.toBooleanVector();
 
@@ -13745,6 +13751,12 @@ version (IN_LLVM)
         if (exp.e2.op == EXP.call)
             exp.e2 = (cast(CallExp)exp.e2).addDtorHook(sc);
 
+        if (exp.e1.type.isTypeFunction() || exp.e2.type.isTypeFunction())
+        {
+            error(exp.loc, "operator `is` is not defined for function types");
+            return setError();
+        }
+
         if (exp.e1.type.toBasetype().ty == Tsarray ||
             exp.e2.type.toBasetype().ty == Tsarray)
             deprecation(exp.loc, "identity comparison of static arrays "

dmd/pragmasem.d

@@ -639,7 +639,7 @@ private bool pragmaMsgSemantic(Loc loc, Scope* sc, Expressions* args)
     else
     {
         buf.writestring("\n");
-        fprintf(stderr, buf.extractChars);
+        fprintf(stderr, "%s", buf.extractChars);
     }
     return true;
 }

dmd/statementsem.d

@@ -134,7 +134,16 @@ private Expression checkAssignmentAsCondition(Expression e, Scope* sc)
     return e;
 }
 
-// Performs semantic analysis in Statement AST nodes
+/**
+ * Performs semantic analysis in Statement AST nodes
+ *
+ * Params:
+ *   s = statement to perform semantic analysis on
+ *   sc = scope in which statement resides
+ *
+ * Returns: statement `s` after semantic analysis.
+ * Can be `null`, for example with `pragma(msg, "")`
+ */
 Statement statementSemantic(Statement s, Scope* sc)
 {
     import dmd.compiler;
@@ -3497,6 +3506,7 @@ version (IN_LLVM)
             sc = sc.push();
             sc.flags |= SCOPE.debug_;
             ds.statement = ds.statement.statementSemantic(sc);
+            debugThrowWalker(ds.statement);
             sc.pop();
         }
         result = ds.statement;
@@ -4804,7 +4814,6 @@ private Statements* flatten(Statement statement, Scope* sc)
                 if (dc)
                 {
                     s = new DebugStatement(cs.loc, cs.ifbody);
-                    debugThrowWalker(cs.ifbody);
                 }
                 else
                     s = cs.ifbody;
@@ -4976,7 +4985,8 @@ Params:
 */
 private void debugThrowWalker(Statement s)
 {
-
+    if (!s)
+        return;
     extern(C++) final class DebugWalker : SemanticTimeTransitiveVisitor
     {
         alias visit = SemanticTimeTransitiveVisitor.visit;

gen/llvmhelpers.cpp

@@ -1491,13 +1491,6 @@ DValue *DtoSymbolAddress(const Loc &loc, Type *type, Declaration *decl) {
       LLValue *m = DtoResolveTypeInfo(tid);
       return new DImValue(type, m);
     }
-    // special vtbl symbol, used by LDC as alias to the actual vtbl (with
-    // different type and mangled name)
-    if (vd->isClassMember() && vd == vd->isClassMember()->vtblsym) {
-      Logger::println("vtbl symbol");
-      auto cd = vd->isClassMember();
-      return new DLValue(type, getIrAggr(cd)->getVtblSymbol());
-    }
     // nested variable
     if (vd->nestedrefs.length) {
       Logger::println("nested variable");

packaging/dlang-tools_version

@@ -1 +1 @@
-v2.110.0-beta.1
+v2.110.0-rc.1