D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-02-26 00:23:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged DMD commit fe063f92ec667d0a8d4e2ab4659919df4360d7e8:

Browse Source 
bugzilla 4864 ICE(statement.c) Crash on invalid 'if statement' body inside mixin
This commit is contained in:
David Nadlinger
2011-04-22 18:45:00 +02:00
parent af7559f65c
commit 90cb596e14
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dmd/parse.c
View File

@@ -3181,7 +3181,10 @@ Statement *Parser::parseStatement(int flags)
}
else
elsebody = NULL;
s = new IfStatement(loc, arg, condition, ifbody, elsebody);
if (condition && ifbody)
s = new IfStatement(loc, arg, condition, ifbody, elsebody);
else
s = NULL; // don't propagate parsing errors
break;
}

3
dmd/statement.c
View File

@@ -339,7 +339,8 @@ Statements *CompileStatement::flatten(Scope *sc)
while (p.token.value != TOKeof)
{
Statement *s = p.parseStatement(PSsemi | PScurlyscope);
a->push(s);
if (s) // if no parsing errors
a->push(s);
}
return a;
}