Merge pull request #4768 from kinke/merge_stable

kinke · web-flow · commit 65b882d3d160 · 2024-10-28T16:14:59.000+01:00
Merge upstream stable
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # LDC master
 
 #### Big news
-- Frontend, druntime and Phobos are at version [2.110.0](https://dlang.org/changelog/2.110.0.html). (#4707, #4737, #4749)
+- Frontend, druntime and Phobos are at version [2.110.0](https://dlang.org/changelog/2.110.0.html). (#4707, #4737, #4749, #4768)
 - LLVM for prebuilt packages bumped to v18.1.8 (incl. macOS arm64). (#4712)
 - Android: NDK for prebuilt package bumped from r26d to r27. (#4711)
 - ldc2.conf: %%ldcconfigpath%% placeholder added - specifies the directory where current configuration file is located. (#4717)
diff --git a/dmd/dcast.d b/dmd/dcast.d
@@ -2336,7 +2336,7 @@ Expression castTo(Expression e, Scope* sc, Type t, Type att = null)
         Type tb = t.toBasetype();
         Type typeb = e.type.toBasetype();
 
-        if (e.hexString && !e.committed)
+        if (e.hexString && !e.committed && tb.nextOf().isintegral)
         {
             const szx = cast(ubyte) tb.nextOf().size();
             if (szx != se.sz && (e.len % szx) == 0)
diff --git a/dmd/dinterpret.d b/dmd/dinterpret.d
@@ -6136,7 +6136,7 @@ public:
         {
             auto se = e1.isStringExp();
             // Allow casting a hex string literal to short[], int[] or long[]
-            if (se && se.hexString && se.postfix == StringExp.NoPostfix)
+            if (se && se.hexString && se.postfix == StringExp.NoPostfix && e.to.nextOf().isintegral)
             {
                 const sz = cast(size_t) e.to.nextOf().size;
                 if ((se.len % sz) != 0)
diff --git a/dmd/enumsem.d b/dmd/enumsem.d
@@ -186,7 +186,7 @@ void enumSemantic(Scope* sc, EnumDeclaration ed)
 
     if (ed.members.length == 0)
     {
-        .error(ed.loc, "%s `%s enum `%s` must have at least one member", ed.kind, ed.toPrettyChars, ed.toChars());
+        .error(ed.loc, "%s `%s` enum `%s` must have at least one member", ed.kind, ed.toPrettyChars, ed.toChars());
         ed.errors = true;
         ed.semanticRun = PASS.semanticdone;
         return;
diff --git a/dmd/hdrgen.d b/dmd/hdrgen.d
@@ -1726,10 +1726,10 @@ void toCBuffer(Dsymbol s, ref OutBuffer buf, ref HdrGenState hgs)
         //printf("FuncDeclaration::toCBuffer() '%s'\n", f.toChars());
         if (stcToBuffer(buf, f.storage_class))
             buf.writeByte(' ');
+        typeToBuffer(f.type, f.ident, buf, hgs);
         auto tf = f.type.isTypeFunction();
-        typeToBuffer(tf, f.ident, buf, hgs);
 
-        if (hgs.hdrgen)
+        if (hgs.hdrgen && tf)
         {
             // if the return type is missing (e.g. ref functions or auto)
             // https://issues.dlang.org/show_bug.cgi?id=20090
@@ -1864,9 +1864,9 @@ void toCBuffer(Dsymbol s, ref OutBuffer buf, ref HdrGenState hgs)
         if (stcToBuffer(buf, d.storage_class))
             buf.writeByte(' ');
         buf.writestring("invariant");
-        if(auto es = d.fbody.isExpStatement())
+        auto es = d.fbody.isExpStatement();
+        if (es && es.exp && es.exp.op == EXP.assert_)
         {
-            assert(es.exp && es.exp.op == EXP.assert_);
             buf.writestring(" (");
             (cast(AssertExp)es.exp).e1.expressionToBuffer(buf, hgs);
             buf.writestring(");");
diff --git a/dmd/parse.d b/dmd/parse.d
@@ -9749,6 +9749,7 @@ immutable PREC[EXP.max + 1] precedence =
     EXP.assign : PREC.assign,
     EXP.construct : PREC.assign,
     EXP.blit : PREC.assign,
+    EXP.loweredAssignExp : PREC.assign,
     EXP.addAssign : PREC.assign,
     EXP.minAssign : PREC.assign,
     EXP.concatenateAssign : PREC.assign,
diff --git a/dmd/typesem.d b/dmd/typesem.d
@@ -835,7 +835,9 @@ extern (D) MATCH callMatch(TypeFunction tf, Type tthis, ArgumentList argumentLis
         L1:
             if (parameterList.varargs == VarArg.typesafe && u + 1 == nparams) // if last varargs param
             {
-                auto trailingArgs = args[u .. $];
+                Expression[] trailingArgs;
+                if (args.length >= u)
+                    trailingArgs = args[u .. $];
                 if (auto vmatch = matchTypeSafeVarArgs(tf, p, trailingArgs, pMessage))
                     return vmatch < match ? vmatch : match;
                 // Error message was already generated in `matchTypeSafeVarArgs`
diff --git a/runtime/druntime/src/importc.h b/runtime/druntime/src/importc.h
@@ -41,6 +41,7 @@
 #define __alignof _Alignof
 #define __vector_size__ vector_size
 #define __typeof typeof
+#define __typeof__ typeof
 
 /********************
  * Clang nullability extension used by macOS headers.
diff --git a/runtime/phobos b/runtime/phobos
@@ -1 +1 @@
-Subproject commit a1a756a828f29b3fbab062d1cc7857b59105f699
+Subproject commit b7faca1c9bca5ed31ab82b0700ae45ca312727d7
diff --git a/tests/dmd/compilable/extra-files/vcg-ast.d.cg b/tests/dmd/compilable/extra-files/vcg-ast.d.cg
@@ -100,6 +100,12 @@ void main()
 	values();
 	return 0;
 }
+import imports.vcg_ast_import;
+template imported()
+{
+	import imported = imports.vcg_ast_import;
+}
+alias myImport = vcg_ast_import;
 R!int
 {
 	struct _R
@@ -137,6 +143,21 @@ mixin _d_cmain!();
 		}
 	}
 }
+imported!()
+{
+	import object;
+	struct O
+	{
+		invariant
+		{
+		}
+		invariant
+		{
+			__invariant0();
+		}
+	}
+
+}
 RTInfo!(C)
 {
 	enum immutable(void)* RTInfo = null;
@@ -161,4 +182,3 @@ RTInfo!(_R)
 	enum immutable(void)* RTInfo = null;
 
 }
-
diff --git a/tests/dmd/compilable/imports/vcg_ast_import.d b/tests/dmd/compilable/imports/vcg_ast_import.d
@@ -0,0 +1,4 @@
+struct O
+{
+    invariant() {}
+}
diff --git a/tests/dmd/compilable/test24760.d b/tests/dmd/compilable/test24760.d
@@ -0,0 +1,4 @@
+// https://issues.dlang.org/show_bug.cgi?id=24760
+
+long f(int e = 0, uint[] optional...) => optional.length;
+long f0() => f(); // compiler segfaults
diff --git a/tests/dmd/compilable/vcg-ast-arraylength.d b/tests/dmd/compilable/vcg-ast-arraylength.d
@@ -23,4 +23,9 @@ void main()
 
     static assert(is(typeof(a.length = 0) == size_t));
     static assert(is(typeof(a.length = f.length = 0) == size_t));
+
+    // https://issues.dlang.org/show_bug.cgi?id=24790
+    struct S { int[] payload; }
+    S s;
+    s.payload.length += 3;
 }
diff --git a/tests/dmd/compilable/vcg-ast.d b/tests/dmd/compilable/vcg-ast.d
@@ -3,6 +3,7 @@ REQUIRED_ARGS: -vcg-ast -o-
 PERMUTE_ARGS:
 OUTPUT_FILES: compilable/vcg-ast.d.cg
 TRANSFORM_OUTPUT: remove_lines(LDC_profile_instr)
+EXTRA_FILES: imports/vcg_ast_import.d
 TEST_OUTPUT_FILE: extra-files/vcg-ast.d.cg
 */
 
@@ -64,3 +65,14 @@ void main()
 {
     values!wchar_t;
 }
+
+// https://issues.dlang.org/show_bug.cgi?id=24764
+
+import imports.vcg_ast_import;
+
+template imported()
+{
+    import imported = imports.vcg_ast_import;
+}
+
+alias myImport = imported!();
diff --git a/tests/dmd/compilable/vcg_ast_compilable.d b/tests/dmd/compilable/vcg_ast_compilable.d
@@ -0,0 +1,69 @@
+/*
+REQUIRED_ARGS: -vcg-ast -o-
+OUTPUT_FILES: compilable/vcg_ast_compilable.d.cg
+TEST_OUTPUT:
+---
+=== compilable/vcg_ast_compilable.d.cg
+import object;
+auto binaryFun(E)(E b)
+{
+	return 'a' == b;
+}
+void find(Element)(Element needle) if (is(typeof(binaryFun(needle))))
+{
+}
+void find()(string needle)
+{
+}
+void splitter()
+{
+	find(3);
+	find("");
+}
+binaryFun!int
+{
+	auto pure nothrow @nogc @safe bool binaryFun(int b)
+	{
+		return 97 == b;
+	}
+
+}
+find!int
+{
+	pure nothrow @nogc @safe void find(int needle)
+	{
+	}
+
+}
+binaryFun!string
+{
+	auto _error_ binaryFun
+	{
+		__error__
+	}
+
+}
+find!()
+{
+	pure nothrow @nogc @safe void find(string needle)
+	{
+	}
+
+}
+---
+*/
+
+// https://issues.dlang.org/show_bug.cgi?id=24431
+auto binaryFun(E)(E b)
+{
+    return 'a' == b;
+}
+
+void find(Element)(Element needle) if (is(typeof(binaryFun(needle)))) { }
+void find()(string needle) { }
+
+void splitter()
+{
+    find!int(3);
+    find!()("");
+}
diff --git a/tests/dmd/fail_compilation/diag24812.d b/tests/dmd/fail_compilation/diag24812.d
@@ -0,0 +1,7 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/diag24812.d(7): Error: enum `diag24812.Foo` enum `Foo` must have at least one member
+---
+*/
+enum Foo {}
diff --git a/tests/dmd/fail_compilation/hexstring.d b/tests/dmd/fail_compilation/hexstring.d
@@ -14,14 +14,14 @@ fail_compilation/hexstring.d(39):        perhaps remove postfix `c` from hex str
 fail_compilation/hexstring.d(40): Error: hex string with `dstring` type needs to be multiple of 4 bytes, not 5
 fail_compilation/hexstring.d(41): Error: cannot implicitly convert expression `x"11223344"d` of type `dstring` to `immutable(float[])`
 fail_compilation/hexstring.d(42): Error: cannot implicitly convert expression `x"1122"w` of type `wstring` to `immutable(ubyte[])`
+fail_compilation/hexstring.d(50): Error: array cast from `string` to `S[]` is not supported at compile time
 fail_compilation/hexstring.d(28): Error: cannot implicitly convert expression `x"123F"` of type `string` to `ubyte[]`
 ---
 */
 immutable ubyte[] s0 = x"123F";
 static assert(s0[0] == 0x12);
 static assert(s0[1] == 0x3F);
 immutable byte[] s1 = x"123F";
-
 enum E(X) = cast(X[]) x"AABBCCDD";
 static assert(E!int[0] == 0xAABBCCDD);
 
@@ -40,3 +40,11 @@ immutable uint[] f11 = cast(immutable uint[]) x"AABBCCDD"c;
 immutable uint[] f12 = x"1122334455"d;
 immutable float[] f13 = x"11223344"d;
 immutable ubyte[] f14 = x"1122"w;
+
+// https://issues.dlang.org/show_bug.cgi?id=24832
+struct S
+{
+    ushort l0, l1, l2, l3, l4, l5;
+}
+
+immutable S[] returnValues = cast(S[]) x"FFFFFFFFFFFFFFFFFFFFFFFF";
diff --git a/tests/dmd/runnable/test24819.d b/tests/dmd/runnable/test24819.d
@@ -0,0 +1,18 @@
+import core.stdc.stdio;
+
+pragma(inline, true)
+double sqrt(double x)
+{
+    static import core.math;
+    return core.math.sqrt(x);
+}
+
+int main()
+{
+    double q = -5.0;
+    double r = q + 1.0;
+    double result = sqrt(-r);
+    //printf("%f\n", result);
+    assert(result == 2);
+    return 0;
+}

Original file line number	Diff line number	Diff line change
`@@ -2336,7 +2336,7 @@ Expression castTo(Expression e, Scope* sc, Type t, Type att = null)`
`2336`	`2336`	`Type tb = t.toBasetype();`
`2337`	`2337`	`Type typeb = e.type.toBasetype();`
`2338`	`2338`
`2339`		`- if (e.hexString && !e.committed)`
	`2339`	`+ if (e.hexString && !e.committed && tb.nextOf().isintegral)`
`2340`	`2340`	`{`
`2341`	`2341`	`const szx = cast(ubyte) tb.nextOf().size();`
`2342`	`2342`	`if (szx != se.sz && (e.len % szx) == 0)`
Original file line number	Diff line number	Diff line change
`@@ -6136,7 +6136,7 @@ public:`
`6136`	`6136`	`{`
`6137`	`6137`	`auto se = e1.isStringExp();`
`6138`	`6138`	`// Allow casting a hex string literal to short[], int[] or long[]`
`6139`		`- if (se && se.hexString && se.postfix == StringExp.NoPostfix)`
	`6139`	`+ if (se && se.hexString && se.postfix == StringExp.NoPostfix && e.to.nextOf().isintegral)`
`6140`	`6140`	`{`
`6141`	`6141`	`const sz = cast(size_t) e.to.nextOf().size;`
`6142`	`6142`	`if ((se.len % sz) != 0)`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ void enumSemantic(Scope* sc, EnumDeclaration ed)`
`186`	`186`
`187`	`187`	`if (ed.members.length == 0)`
`188`	`188`	`{`
`189`		- .error(ed.loc, "%s `%s enum `%s` must have at least one member", ed.kind, ed.toPrettyChars, ed.toChars());
	`189`	+ .error(ed.loc, "%s `%s` enum `%s` must have at least one member", ed.kind, ed.toPrettyChars, ed.toChars());
`190`	`190`	`ed.errors = true;`
`191`	`191`	`ed.semanticRun = PASS.semanticdone;`
`192`	`192`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,12 @@ void main()`
`100`	`100`	`values();`
`101`	`101`	`return 0;`
`102`	`102`	`}`
	`103`	`+import imports.vcg_ast_import;`
	`104`	`+template imported()`
	`105`	`+{`
	`106`	`+ import imported = imports.vcg_ast_import;`
	`107`	`+}`
	`108`	`+alias myImport = vcg_ast_import;`
`103`	`109`	`R!int`
`104`	`110`	`{`
`105`	`111`	`struct _R`
`@@ -137,6 +143,21 @@ mixin _d_cmain!();`
`137`	`143`	`}`
`138`	`144`	`}`
`139`	`145`	`}`
	`146`	`+imported!()`
	`147`	`+{`
	`148`	`+ import object;`
	`149`	`+ struct O`
	`150`	`+ {`
	`151`	`+ invariant`
	`152`	`+ {`
	`153`	`+ }`
	`154`	`+ invariant`
	`155`	`+ {`
	`156`	`+ __invariant0();`
	`157`	`+ }`
	`158`	`+ }`
	`159`	`+`
	`160`	`+}`
`140`	`161`	`RTInfo!(C)`
`141`	`162`	`{`
`142`	`163`	`enum immutable(void)* RTInfo = null;`
`@@ -161,4 +182,3 @@ RTInfo!(_R)`
`161`	`182`	`enum immutable(void)* RTInfo = null;`
`162`	`183`
`163`	`184`	`}`
`164`		`-`