diff options
| author | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-05-13 06:41:07 +0000 |
|---|---|---|
| committer | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-05-13 06:41:07 +0000 |
| commit | 4ee9c6840ad3fc92a9034343278a1e476ad6872a (patch) | |
| tree | a2568888a519c077427b133de9ece5879a8484a5 /gcc/final.c | |
| parent | ebb338380ab170c91e64d38038e6b5ce930d69a1 (diff) | |
| download | gcc-4ee9c6840ad3fc92a9034343278a1e476ad6872a.tar.gz | |
Merge tree-ssa-20020619-branch into mainline.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81764 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/final.c')
| -rw-r--r-- | gcc/final.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gcc/final.c b/gcc/final.c index 500f4062e2d..96a7a5bfcdb 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -1409,7 +1409,7 @@ profile_function (FILE *file ATTRIBUTE_UNUSED) int sval = current_function_returns_struct; rtx svrtx = targetm.calls.struct_value_rtx (TREE_TYPE (current_function_decl), 1); #if defined(STATIC_CHAIN_INCOMING_REGNUM) || defined(STATIC_CHAIN_REGNUM) - int cxt = current_function_needs_context; + int cxt = cfun->static_chain_decl != NULL; #endif #endif /* ASM_OUTPUT_REG_PUSH */ @@ -1516,11 +1516,9 @@ final (rtx first, FILE *file, int optimize, int prescan) for (insn = first; insn; insn = NEXT_INSN (insn)) if (GET_CODE (insn) == NOTE && NOTE_LINE_NUMBER (insn) > 0) { - if ((RTX_INTEGRATED_P (insn) - && strcmp (NOTE_SOURCE_FILE (insn), main_input_filename) != 0) - || (last != 0 - && NOTE_LINE_NUMBER (insn) == NOTE_LINE_NUMBER (last) - && NOTE_SOURCE_FILE (insn) == NOTE_SOURCE_FILE (last))) + if (last != 0 + && NOTE_LINE_NUMBER (insn) == NOTE_LINE_NUMBER (last) + && NOTE_SOURCE_FILE (insn) == NOTE_SOURCE_FILE (last)) { delete_insn (insn); /* Use delete_note. */ continue; |