diff options
| author | Jason Merrill <jason@redhat.com> | 2003-01-03 15:04:38 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2003-01-03 15:04:38 -0500 |
| commit | 4e8dca1c3ab060bd7bc1b70d4c62d6933e7bc479 (patch) | |
| tree | 3080ff7fbc3a73e39df1773fb9eda1ec24ad5334 /gcc/integrate.c | |
| parent | 9aad8f83a8c33f5af53fa712234677766716659d (diff) | |
| download | gcc-4e8dca1c3ab060bd7bc1b70d4c62d6933e7bc479.zip gcc-4e8dca1c3ab060bd7bc1b70d4c62d6933e7bc479.tar.gz gcc-4e8dca1c3ab060bd7bc1b70d4c62d6933e7bc479.tar.bz2 | |
fold-const.c (fold): Avoid NOP_EXPRs better.
* fold-const.c (fold) [COND_EXPR]: Avoid NOP_EXPRs better.
* integrate.c (copy_decl_for_inlining): Don't clear the rtl for
static/external decls.
cp/
* call.c (build_conditional_expr): Stabilize lvalues properly.
* cvt.c (ocp_convert): Don't build NOP_EXPRs of class type.
* tree.c (lvalue_p_1): Don't allow sloppy NOP_EXPRs as lvalues.
Don't allow CALL_EXPR or VA_ARG_EXPR, either.
* call.c (convert_like_real): Call decl_constant_value for an
IDENTITY_CONV even if there are no more conversions.
* cvt.c (build_up_reference): Don't push unnamed temps.
* decl2.c (do_namespace_alias): Namespace aliases are DECL_EXTERNAL.
* dump.c (cp_dump_tree): Don't try to dump class-specific fields
for a backend struct.
* except.c (wrap_cleanups_r, build_throw): Make
MUST_NOT_THROW_EXPRs void.
* init.c (expand_default_init): Update to handle MUST_NOT_THROW_EXPR.
* init.c (build_vec_delete_1): Pre-evaluate the base address.
* init.c (get_temp_regvar): Simplify logic.
* tree.c (cp_copy_res_decl_for_inlining): Only do debug tweaks if
our replacement is a decl.
From-SVN: r60851
Diffstat (limited to 'gcc/integrate.c')
| -rw-r--r-- | gcc/integrate.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/integrate.c b/gcc/integrate.c index 7e1f29f..8feb845 100644 --- a/gcc/integrate.c +++ b/gcc/integrate.c @@ -394,7 +394,8 @@ copy_decl_for_inlining (decl, from_fn, to_fn) DECL_ABSTRACT_ORIGIN (copy) = DECL_ORIGIN (decl); /* The new variable/label has no RTL, yet. */ - SET_DECL_RTL (copy, NULL_RTX); + if (!TREE_STATIC (copy) && !DECL_EXTERNAL (copy)) + SET_DECL_RTL (copy, NULL_RTX); /* These args would always appear unused, if not for this. */ TREE_USED (copy) = 1; @@ -405,10 +406,10 @@ copy_decl_for_inlining (decl, from_fn, to_fn) ; else if (DECL_CONTEXT (decl) != from_fn) /* Things that weren't in the scope of the function we're inlining - from aren't in the scope we're inlining too, either. */ + from aren't in the scope we're inlining to, either. */ ; else if (TREE_STATIC (decl)) - /* Function-scoped static variables should say in the original + /* Function-scoped static variables should stay in the original function. */ ; else |