mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-30 15:24:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

d: Merge upstream dmd 313d28b3d, druntime e361d200.

Browse Source 
D front-end changes:

    - Import latest bug fixes from the 2.100 release branch.
    - Fix signatures of extern C++ functions that have size_t
      parameters.

gcc/d/ChangeLog:

	* dmd/MERGE: Merge upstream dmd 313d28b3d.
	* d-port.cc (Port::memicmp): Use d_size_t instead of size_t.
	(Port::valcpy): Likewise.

libphobos/ChangeLog:

	* libdruntime/MERGE: Merge upstream druntime e361d200.
This commit is contained in:
Iain Buclaw 2022-04-28 12:40:59 +02:00
parent 89dbf9a5f5
commit d91cb2059f
9 changed files with 121 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/d/d-port.cc
View File

@ -31,11 +31,11 @@ along with GCC; see the file COPYING3. If not see
/* Compare the first N bytes of S1 and S2 without regard to the case. */
int
Port::memicmp (const char *s1, const char *s2, size_t n)
Port::memicmp (const char *s1, const char *s2, d_size_t n)
{
int result = 0;
for (size_t i = 0; i < n; i++)
for (d_size_t i = 0; i < n; i++)
{
char c1 = s1[i];
char c2 = s2[i];
@ -143,9 +143,9 @@ Port::readlongBE (const void *buffer)
/* Write an SZ-byte sized VALUE to BUFFER, ignoring endian-ness. */
void
Port::valcpy (void *buffer, uint64_t value, size_t sz)
Port::valcpy (void *buffer, uint64_t value, d_size_t sz)
{
gcc_assert (((size_t) buffer) % sz == 0);
gcc_assert (((d_size_t) buffer) % sz == 0);
switch (sz)
{

2
gcc/d/dmd/MERGE
View File

@ -1,4 +1,4 @@
eb7bee331a13026eeb4dcbf9d43d5d4e744a4d26
313d28b3db7523e67880ae3baf8ef28ce9abe9bd
The first line of this file holds the git revision number of the last
merge done from the dlang/dmd repository.

95
gcc/d/dmd/cparse.d
View File

@ -213,16 +213,12 @@ final class CParser(AST) : Parser!AST
goto Lexp;
case TOK.leftParenthesis:
{
/* If tokens look like a function call, assume it is one,
* As any type-name won't be resolved until semantic, this
* could be rewritten later.
*/
auto tk = &token;
if (isFunctionCall(tk))
goto Lexp;
goto default;
}
if (auto pt = lookupTypedef(token.ident))
{
if (*pt)
goto Ldeclaration;
}
goto Lexp; // function call
default:
{
@ -1626,10 +1622,21 @@ final class CParser(AST) : Parser!AST
*/
if (token.value == TOK.semicolon)
{
nextToken();
if (!tspec)
{
nextToken();
return; // accept empty declaration as an extension
}
if (auto ti = tspec.isTypeIdentifier())
{
// C11 6.7.2-2
error("type-specifier missing for declaration of `%s`", ti.ident.toChars());
nextToken();
return;
}
nextToken();
auto tt = tspec.isTypeTag();
if (!tt ||
!tt.id && (tt.tok == TOK.struct_ || tt.tok == TOK.union_))
@ -1661,6 +1668,22 @@ final class CParser(AST) : Parser!AST
specifier.mod &= ~MOD.xnone; // 'used' it
}
void scanPastSemicolon()
{
while (token.value != TOK.semicolon && token.value != TOK.endOfFile)
nextToken();
nextToken();
}
if (token.value == TOK.assign && tspec && tspec.isTypeIdentifier())
{
/* C11 6.7.2-2
* Special check for `const b = 1;` because some compilers allow it
*/
error("type-specifier omitted for declaration of `%s`", tspec.isTypeIdentifier().ident.toChars());
return scanPastSemicolon();
}
bool first = true;
while (1)
{
@ -1880,10 +1903,7 @@ final class CParser(AST) : Parser!AST
default:
error("`=`, `;` or `,` expected to end declaration instead of `%s`", token.toChars());
Lend:
while (token.value != TOK.semicolon && token.value != TOK.endOfFile)
nextToken();
nextToken();
return;
return scanPastSemicolon();
}
}
}
@ -2528,7 +2548,14 @@ final class CParser(AST) : Parser!AST
default:
if (declarator == DTR.xdirect)
{
error("identifier or `(` expected"); // )
if (!t || t.isTypeIdentifier())
{
// const arr[1];
error("no type-specifier for declarator");
t = AST.Type.tint32;
}
else
error("identifier or `(` expected"); // )
panic();
}
ts = t;
@ -2744,6 +2771,11 @@ final class CParser(AST) : Parser!AST
Specifier specifier;
specifier.packalign.setDefault();
auto tspec = cparseSpecifierQualifierList(LVL.global, specifier);
if (!tspec)
{
error("type-specifier is missing");
tspec = AST.Type.tint32;
}
if (tspec && specifier.mod & MOD.xconst)
{
tspec = toConst(tspec);
@ -2829,8 +2861,18 @@ final class CParser(AST) : Parser!AST
Specifier specifier;
specifier.packalign.setDefault();
auto tspec = cparseDeclarationSpecifiers(LVL.prototype, specifier);
if (tspec && specifier.mod & MOD.xconst)
if (!tspec)
{
error("no type-specifier for parameter");
tspec = AST.Type.tint32;
}
if (specifier.mod & MOD.xconst)
{
if ((token.value == TOK.rightParenthesis || token.value == TOK.comma) &&
tspec.isTypeIdentifier())
error("type-specifier omitted for parameter `%s`", tspec.isTypeIdentifier().ident.toChars());
tspec = toConst(tspec);
specifier.mod = MOD.xnone; // 'used' it
}
@ -3400,7 +3442,12 @@ final class CParser(AST) : Parser!AST
Specifier specifier;
specifier.packalign = this.packalign;
auto tspec = cparseSpecifierQualifierList(LVL.member, specifier);
if (tspec && specifier.mod & MOD.xconst)
if (!tspec)
{
error("no type-specifier for struct member");
tspec = AST.Type.tint32;
}
if (specifier.mod & MOD.xconst)
{
tspec = toConst(tspec);
specifier.mod = MOD.xnone; // 'used' it
@ -3413,7 +3460,13 @@ final class CParser(AST) : Parser!AST
nextToken();
auto tt = tspec.isTypeTag();
if (!tt)
{
if (auto ti = tspec.isTypeIdentifier())
{
error("type-specifier omitted before declaration of `%s`", ti.ident.toChars());
}
return; // legal but meaningless empty declaration
}
/* If anonymous struct declaration
* struct { ... members ... };
@ -3453,6 +3506,12 @@ final class CParser(AST) : Parser!AST
AST.Type dt;
if (token.value == TOK.colon)
{
if (auto ti = tspec.isTypeIdentifier())
{
error("type-specifier omitted before bit field declaration of `%s`", ti.ident.toChars());
tspec = AST.Type.tint32;
}
// C11 6.7.2.1-12 unnamed bit-field
id = Identifier.generateAnonymousId("BitField");
dt = tspec;

2
gcc/d/dmd/dscope.d
View File

@ -457,6 +457,8 @@ struct Scope
if (sc.scopesym.isModule())
flags |= SearchUnqualifiedModule; // tell Module.search() that SearchLocalsOnly is to be obeyed
else if (sc.flags & SCOPE.Cfile && sc.scopesym.isStructDeclaration())
continue; // C doesn't have struct scope
if (Dsymbol s = sc.scopesym.search(loc, ident, flags))
{

6
gcc/d/dmd/expression.h
View File

@ -373,11 +373,11 @@ public:
OwnedBy ownedByCtfe;
static StringExp *create(const Loc &loc, const char *s);
static StringExp *create(const Loc &loc, const void *s, size_t len);
static StringExp *create(const Loc &loc, const void *s, d_size_t len);
static void emplace(UnionExp *pue, const Loc &loc, const char *s);
bool equals(const RootObject *o) const;
char32_t getCodeUnit(size_t i) const;
void setCodeUnit(size_t i, char32_t c);
char32_t getCodeUnit(d_size_t i) const;
void setCodeUnit(d_size_t i, char32_t c);
StringExp *toStringExp();
StringExp *toUTF8(Scope *sc);
Optional<bool> toBool();

29
gcc/d/dmd/expressionsem.d
View File

@ -5216,13 +5216,30 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
if (s.ident)
{
VarDeclaration v = s.isVarDeclaration();
if (v && !(sc.flags & SCOPE.Cfile))
if (v)
{
/* Do semantic() on initializer first so this will be illegal:
* int a = a;
*/
e.declaration.dsymbolSemantic(sc);
s.parent = sc.parent;
if (sc.flags & SCOPE.Cfile)
{
/* Do semantic() on the type before inserting v into the symbol table
*/
if (!v.originalType)
v.originalType = v.type.syntaxCopy();
Scope* sc2 = sc.push();
sc2.stc |= v.storage_class & STC.FUNCATTR;
sc2.linkage = LINK.c; // account for the extern(C) in front of the declaration
v.inuse++;
v.type = v.type.typeSemantic(v.loc, sc2);
v.inuse--;
sc2.pop();
}
else
{
/* Do semantic() on initializer first so this will be illegal:
* int a = a;
*/
e.declaration.dsymbolSemantic(sc);
s.parent = sc.parent;
}
}
if (!sc.insert(s))

5
gcc/d/dmd/root/port.h
View File

@ -13,12 +13,13 @@
// The idea is to minimize #ifdef's in the app code.
#include "dsystem.h"
#include "dcompat.h"
typedef unsigned char utf8_t;
struct Port
{
static int memicmp(const char *s1, const char *s2, size_t n);
static int memicmp(const char *s1, const char *s2, d_size_t n);
static char *strupr(char *s);
static bool isFloat32LiteralOutOfRange(const char *s);
@ -30,5 +31,5 @@ struct Port
static unsigned readlongBE(const void *buffer);
static unsigned readwordLE(const void *buffer);
static unsigned readwordBE(const void *buffer);
static void valcpy(void *dst, uint64_t val, size_t size);
static void valcpy(void *dst, uint64_t val, d_size_t size);
};

7
gcc/testsuite/gdc.test/compilable/revert_dip1000.d Normal file
View File

@ -0,0 +1,7 @@
/*
REQUIRED_ARGS: -revert=dip1000
TEST_OUTPUT:
---
---
*/
int* oops(scope int* p) @safe { return p; }

2
libphobos/libdruntime/MERGE
View File

@ -1,4 +1,4 @@
27834edb5e1613e3abd43e09880c36d9fc961938
e361d200b287a68344095f306cf5ea3a63c080e1
The first line of this file holds the git revision number of the last
merge done from the dlang/druntime repository.