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

c-semantics.c (genrtl_scope_stmt): Write out nested inline functions here, instead of ...

Browse Source 
* c-semantics.c (genrtl_scope_stmt): Write out nested inline
	functions here, instead of ...
	* c-decl.c (c_expand_body): ... here.

From-SVN: r42930
This commit is contained in:
Mark Mitchell 2001-06-06 03:08:21 +00:00 committed by Mark Mitchell
parent 9166f7a36a
commit 7b2b3f29e5
4 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2001-06-05 Mark Mitchell <mark@codesourcery.com>
* c-semantics.c (genrtl_scope_stmt): Write out nested inline
functions here, instead of ...
* c-decl.c (c_expand_body): ... here.
2001-06-05 David O'Brien <obrien@FreeBSD.org>
* config.gcc, config/sparc/bsd.h: Do not directly include

15
gcc/c-decl.c
View File

@ -6931,19 +6931,8 @@ c_expand_body (fndecl, nested_p)
}
if (nested_p)
{
/* Return to the enclosing function. */
pop_function_context ();
/* If the nested function was inline, write it out if that is
necessary. */
if (!TREE_ASM_WRITTEN (fndecl) && TREE_ADDRESSABLE (fndecl))
{
push_function_context ();
output_inline_function (fndecl);
pop_function_context ();
}
}
/* Return to the enclosing function. */
pop_function_context ();
}
/* Check the declarations given in a for-loop for satisfying the C99

27
gcc/c-semantics.c
View File

@ -561,11 +561,12 @@ void
genrtl_scope_stmt (t)
tree t;
{
tree block = SCOPE_STMT_BLOCK (t);
if (!SCOPE_NO_CLEANUPS_P (t))
{
if (SCOPE_BEGIN_P (t))
expand_start_bindings_and_block (2 * SCOPE_NULLIFIED_P (t),
SCOPE_STMT_BLOCK (t));
expand_start_bindings_and_block (2 * SCOPE_NULLIFIED_P (t), block);
else if (SCOPE_END_P (t))
expand_end_bindings (NULL_TREE, !SCOPE_NULLIFIED_P (t), 0);
}
@ -575,7 +576,27 @@ genrtl_scope_stmt (t)
(SCOPE_BEGIN_P (t)
? NOTE_INSN_BLOCK_BEG
: NOTE_INSN_BLOCK_END));
NOTE_BLOCK (note) = SCOPE_STMT_BLOCK (t);
NOTE_BLOCK (note) = block;
}
/* If we're at the end of a scope that contains inlined nested
functions, we have to decide whether or not to write them out. */
if (block && SCOPE_END_P (t))
{
tree fn;
for (fn = BLOCK_VARS (block); fn; fn = TREE_CHAIN (fn))
{
if (TREE_CODE (fn) == FUNCTION_DECL
&& DECL_CONTEXT (fn) == current_function_decl
&& !TREE_ASM_WRITTEN (fn)
&& TREE_ADDRESSABLE (fn))
{
push_function_context ();
output_inline_function (fn);
pop_function_context ();
}
}
}
}

11
gcc/testsuite/gcc.c-torture/execute/20010605-1.c Normal file
View File

@ -0,0 +1,11 @@
int main ()
{
int v = 42;
static inline int fff (int x)
{
return x*10;
}
return (fff (v) != 420);
}