mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-10 13:31:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

d/dmd: Merge upstream dmd b061bd744

Browse Source 
Fixes an ICE in the parser, and deprecates a previously allowed style of
syntax that deviated from GNU-style extended asm.

Reviewed-on: https://github.com/dlang/dmd/pull/10916

gcc/testsuite/ChangeLog:

2020-03-16  Iain Buclaw  <ibuclaw@gdcproject.org>

	* gdc.dg/asm1.d: Add new test for ICE in asm parser.
	* gdc.dg/asm5.d: New test.
This commit is contained in:
Iain Buclaw 2020-03-16 09:48:54 +01:00
parent f2d3807f58
commit e41d4a0a56
5 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/d/dmd/MERGE
View File

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

30
gcc/d/dmd/iasmgcc.c
View File

@ -13,6 +13,7 @@
#include "scope.h"
#include "declaration.h"
#include "errors.h"
#include "parse.h"
#include "statement.h"
@ -23,8 +24,8 @@ Statement *semantic(Statement *s, Scope *sc);
* Parse list of extended asm input or output operands.
* Grammar:
* | Operands:
* | SymbolicName(opt) StringLiteral AssignExpression
* | SymbolicName(opt) StringLiteral AssignExpression , Operands
* | SymbolicName(opt) StringLiteral ( AssignExpression )
* | SymbolicName(opt) StringLiteral ( AssignExpression ), Operands
* |
* | SymbolicName:
* | [ Identifier ]
@ -54,7 +55,9 @@ static int parseExtAsmOperands(Parser *p, GccAsmStatement *s)
case TOKlbracket:
if (p->peekNext() == TOKidentifier)
{
// Skip over openings `[`
p->nextToken();
// Store the symbolic name
name = p->token.ident;
p->nextToken();
}
@ -63,12 +66,32 @@ static int parseExtAsmOperands(Parser *p, GccAsmStatement *s)
p->error(s->loc, "expected identifier after `[`");
goto Lerror;
}
// Look for closing `]`
p->check(TOKrbracket);
// Look for the string literal and fall through
if (p->token.value != TOKstring)
goto Ldefault;
// fall through
case TOKstring:
constraint = p->parsePrimaryExp();
arg = p->parseAssignExp();
// @@@DEPRECATED@@@
// Old parser allowed omitting parentheses around the expression.
// Deprecated in 2.091. Can be made permanent error after 2.100
if (p->token.value != TOKlparen)
{
arg = p->parseAssignExp();
deprecation(arg->loc, "`%s` must be surrounded by parentheses", arg->toChars());
}
else
{
// Look for the opening `(`
p->check(TOKlparen);
// Parse the assign expression
arg = p->parseAssignExp();
// Look for the closing `)`
p->check(TOKrparen);
}
if (!s->args)
{
@ -86,6 +109,7 @@ static int parseExtAsmOperands(Parser *p, GccAsmStatement *s)
break;
default:
Ldefault:
p->error("expected constant string constraint for operand, not `%s`",
p->token.toChars());
goto Lerror;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2020-03-16 Iain Buclaw <ibuclaw@gdcproject.org>
* gdc.dg/asm1.d: Add new test for ICE in asm parser.
* gdc.dg/asm5.d: New test.
2020-03-16 Jakub Jelinek <jakub@redhat.com>
PR debug/94167

9
gcc/testsuite/gdc.dg/asm1.d
View File

@ -29,6 +29,15 @@ void parse3()
// { dg-error "found 'EOF' when expecting ';'" "" { target *-*-* } .-4 }
}
void parse4()
{
int expr;
asm
{
"%name" : [name] string (expr); // { dg-error "expected constant string constraint for operand, not 'string'" }
}
}
void semantic1()
{
{

12
gcc/testsuite/gdc.dg/asm5.d Normal file
View File

@ -0,0 +1,12 @@
// https://issues.dlang.org/show_bug.cgi?id=20593
// { dg-do compile }
// { dg-options "-Wall -Wdeprecated -Werror" }
module asm5;
void test(int a)
{
asm
{
"cpuid" : : "a" a; // { dg-error "'a' must be surrounded by parentheses" }
}
}