4.4.2-23
This commit is contained in:
Jakub Jelinek
parent
2d0a12b85e
commit
ddf3933cbe
|
|
@ -1,2 +1,2 @@
|
|||
fastjar-0.97.tar.gz
|
||||
gcc-4.4.2-20091222.tar.bz2
|
||||
gcc-4.4.2-20100109.tar.bz2
|
||||
|
|
|
|||
38
gcc.spec
38
gcc.spec
|
|
@ -1,9 +1,9 @@
|
|||
%global DATE 20091222
|
||||
%global SVNREV 155395
|
||||
%global DATE 20100109
|
||||
%global SVNREV 155777
|
||||
%global gcc_version 4.4.2
|
||||
# Note, gcc_release must be integer, if you want to add suffixes to
|
||||
# %{release}, append them after %{gcc_release} on Release: line.
|
||||
%global gcc_release 20
|
||||
%global gcc_release 23
|
||||
%global _unpackaged_files_terminate_build 0
|
||||
%global multilib_64_archs sparc64 ppc64 s390x x86_64
|
||||
%if 0%{?fedora} >= 13
|
||||
|
|
@ -165,6 +165,8 @@ Patch16: gcc44-unwind-debug-hook.patch
|
|||
Patch17: gcc44-pr38757.patch
|
||||
Patch18: gcc44-libstdc++-docs.patch
|
||||
Patch19: gcc44-ppc64-aixdesc.patch
|
||||
Patch20: gcc44-max-vartrack-size.patch
|
||||
Patch21: gcc44-pr42657.patch
|
||||
|
||||
Patch1000: fastjar-0.97-segfault.patch
|
||||
Patch1001: fastjar-0.97-len1.patch
|
||||
|
|
@ -473,6 +475,8 @@ which are required to compile with the GNAT.
|
|||
%patch18 -p0 -b .libstdc++-docs~
|
||||
%endif
|
||||
%patch19 -p0 -b .ppc64-aixdesc~
|
||||
%patch20 -p0 -b .max-vartrack-size~
|
||||
%patch21 -p0 -b .pr42657~
|
||||
|
||||
# This testcase doesn't compile.
|
||||
rm libjava/testsuite/libjava.lang/PR35020*
|
||||
|
|
@ -1862,6 +1866,32 @@ fi
|
|||
%doc rpm.doc/changelogs/libmudflap/ChangeLog*
|
||||
|
||||
%changelog
|
||||
* Sat Jan 9 2010 Jakub Jelinek <jakub@redhat.com> 4.4.2-23
|
||||
- update from gcc-4_4-branch
|
||||
- PRs target/42511, target/42542, target/42564
|
||||
- VTA backports
|
||||
- PRs debug/42630, debug/42631
|
||||
- improve construction of ppc64 constants between 0x80000000 and 0xffffffff
|
||||
- fix inliner and var-tracking not to drop location info needlessly in certain
|
||||
cases (#552376, PR debug/42657)
|
||||
|
||||
* Wed Jan 6 2010 Jakub Jelinek <jakub@redhat.com> 4.4.2-22
|
||||
- add --param max-vartrack-size=NNNN parameter, give up on
|
||||
-fvar-tracking-assignments if var-tracking hash tables are over that limit
|
||||
- fix VTA bugs in the vectorizer (PRs debug/42604, debug/42395)
|
||||
- fix VTA bug with noreturn calls (PR middle-end/42363)
|
||||
|
||||
* Tue Jan 5 2010 Jakub Jelinek <jakub@redhat.com> 4.4.2-21
|
||||
- update from gcc-4_4-branch
|
||||
- PRs c++/42331, middle-end/41344, middle-end/42099, other/42611,
|
||||
rtl-optimization/42475, target/40134, target/42448, target/42503,
|
||||
target/42549, tree-optimization/41956, tree-optimization/42231,
|
||||
tree-optimization/42337, tree-optimization/42614
|
||||
- fix -m*=native with several sources on the command line (PR driver/42442)
|
||||
- avoid code size differences from traversing decl hash tables hashed by uid
|
||||
if uid gap sizes differ
|
||||
- fix .debug_ranges with -ffunction-sections (PR debug/42454)
|
||||
|
||||
* Tue Dec 22 2009 Jakub Jelinek <jakub@redhat.com> 4.4.2-20
|
||||
- fix MEM_SIZE of reload created stack slots (#548825,
|
||||
PR rtl-optimization/42429)
|
||||
|
|
@ -2040,7 +2070,7 @@ fi
|
|||
- update from gcc-4_4-branch
|
||||
- PRs c++/39863, c++/41038
|
||||
- avoid redundant DW_AT_const_value when abstract origin already has one
|
||||
(#527430)
|
||||
(#527430)
|
||||
- another VTA debug stmt renaming bugfix (#521991)
|
||||
|
||||
* Mon Oct 5 2009 Jakub Jelinek <jakub@redhat.com> 4.4.1-19
|
||||
|
|
|
|||
|
|
@ -0,0 +1,230 @@
|
|||
2010-01-05 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
* params.def (PARAM_MAX_VARTRACK_SIZE): New.
|
||||
* doc/invoke.texi: Document it.
|
||||
* var-tracking.c: Include toplev.h and params.h.
|
||||
(vt_find_locations): Return bool indicating success. Compute
|
||||
hash sizes unconditionally. Check new parameter, report.
|
||||
(variable_tracking_main_1): Check vt_find_locations results and
|
||||
retry. Renamed from...
|
||||
(variable_tracking_main): ... this. New wrapper to preserve
|
||||
flag_var_tracking_assignments.
|
||||
* Makefile.in (var-tracking.o): Adjust dependencies.
|
||||
|
||||
--- gcc/doc/invoke.texi.jj 2009-12-09 00:36:51.000000000 +0100
|
||||
+++ gcc/doc/invoke.texi 2010-01-05 10:23:34.000000000 +0100
|
||||
@@ -7937,6 +7937,15 @@ with more basic blocks than this paramet
|
||||
motion optimization performed on them. The default value of the
|
||||
parameter is 1000 for -O1 and 10000 for -O2 and above.
|
||||
|
||||
+@item max-vartrack-size
|
||||
+Sets a maximum number of hash table slots to use during variable
|
||||
+tracking dataflow analysis of any function. If this limit is exceeded
|
||||
+with variable tracking at assignments enabled, analysis for that
|
||||
+function is retried without it, after removing all debug insns from
|
||||
+the function. If the limit is exceeded even without debug insns, var
|
||||
+tracking analysis is completely disabled for the function. Setting
|
||||
+the parameter to zero makes it unlimited.
|
||||
+
|
||||
@item min-nondebug-insn-uid
|
||||
Use uids starting at this parameter for nondebug insns. The range below
|
||||
the parameter is reserved exclusively for debug insns created by
|
||||
--- gcc/params.def.jj 2009-09-16 21:35:17.000000000 +0200
|
||||
+++ gcc/params.def 2010-01-06 10:18:04.000000000 +0100
|
||||
@@ -771,6 +771,13 @@ DEFPARAM (PARAM_LOOP_INVARIANT_MAX_BBS_I
|
||||
"max basic blocks number in loop for loop invariant motion",
|
||||
10000, 0, 0)
|
||||
|
||||
+/* Set maximum hash table size for var tracking. */
|
||||
+
|
||||
+DEFPARAM (PARAM_MAX_VARTRACK_SIZE,
|
||||
+ "max-vartrack-size",
|
||||
+ "Max. size of var tracking hash tables",
|
||||
+ 5000000, 0, 0)
|
||||
+
|
||||
/* Set minimum insn uid for non-debug insns. */
|
||||
|
||||
DEFPARAM (PARAM_MIN_NONDEBUG_INSN_UID,
|
||||
--- gcc/var-tracking.c.jj 2009-12-17 20:42:04.000000000 +0100
|
||||
+++ gcc/var-tracking.c 2010-01-06 10:17:28.000000000 +0100
|
||||
@@ -108,6 +108,8 @@
|
||||
#include "tree-pass.h"
|
||||
#include "cselib.h"
|
||||
#include "target.h"
|
||||
+#include "toplev.h"
|
||||
+#include "params.h"
|
||||
|
||||
/* Type of micro operation. */
|
||||
enum micro_operation_type
|
||||
@@ -443,7 +445,7 @@ static int add_uses (rtx *, void *);
|
||||
static void add_uses_1 (rtx *, void *);
|
||||
static void add_stores (rtx, const_rtx, void *);
|
||||
static bool compute_bb_dataflow (basic_block);
|
||||
-static void vt_find_locations (void);
|
||||
+static bool vt_find_locations (void);
|
||||
|
||||
static void dump_attrs_list (attrs);
|
||||
static int dump_variable_slot (void **, void *);
|
||||
@@ -5454,7 +5456,7 @@ compute_bb_dataflow (basic_block bb)
|
||||
|
||||
/* Find the locations of variables in the whole function. */
|
||||
|
||||
-static void
|
||||
+static bool
|
||||
vt_find_locations (void)
|
||||
{
|
||||
fibheap_t worklist, pending, fibheap_swap;
|
||||
@@ -5465,6 +5467,8 @@ vt_find_locations (void)
|
||||
int *rc_order;
|
||||
int i;
|
||||
int htabsz = 0;
|
||||
+ int htabmax = PARAM_VALUE (PARAM_MAX_VARTRACK_SIZE);
|
||||
+ bool success = true;
|
||||
|
||||
/* Compute reverse completion order of depth first search of the CFG
|
||||
so that the data-flow runs faster. */
|
||||
@@ -5486,7 +5490,7 @@ vt_find_locations (void)
|
||||
fibheap_insert (pending, bb_order[bb->index], bb);
|
||||
sbitmap_ones (in_pending);
|
||||
|
||||
- while (!fibheap_empty (pending))
|
||||
+ while (success && !fibheap_empty (pending))
|
||||
{
|
||||
fibheap_swap = pending;
|
||||
pending = worklist;
|
||||
@@ -5509,11 +5513,11 @@ vt_find_locations (void)
|
||||
|
||||
SET_BIT (visited, bb->index);
|
||||
|
||||
- if (dump_file && VTI (bb)->in.vars)
|
||||
+ if (VTI (bb)->in.vars)
|
||||
{
|
||||
htabsz
|
||||
- -= htab_size (shared_hash_htab (VTI (bb)->in.vars))
|
||||
- + htab_size (shared_hash_htab (VTI (bb)->out.vars));
|
||||
+ -= (htab_size (shared_hash_htab (VTI (bb)->in.vars))
|
||||
+ + htab_size (shared_hash_htab (VTI (bb)->out.vars)));
|
||||
oldinsz
|
||||
= htab_elements (shared_hash_htab (VTI (bb)->in.vars));
|
||||
oldoutsz
|
||||
@@ -5577,9 +5581,20 @@ vt_find_locations (void)
|
||||
}
|
||||
|
||||
changed = compute_bb_dataflow (bb);
|
||||
- if (dump_file)
|
||||
- htabsz += htab_size (shared_hash_htab (VTI (bb)->in.vars))
|
||||
- + htab_size (shared_hash_htab (VTI (bb)->out.vars));
|
||||
+ htabsz += (htab_size (shared_hash_htab (VTI (bb)->in.vars))
|
||||
+ + htab_size (shared_hash_htab (VTI (bb)->out.vars)));
|
||||
+
|
||||
+ if (htabmax && htabsz > htabmax)
|
||||
+ {
|
||||
+ if (MAY_HAVE_DEBUG_INSNS)
|
||||
+ inform (DECL_SOURCE_LOCATION (cfun->decl),
|
||||
+ "variable tracking size limit exceeded with debug insns, retrying without");
|
||||
+ else
|
||||
+ inform (DECL_SOURCE_LOCATION (cfun->decl),
|
||||
+ "variable tracking size limit exceeded");
|
||||
+ success = false;
|
||||
+ break;
|
||||
+ }
|
||||
|
||||
if (changed)
|
||||
{
|
||||
@@ -5630,7 +5645,7 @@ vt_find_locations (void)
|
||||
}
|
||||
}
|
||||
|
||||
- if (MAY_HAVE_DEBUG_INSNS)
|
||||
+ if (success && MAY_HAVE_DEBUG_INSNS)
|
||||
FOR_EACH_BB (bb)
|
||||
gcc_assert (VTI (bb)->flooded);
|
||||
|
||||
@@ -5640,6 +5655,8 @@ vt_find_locations (void)
|
||||
sbitmap_free (visited);
|
||||
sbitmap_free (in_worklist);
|
||||
sbitmap_free (in_pending);
|
||||
+
|
||||
+ return success;
|
||||
}
|
||||
|
||||
/* Print the content of the LIST to dump file. */
|
||||
@@ -7542,9 +7558,11 @@ vt_finalize (void)
|
||||
|
||||
/* The entry point to variable tracking pass. */
|
||||
|
||||
-unsigned int
|
||||
-variable_tracking_main (void)
|
||||
+static inline unsigned int
|
||||
+variable_tracking_main_1 (void)
|
||||
{
|
||||
+ bool success;
|
||||
+
|
||||
if (flag_var_tracking_assignments < 0)
|
||||
{
|
||||
delete_debug_insns ();
|
||||
@@ -7569,7 +7587,31 @@ variable_tracking_main (void)
|
||||
}
|
||||
}
|
||||
|
||||
- vt_find_locations ();
|
||||
+ success = vt_find_locations ();
|
||||
+
|
||||
+ if (!success && flag_var_tracking_assignments > 0)
|
||||
+ {
|
||||
+ vt_finalize ();
|
||||
+
|
||||
+ delete_debug_insns ();
|
||||
+
|
||||
+ /* This is later restored by our caller. */
|
||||
+ flag_var_tracking_assignments = 0;
|
||||
+
|
||||
+ vt_initialize ();
|
||||
+
|
||||
+ if (!frame_pointer_needed && !vt_stack_adjustments ())
|
||||
+ gcc_unreachable ();
|
||||
+
|
||||
+ success = vt_find_locations ();
|
||||
+ }
|
||||
+
|
||||
+ if (!success)
|
||||
+ {
|
||||
+ vt_finalize ();
|
||||
+ vt_debug_insns_local (false);
|
||||
+ return 0;
|
||||
+ }
|
||||
|
||||
if (dump_file && (dump_flags & TDF_DETAILS))
|
||||
{
|
||||
@@ -7583,6 +7625,19 @@ variable_tracking_main (void)
|
||||
vt_debug_insns_local (false);
|
||||
return 0;
|
||||
}
|
||||
+
|
||||
+unsigned int
|
||||
+variable_tracking_main (void)
|
||||
+{
|
||||
+ unsigned int ret;
|
||||
+ int save = flag_var_tracking_assignments;
|
||||
+
|
||||
+ ret = variable_tracking_main_1 ();
|
||||
+
|
||||
+ flag_var_tracking_assignments = save;
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
|
||||
static bool
|
||||
gate_handle_var_tracking (void)
|
||||
--- gcc/Makefile.in.jj 2010-01-04 10:07:40.000000000 +0100
|
||||
+++ gcc/Makefile.in 2010-01-05 10:24:39.000000000 +0100
|
||||
@@ -2750,7 +2750,8 @@ regstat.o : regstat.c $(CONFIG_H) $(SYST
|
||||
var-tracking.o : var-tracking.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
|
||||
$(RTL_H) $(TREE_H) hard-reg-set.h insn-config.h reload.h $(FLAGS_H) \
|
||||
$(BASIC_BLOCK_H) output.h sbitmap.h alloc-pool.h $(FIBHEAP_H) $(HASHTAB_H) \
|
||||
- $(REGS_H) $(EXPR_H) $(TIMEVAR_H) tree-pass.h cselib.h $(TARGET_H)
|
||||
+ $(REGS_H) $(EXPR_H) $(TIMEVAR_H) tree-pass.h cselib.h $(TARGET_H) \
|
||||
+ $(TOPLEV_H) $(PARAMS_H)
|
||||
profile.o : profile.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
|
||||
$(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) $(FUNCTION_H) \
|
||||
$(TOPLEV_H) $(COVERAGE_H) $(TREE_FLOW_H) value-prof.h cfghooks.h \
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
2010-01-09 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
PR debug/42657
|
||||
* var-tracking.c (var_reg_delete): Don't delete the association
|
||||
between REGs and values or one-part variables if the register
|
||||
isn't clobbered.
|
||||
|
||||
2010-01-08 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR debug/42657
|
||||
* tree-inline.c (copy_debug_stmt): Don't reset debug stmt just
|
||||
because its first operand is a non-localized variable.
|
||||
|
||||
--- gcc/tree-inline.c.jj 2010-01-08 10:21:30.000000000 +0100
|
||||
+++ gcc/tree-inline.c 2010-01-08 10:19:49.000000000 +0100
|
||||
@@ -2043,6 +2043,12 @@ copy_debug_stmt (gimple stmt, copy_body_
|
||||
gcc_assert (TREE_CODE (*n) == VAR_DECL);
|
||||
t = *n;
|
||||
}
|
||||
+ else if (TREE_CODE (t) == VAR_DECL
|
||||
+ && !TREE_STATIC (t)
|
||||
+ && gimple_in_ssa_p (cfun)
|
||||
+ && !pointer_map_contains (id->decl_map, t)
|
||||
+ && !var_ann (t))
|
||||
+ /* T is a non-localized variable. */;
|
||||
else
|
||||
walk_tree (&t, remap_gimple_op_r, &wi, NULL);
|
||||
|
||||
--- gcc/var-tracking.c.orig 2010-01-09 07:00:12.000000000 -0200
|
||||
+++ gcc/var-tracking.c 2010-01-09 07:00:14.000000000 -0200
|
||||
@@ -1401,14 +1401,15 @@ var_reg_delete_and_set (dataflow_set *se
|
||||
var_reg_set (set, loc, initialized, set_src);
|
||||
}
|
||||
|
||||
-/* Delete current content of register LOC in dataflow set SET. If
|
||||
- CLOBBER is true, also delete any other live copies of the same
|
||||
- variable part. */
|
||||
+/* Delete the association of register LOC in dataflow set SET with any
|
||||
+ variables that aren't onepart. If CLOBBER is true, also delete any
|
||||
+ other live copies of the same variable part, and delete the
|
||||
+ association with onepart dvs too. */
|
||||
|
||||
static void
|
||||
var_reg_delete (dataflow_set *set, rtx loc, bool clobber)
|
||||
{
|
||||
- attrs *reg = &set->regs[REGNO (loc)];
|
||||
+ attrs *nextp = &set->regs[REGNO (loc)];
|
||||
attrs node, next;
|
||||
|
||||
if (clobber)
|
||||
@@ -1421,13 +1422,18 @@ var_reg_delete (dataflow_set *set, rtx l
|
||||
clobber_variable_part (set, NULL, dv_from_decl (decl), offset, NULL);
|
||||
}
|
||||
|
||||
- for (node = *reg; node; node = next)
|
||||
+ for (node = *nextp; node; node = next)
|
||||
{
|
||||
next = node->next;
|
||||
- delete_variable_part (set, node->loc, node->dv, node->offset);
|
||||
- pool_free (attrs_pool, node);
|
||||
+ if (clobber || !dv_onepart_p (node->dv))
|
||||
+ {
|
||||
+ delete_variable_part (set, node->loc, node->dv, node->offset);
|
||||
+ pool_free (attrs_pool, node);
|
||||
+ *nextp = next;
|
||||
+ }
|
||||
+ else
|
||||
+ nextp = &node->next;
|
||||
}
|
||||
- *reg = NULL;
|
||||
}
|
||||
|
||||
/* Delete content of register with number REGNO in dataflow set SET. */
|
||||
Loading…
Reference in New Issue