diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2001-12-04 10:34:40 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2001-12-04 10:34:40 +0000 |
| commit | 23700f650874c9406df42967f0ede7c3f203dc82 (patch) | |
| tree | 5f796d4a540cf14b9ff9cbc2a69e91812776ca98 /gcc/tree-inline.c | |
| parent | 961eacce43e97fa61b625d38480a89927faa64d8 (diff) | |
| download | gcc-23700f650874c9406df42967f0ede7c3f203dc82.zip gcc-23700f650874c9406df42967f0ede7c3f203dc82.tar.gz gcc-23700f650874c9406df42967f0ede7c3f203dc82.tar.bz2 | |
c-decl.c (duplicate_decls): Revert rth's patch.
* c-decl.c (duplicate_decls): Revert rth's patch. If newdecl
is in a different binding level, get its abstract origin to be
olddecl.
* tree-inline.c (expand_call_inline): Move DECL_INITIAL sanity
check earlier.
* tree.c (get_callee_fndecl): Follow DECL_ABSTRACT_ORIGIN if
DECL_INITIAL is NULL.
From-SVN: r47610
Diffstat (limited to 'gcc/tree-inline.c')
| -rw-r--r-- | gcc/tree-inline.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 3adbf34..f82c8c9 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -864,6 +864,10 @@ expand_call_inline (tp, walk_subtrees, data) id->ret_label = build_decl (LABEL_DECL, NULL_TREE, NULL_TREE); DECL_CONTEXT (id->ret_label) = VARRAY_TREE (id->fns, 0); + if (! DECL_INITIAL (fn) + || TREE_CODE (DECL_INITIAL (fn)) != BLOCK) + abort (); + /* Create a block to put the parameters in. We have to do this after the parameters have been remapped because remapping parameters is different from remapping ordinary variables. */ @@ -894,9 +898,6 @@ expand_call_inline (tp, walk_subtrees, data) /* Close the block for the parameters. */ scope_stmt = build_stmt (SCOPE_STMT, DECL_INITIAL (fn)); SCOPE_NO_CLEANUPS_P (scope_stmt) = 1; - if (! DECL_INITIAL (fn) - || TREE_CODE (DECL_INITIAL (fn)) != BLOCK) - abort (); remap_block (scope_stmt, NULL_TREE, id); STMT_EXPR_STMT (expr) = chainon (STMT_EXPR_STMT (expr), scope_stmt); |