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

re PR c++/70353 (ICE on __PRETTY_FUNCTION__ in a constexpr function) 

PR c++/70353

gcc/
	* tree-inline.c (remap_decls): Don't add_local_decl if
	cfun is null.
gcc/cp/
	* decl.c (make_rtl_for_nonlocal_decl): Don't defer local statics
	in constexpr functions.

From-SVN: r234530
This commit is contained in:
Jason Merrill 2016-03-29 14:40:02 -04:00
parent 3336c6e093
commit e0bffbbb59
5 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ChangeLog
View File

@ -1,5 +1,9 @@
2016-03-29 Jakub Jelinek <jakub@redhat.com>
PR c++/70353
* tree-inline.c (remap_decls): Don't add_local_decl if
cfun is null.
PR tree-optimization/70405
* ssa-iterators.h (num_imm_uses): Add missing braces.

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2016-03-29 Jason Merrill <jason@redhat.com>
PR c++/70353
* decl.c (make_rtl_for_nonlocal_decl): Don't defer local statics
in constexpr functions.
2016-03-28 Jason Merrill <jason@redhat.com>
PR c++/70422

7
gcc/cp/decl.c
View File

@ -6251,8 +6251,11 @@ make_rtl_for_nonlocal_decl (tree decl, tree init, const char* asmspec)
return;
/* We defer emission of local statics until the corresponding
DECL_EXPR is expanded. */
defer_p = DECL_FUNCTION_SCOPE_P (decl) || DECL_VIRTUAL_P (decl);
DECL_EXPR is expanded. But with constexpr its function might never
be expanded, so go ahead and tell cgraph about the variable now. */
defer_p = ((DECL_FUNCTION_SCOPE_P (decl)
&& !DECL_DECLARED_CONSTEXPR_P (DECL_CONTEXT (decl)))
|| DECL_VIRTUAL_P (decl));
/* Defer template instantiations. */
if (DECL_LANG_SPECIFIC (decl)

13
gcc/testsuite/g++.dg/cpp0x/constexpr-__func__2.C Normal file
View File

@ -0,0 +1,13 @@
// PR c++/70353
// { dg-do link { target c++11 } }
constexpr const char* ce ()
{
return __func__;
}
const char *c = ce();
int main()
{
}

3
gcc/tree-inline.c
View File

@ -616,7 +616,8 @@ remap_decls (tree decls, vec<tree, va_gc> **nonlocalized_list,
/* We need to add this variable to the local decls as otherwise
nothing else will do so. */
if (TREE_CODE (old_var) == VAR_DECL
&& ! DECL_EXTERNAL (old_var))
&& ! DECL_EXTERNAL (old_var)
&& cfun)
add_local_decl (cfun, old_var);
if ((!optimize || debug_info_level > DINFO_LEVEL_TERSE)
&& !DECL_IGNORED_P (old_var)