OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

d: __FUNCTION__ doesn't work in core.stdc.stdio functions without cast (PR101441)

Browse Source 
Backports fix from upstream to allow __FUNCTION__ and
__PRETTY_FUNCTION__ to be used as C string literals.

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

	PR d/101441

gcc/d/ChangeLog:

	* dmd/MERGE: Merge upstream dmd f8c1ca928.
This commit is contained in:
Iain Buclaw 2021-07-26 15:24:12 +02:00
parent b2f6e1de24
commit 1a2306ffe7
3 changed files with 15 additions and 3 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 @@
1d8386a63d412c9e77728b0b965025ac4dd40b75
f8c1ca928360dd8c9f2fbb5771e2a5e398878ca0
The first line of this file holds the git revision number of the last
merge done from the dlang/dmd repository.

4
gcc/d/dmd/expression.c
View File

@ -5620,7 +5620,7 @@ Expression *FuncInitExp::resolveLoc(Loc loc, Scope *sc)
s = "";
Expression *e = new StringExp(loc, const_cast<char *>(s));
e = expressionSemantic(e, sc);
e = e->castTo(sc, type);
e->type = Type::tstring;
return e;
}
@ -5654,7 +5654,7 @@ Expression *PrettyFuncInitExp::resolveLoc(Loc loc, Scope *sc)
Expression *e = new StringExp(loc, const_cast<char *>(s));
e = expressionSemantic(e, sc);
e = e->castTo(sc, type);
e->type = Type::tstring;
return e;
}

12
gcc/testsuite/gdc.test/compilable/b19002.d Normal file
View File

@ -0,0 +1,12 @@
module b19002;
void printf(scope const char* format){}
void main()
{
printf(__FILE__);
printf(__FILE_FULL_PATH__);
printf(__FUNCTION__);
printf(__PRETTY_FUNCTION__);
printf(__MODULE__);
}