aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/d/dmd/MERGE2
-rw-r--r--gcc/d/dmd/VERSION2
-rw-r--r--gcc/d/dmd/dinterpret.d12
-rw-r--r--gcc/d/dmd/dsymbol.d21
-rw-r--r--gcc/d/dmd/expressionsem.d102
-rw-r--r--gcc/d/dmd/typesem.d1
-rw-r--r--gcc/d/dmd/typinf.d5
-rw-r--r--gcc/testsuite/gdc.test/compilable/test16213.d8
-rw-r--r--gcc/testsuite/gdc.test/compilable/test17351.d9
-rw-r--r--gcc/testsuite/gdc.test/compilable/test19295.d10
-rw-r--r--gcc/testsuite/gdc.test/compilable/testcorrectthis.d37
-rw-r--r--gcc/testsuite/gdc.test/fail_compilation/fail23760.d27
-rw-r--r--gcc/testsuite/gdc.test/fail_compilation/fail61.d2
-rw-r--r--gcc/testsuite/gdc.test/fail_compilation/fail_circular.d15
-rw-r--r--gcc/testsuite/gdc.test/fail_compilation/ice19295.d18
-rw-r--r--gcc/testsuite/gdc.test/fail_compilation/ice23781.d10
-rw-r--r--gcc/testsuite/gdc.test/fail_compilation/ice9439.d4
17 files changed, 245 insertions, 40 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE
index 269eebf..986925e 100644
--- a/gcc/d/dmd/MERGE
+++ b/gcc/d/dmd/MERGE
@@ -1,4 +1,4 @@
-4ca4140e584c055a8a9bc727e56a97ebcecd61e0
+5f7552bb2829b75d5e36cc767a476e1ab35147b7
The first line of this file holds the git revision number of the last
merge done from the dlang/dmd repository.
diff --git a/gcc/d/dmd/VERSION b/gcc/d/dmd/VERSION
index 8b24f92..da496a2 100644
--- a/gcc/d/dmd/VERSION
+++ b/gcc/d/dmd/VERSION
@@ -1 +1 @@
-v2.103.0-beta.1
+v2.103.0-rc.1
diff --git a/gcc/d/dmd/dinterpret.d b/gcc/d/dmd/dinterpret.d
index 9073b0d..e6ef704 100644
--- a/gcc/d/dmd/dinterpret.d
+++ b/gcc/d/dmd/dinterpret.d
@@ -2036,7 +2036,7 @@ public:
}
auto er = interpret(e.e1, istate, CTFEGoal.LValue);
if (auto ve = er.isVarExp())
- if (ve.var == istate.fd.vthis)
+ if (istate && ve.var == istate.fd.vthis)
er = interpret(er, istate);
if (exceptionOrCant(er))
@@ -2117,6 +2117,16 @@ public:
return CTFEExp.cantexp;
assert(e.type);
+ // There's a terrible hack in `dmd.dsymbolsem` that special case
+ // a struct with all zeros to an `ExpInitializer(BlitExp(IntegerExp(0)))`
+ // There's matching code for it in e2ir (toElem's visitAssignExp),
+ // so we need the same hack here.
+ // This does not trigger for global as they get a normal initializer.
+ if (auto ts = e.type.isTypeStruct())
+ if (auto ae = e.isBlitExp())
+ if (ae.e2.op == EXP.int64)
+ e = ts.defaultInitLiteral(loc);
+
if (e.op == EXP.construct || e.op == EXP.blit)
{
AssignExp ae = cast(AssignExp)e;
diff --git a/gcc/d/dmd/dsymbol.d b/gcc/d/dmd/dsymbol.d
index aa478f2..e7ce93e 100644
--- a/gcc/d/dmd/dsymbol.d
+++ b/gcc/d/dmd/dsymbol.d
@@ -2162,10 +2162,23 @@ extern (C++) final class ArrayScopeSymbol : ScopeDsymbol
* or a variable (in which case an expression is created in
* toir.c).
*/
- auto e = new VoidInitializer(Loc.initial);
- e.type = Type.tsize_t;
- v = new VarDeclaration(loc, Type.tsize_t, Id.dollar, e);
- v.storage_class |= STC.temp | STC.ctfe; // it's never a true static variable
+
+ // https://issues.dlang.org/show_bug.cgi?id=16213
+ // For static arrays $ is known at compile time,
+ // so declare it as a manifest constant.
+ auto tsa = ce.type ? ce.type.isTypeSArray() : null;
+ if (tsa)
+ {
+ auto e = new ExpInitializer(loc, tsa.dim);
+ v = new VarDeclaration(loc, tsa.dim.type, Id.dollar, e, STC.manifest);
+ }
+ else
+ {
+ auto e = new VoidInitializer(Loc.initial);
+ e.type = Type.tsize_t;
+ v = new VarDeclaration(loc, Type.tsize_t, Id.dollar, e);
+ v.storage_class |= STC.temp | STC.ctfe; // it's never a true static variable
+ }
}
*pvar = v;
}
diff --git a/gcc/d/dmd/expressionsem.d b/gcc/d/dmd/expressionsem.d
index d186abc..632ea11 100644
--- a/gcc/d/dmd/expressionsem.d
+++ b/gcc/d/dmd/expressionsem.d
@@ -1155,6 +1155,69 @@ L1:
return e1;
}
+/*
+ * Check whether `outerFunc` and `calledFunc` have the same `this`.
+ * If `calledFunc` is the member of a base class of the class that contains
+ * `outerFunc` we consider that they have the same this.
+ *
+ * This function is used to test whether `this` needs to be prepended to
+ * a function call or function symbol. For example:
+ *
+ * struct X
+ * {
+ * void gun() {}
+ * }
+ * struct A
+ * {
+ * void fun() {}
+ * void sun()
+ * {
+ * fun();
+ * X.gun(); // error
+ * }
+ * }
+ *
+ * When `fun` is called, `outerfunc` = `sun` and `calledFunc = `fun`.
+ * `sun` is a member of `A` and `fun` is also a member of `A`, therefore
+ * `this` can be prepended to `fun`. When `gun` is called (it will result
+ * in an error, but that is not relevant here), which is a member of `X`,
+ * no `this` is needed because the outer function does not have the same
+ * `this` as `gun`.
+ *
+ * Returns:
+ * `true` if outerFunc and calledFunc may use the same `this` pointer.
+ * `false` otherwise.
+ */
+private bool haveSameThis(FuncDeclaration outerFunc, FuncDeclaration calledFunc)
+{
+ auto thisAd = outerFunc.isMemberLocal();
+ if (!thisAd)
+ return false;
+
+ auto requiredAd = calledFunc.isMemberLocal();
+ if (!requiredAd)
+ return false;
+
+ if (thisAd == requiredAd)
+ return true;
+
+ // outerfunc is the member of a base class that contains calledFunc,
+ // then we consider that they have the same this.
+ auto cd = requiredAd.isClassDeclaration();
+ if (!cd)
+ return false;
+
+ if (cd.isBaseOf2(thisAd.isClassDeclaration()))
+ return true;
+
+ // if outerfunc is the member of a nested aggregate, then let
+ // getRightThis take care of this.
+ if (thisAd.isNested())
+ return true;
+
+ return false;
+}
+
/***************************************
* Pull out any properties.
*/
@@ -5209,7 +5272,8 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
if (exp.f.checkNestedReference(sc, exp.loc))
return setError();
- if (hasThis(sc))
+ auto memberFunc = hasThis(sc);
+ if (memberFunc && haveSameThis(memberFunc, exp.f))
{
// Supply an implicit 'this', as in
// this.ident
@@ -6892,8 +6956,6 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
AggregateDeclaration ad = f.isMemberLocal();
if (f.needThis())
e.e1 = getRightThis(e.loc, sc, ad, e.e1, f);
- if (e.e1.op == EXP.error)
- return setError();
if (f.type.ty == Tfunction)
{
@@ -7207,7 +7269,8 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
}
if (f.needThis())
{
- if (hasThis(sc))
+ auto memberFunc = hasThis(sc);
+ if (memberFunc && haveSameThis(memberFunc, f))
{
/* Should probably supply 'this' after overload resolution,
* not before.
@@ -7309,6 +7372,14 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
goto case Terror;
}
+ if (sc.flags & SCOPE.Cfile && exp.type && exp.type.toBasetype().ty == Tvoid)
+ {
+ // https://issues.dlang.org/show_bug.cgi?id=23752
+ // `&*((void*)(0))` is allowed in C
+ result = exp;
+ return;
+ }
+
if (exp.checkValue())
return setError();
@@ -12311,6 +12382,29 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
Type t1 = exp.e1.type;
Type t2 = exp.e2.type;
+
+ // https://issues.dlang.org/show_bug.cgi?id=23767
+ // `cast(void*) 0` should be treated as `null` so the ternary expression
+ // gets the pointer type of the other branch
+ if (sc.flags & SCOPE.Cfile)
+ {
+ static void rewriteCNull(ref Expression e, ref Type t)
+ {
+ if (!t.isTypePointer())
+ return;
+ if (auto ie = e.optimize(WANTvalue).isIntegerExp())
+ {
+ if (ie.getInteger() == 0)
+ {
+ e = new NullExp(e.loc, Type.tnull);
+ t = Type.tnull;
+ }
+ }
+ }
+ rewriteCNull(exp.e1, t1);
+ rewriteCNull(exp.e2, t2);
+ }
+
if (t1.ty == Tnoreturn)
{
exp.type = t2;
diff --git a/gcc/d/dmd/typesem.d b/gcc/d/dmd/typesem.d
index 84561ac..c668199 100644
--- a/gcc/d/dmd/typesem.d
+++ b/gcc/d/dmd/typesem.d
@@ -4176,6 +4176,7 @@ Expression dotExp(Type mt, Scope* sc, Expression e, Identifier ident, int flag)
}
if (v.type.ty == Terror)
{
+ e.error("type of variable `%s` has errors", v.toPrettyChars);
return ErrorExp.get();
}
diff --git a/gcc/d/dmd/typinf.d b/gcc/d/dmd/typinf.d
index 2ca7143..38a39b4 100644
--- a/gcc/d/dmd/typinf.d
+++ b/gcc/d/dmd/typinf.d
@@ -34,8 +34,9 @@ import core.stdc.stdio;
* loc = the location for reporting line numbers in errors
* torig = the type to generate the `TypeInfo` object for
* sc = the scope
+ * genObjCode = if true, object code will be generated for the obtained TypeInfo
*/
-extern (C++) void genTypeInfo(Expression e, const ref Loc loc, Type torig, Scope* sc)
+extern (C++) void genTypeInfo(Expression e, const ref Loc loc, Type torig, Scope* sc, bool genObjCode = true)
{
// printf("genTypeInfo() %s\n", torig.toChars());
@@ -80,7 +81,7 @@ extern (C++) void genTypeInfo(Expression e, const ref Loc loc, Type torig, Scope
// generate a COMDAT for other TypeInfos not available as builtins in
// druntime
- if (!isUnqualifiedClassInfo && !builtinTypeInfo(t))
+ if (!isUnqualifiedClassInfo && !builtinTypeInfo(t) && genObjCode)
{
if (sc) // if in semantic() pass
{
diff --git a/gcc/testsuite/gdc.test/compilable/test16213.d b/gcc/testsuite/gdc.test/compilable/test16213.d
new file mode 100644
index 0000000..ccf77c6
--- /dev/null
+++ b/gcc/testsuite/gdc.test/compilable/test16213.d
@@ -0,0 +1,8 @@
+// https://issues.dlang.org/show_bug.cgi?id=16213
+
+enum Id(size_t i) = i;
+void main()
+{
+ int[5] y;
+ y[ Id!($) - 1 ] = 3;
+}
diff --git a/gcc/testsuite/gdc.test/compilable/test17351.d b/gcc/testsuite/gdc.test/compilable/test17351.d
index fffe92c..a04ade1 100644
--- a/gcc/testsuite/gdc.test/compilable/test17351.d
+++ b/gcc/testsuite/gdc.test/compilable/test17351.d
@@ -1,3 +1,4 @@
+// PERMUTE_ARGS: -preview=in
bool fun(S)(ref S[3] a) { assert(a == [42, 84, 169]); return true; }
bool fun2(S)(ref S a) { return true; }
void main()
@@ -14,4 +15,12 @@ void test2()
{
static immutable int[2] P = [ 0, 1 ];
static assert(f2(P) == 1);
+ immutable BigInt a, b;
+ static assert(glob1.twice == b.twice);
+ static assert(a.twice == b.twice);
}
+
+struct BigInt { int[64] big; }
+BigInt twice (in BigInt v) @safe pure nothrow @nogc { return v; }
+
+immutable BigInt glob1 = BigInt.init;
diff --git a/gcc/testsuite/gdc.test/compilable/test19295.d b/gcc/testsuite/gdc.test/compilable/test19295.d
new file mode 100644
index 0000000..a32a317
--- /dev/null
+++ b/gcc/testsuite/gdc.test/compilable/test19295.d
@@ -0,0 +1,10 @@
+struct S1(T...) {
+ auto fun() {
+ static assert(__traits(compiles, &T[0]));
+ }
+}
+
+struct S2 {
+ void gun() {}
+ S1!gun overloaded;
+}
diff --git a/gcc/testsuite/gdc.test/compilable/testcorrectthis.d b/gcc/testsuite/gdc.test/compilable/testcorrectthis.d
new file mode 100644
index 0000000..3adc062
--- /dev/null
+++ b/gcc/testsuite/gdc.test/compilable/testcorrectthis.d
@@ -0,0 +1,37 @@
+// https://issues.dlang.org/show_bug.cgi?id=10886
+
+struct A
+{
+ @property int foo() { return 0; }
+ int bar() { return 0; }
+}
+
+struct B
+{
+ void bar()
+ {
+ alias f = typeof(A.foo); // NG
+ alias b = typeof(A.bar); // ok
+ }
+}
+
+// https://issues.dlang.org/show_bug.cgi?id=21288
+
+struct XA
+{
+ int p;
+}
+
+struct XB
+{
+ XA a() { return XA.init; }
+ alias a this;
+}
+
+struct XC
+{
+ void foo()
+ {
+ static assert(XB.p.stringof == "p"); // Error: this for s needs to be type B not type C
+ }
+}
diff --git a/gcc/testsuite/gdc.test/fail_compilation/fail23760.d b/gcc/testsuite/gdc.test/fail_compilation/fail23760.d
new file mode 100644
index 0000000..fbca6ec
--- /dev/null
+++ b/gcc/testsuite/gdc.test/fail_compilation/fail23760.d
@@ -0,0 +1,27 @@
+// https://issues.dlang.org/show_bug.cgi?id=23760
+
+/*
+TEST_OUTPUT:
+---
+fail_compilation/fail23760.d(16): Error: type of variable `fail23760.A.state` has errors
+fail_compilation/fail23760.d(16): Error: `(A).state` cannot be resolved
+fail_compilation/fail23760.d(21): Error: template instance `fail23760.JavaBridge!(A)` error instantiating
+fail_compilation/fail23760.d(24): instantiated from here: `JavaClass!(A)`
+---
+*/
+
+class JavaBridge(Class)
+{
+ static if(is(typeof(__traits(getMember, Class, "state")))) {}
+ alias T = __traits(getOverloads, Class, "state");
+}
+
+class JavaClass(CRTP)
+{
+ JavaBridge!(CRTP) _javaDBridge;
+}
+
+class A : JavaClass!A
+{
+ State* state;
+}
diff --git a/gcc/testsuite/gdc.test/fail_compilation/fail61.d b/gcc/testsuite/gdc.test/fail_compilation/fail61.d
index 90c3b39..1386bd6 100644
--- a/gcc/testsuite/gdc.test/fail_compilation/fail61.d
+++ b/gcc/testsuite/gdc.test/fail_compilation/fail61.d
@@ -4,7 +4,7 @@ TEST_OUTPUT:
fail_compilation/fail61.d(22): Error: no property `B` for type `fail61.A.B`
fail_compilation/fail61.d(23): Error: no property `B` for type `fail61.A.B`
fail_compilation/fail61.d(32): Error: no property `A2` for type `fail61.B2`
-fail_compilation/fail61.d(41): Error: `this` for `foo` needs to be type `B3` not type `fail61.C3`
+fail_compilation/fail61.d(41): Error: need `this` for `foo` of type `void()`
---
*/
diff --git a/gcc/testsuite/gdc.test/fail_compilation/fail_circular.d b/gcc/testsuite/gdc.test/fail_compilation/fail_circular.d
index 186444e..e67fabc 100644
--- a/gcc/testsuite/gdc.test/fail_compilation/fail_circular.d
+++ b/gcc/testsuite/gdc.test/fail_compilation/fail_circular.d
@@ -110,12 +110,15 @@ struct S6
/*
TEST_OUTPUT:
---
-fail_compilation/fail_circular.d(123): Error: circular reference to variable `fail_circular.C.a1`
-fail_compilation/fail_circular.d(125): Error: circular reference to variable `fail_circular.C.b1`
-fail_compilation/fail_circular.d(127): Error: circular reference to variable `fail_circular.C.c1`
-fail_compilation/fail_circular.d(130): Error: circular reference to variable `fail_circular.C.a1a`
-fail_compilation/fail_circular.d(133): Error: circular reference to variable `fail_circular.C.b1a`
-fail_compilation/fail_circular.d(136): Error: circular reference to variable `fail_circular.C.c1a`
+fail_compilation/fail_circular.d(126): Error: circular reference to variable `fail_circular.C.a1`
+fail_compilation/fail_circular.d(128): Error: circular reference to variable `fail_circular.C.b1`
+fail_compilation/fail_circular.d(130): Error: circular reference to variable `fail_circular.C.c1`
+fail_compilation/fail_circular.d(133): Error: circular reference to variable `fail_circular.C.a1a`
+fail_compilation/fail_circular.d(132): Error: type of variable `fail_circular.C.a1b` has errors
+fail_compilation/fail_circular.d(136): Error: circular reference to variable `fail_circular.C.b1a`
+fail_compilation/fail_circular.d(135): Error: type of variable `fail_circular.C.b1b` has errors
+fail_compilation/fail_circular.d(139): Error: circular reference to variable `fail_circular.C.c1a`
+fail_compilation/fail_circular.d(138): Error: type of variable `fail_circular.C.c1b` has errors
---
*/
class C
diff --git a/gcc/testsuite/gdc.test/fail_compilation/ice19295.d b/gcc/testsuite/gdc.test/fail_compilation/ice19295.d
deleted file mode 100644
index a92f5f8..0000000
--- a/gcc/testsuite/gdc.test/fail_compilation/ice19295.d
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-TEST_OUTPUT:
----
-fail_compilation/ice19295.d(11): Error: `this` for `gun` needs to be type `S2` not type `S1!(gun)`
-fail_compilation/ice19295.d(11): while evaluating `pragma(msg, &gun)`
-fail_compilation/ice19295.d(17): Error: template instance `ice19295.S1!(gun)` error instantiating
----
-*/
-struct S1(T...) {
- auto fun() {
- pragma(msg, &T[0]);
- }
-}
-
-struct S2 {
- void gun() {}
- S1!gun overloaded;
-}
diff --git a/gcc/testsuite/gdc.test/fail_compilation/ice23781.d b/gcc/testsuite/gdc.test/fail_compilation/ice23781.d
new file mode 100644
index 0000000..7adc116
--- /dev/null
+++ b/gcc/testsuite/gdc.test/fail_compilation/ice23781.d
@@ -0,0 +1,10 @@
+/**
+TEST_OUTPUT:
+---
+fail_compilation/ice23781.d(10): Error: variable `b` cannot be read at compile time
+---
+**/
+struct Bar { int i; }
+ref const(Bar) func1 (const return ref Bar b) { return b; }
+immutable E1 = Bar();
+enum E2 = &E1.func1();
diff --git a/gcc/testsuite/gdc.test/fail_compilation/ice9439.d b/gcc/testsuite/gdc.test/fail_compilation/ice9439.d
index a9e7008..5b2a8b1 100644
--- a/gcc/testsuite/gdc.test/fail_compilation/ice9439.d
+++ b/gcc/testsuite/gdc.test/fail_compilation/ice9439.d
@@ -1,8 +1,8 @@
/*
TEST_OUTPUT:
---
-fail_compilation/ice9439.d(12): Error: `this` for `foo` needs to be type `Derived` not type `ice9439.Base`
-fail_compilation/ice9439.d(12): while evaluating: `static assert((__error).foo())`
+fail_compilation/ice9439.d(12): Error: need `this` for `foo` of type `int()`
+fail_compilation/ice9439.d(12): while evaluating: `static assert(foo())`
fail_compilation/ice9439.d(19): Error: template instance `ice9439.Base.boo!(foo)` error instantiating
---
*/
generated by cgit v1.1 at 2025-05-31 02:07:50 +0000