diff options
| author | Sharad Singhai <singhai@google.com> | 2012-03-01 00:56:21 +0000 |
|---|---|---|
| committer | Sharad Singhai <singhai@google.com> | 2012-03-01 00:56:21 +0000 |
| commit | dc4b83a42cdc0a379dc838c2f1f859581df83aba (patch) | |
| tree | 032242c36a5bc5325691e8e4d83301aaf3e2b049 /gcc/sched-deps.c | |
| parent | 3b3780b027308675b67f180079eee83fc1b73580 (diff) | |
Merged revisions 183499-183500,183502-183503,183507,183509-183510,183512-183516,183518-183519,183521-183522,183524,183527-183542,183547,183549,183552,183555-183557,183559-183561,183566-183567,183570,183577,183579-183585,183588,183591,183593,183598-183599,183601-183611,183613-183616,183620-183622,183624-183625,183627-183630,183632-183635,183637-183638,183641-183644,183648,183650-183652,183655,183660-183661,183663,183667-183670,183674-183688,183692-183694,183696-183708,183710-183711,183713-183715,183717-183726,183728,183730,183732-183733,183737,183739,183741,183743-183745,183749,183751-183759,183763,183765-183766,183768-183771,183773-183775,183782,183787-183788,183791-183794,183796,183798,183800,183802,183806-183808,183810-183812,183814-183816,183821,183825-183826,183829-183830,183832-183833,183836,183840-183841,183843,183846-183849,183851-183853,183859-183860,183862,183865,183867,183869-183870,183873,183875,183878,183887,183889,183891,183894-183895,183900,183902,183904-183918,183920,183925-183926,183928,183932-183934,183936-183937,183940-183945,183951,183953-183956,183962,183964,183966,183968,183970-183972,183974,183976-183985,183987,183991,183993-183995,183997-184001,184003-184007,184009-184011,184015-184017,184021-184028,184032-184037,184041-184043,184045,184065,184075,184079-184080,184083,184086,184088-184089,184092,184096-184100,184102-184103,184107-184108,184110-184113,184115-184117,184121-184124,184126-184130,184134-184145,184150-184152,184155-184161,184165,184167-184169,184171,184174,184177,184180-184181,184185,184187-184188,184192-184193,184196,184198-184203,184210-184212,184214,184217-184224,184227,184229,184232-184234,184236-184238,184245-184246,184250-184255,184257-184259,184264-184265,184269,184272,184274,184276-184277,184279-184282,184284,184286-184287,184289,184291,184293,184297-184303,184305-184306,184310,184313-184314,184316-184320,184322,184327-184343,184345,184347-184353,184355-184357,184362-184365,184367,184372-184373,184377,184379-184381,184385,184388,184390-184394,184396,184398-184406,184409,184414,184416-184417,184421-184422,184426,184428-184430,184433-184437,184439-184440,184442,184445-184448,184451,184453,184458,184461-184464,184466-184467,184471-184475,184477-184478,184480-184481,184485,184488,184490,184500-184501,184503,184506-184509,184511,184519,184522,184526-184527,184530-184531,184540,184542-184549,184552,184555,184557-184560,184564,184568-184569,184571-184572,184576,184581-184585,184589-184590,184592-184594,184596-184607,184613-184630,184632-184634,184636,184638-184642,184645,184649,184651-184654,184656-184662,184664-184667 via svnmerge from
svn+ssh://gcc.gnu.org/svn/gcc/trunk
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/integration@184682 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/sched-deps.c')
| -rw-r--r-- | gcc/sched-deps.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c index bf042a49522..33a6996fe4f 100644 --- a/gcc/sched-deps.c +++ b/gcc/sched-deps.c @@ -2,7 +2,7 @@ instructions. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, - 2011 + 2011, 2012 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com) Enhanced by, and currently maintained by, Jim Wilson (wilson@cygnus.com) @@ -521,9 +521,6 @@ sched_get_condition_with_rev_uncached (const_rtx insn, bool *rev) rtx pat = PATTERN (insn); rtx src; - if (pat == 0) - return 0; - if (rev) *rev = false; @@ -1731,7 +1728,8 @@ add_insn_mem_dependence (struct deps_desc *deps, bool read_p, if (sched_deps_info->use_cselib) { mem = shallow_copy_rtx (mem); - XEXP (mem, 0) = cselib_subst_to_values (XEXP (mem, 0), GET_MODE (mem)); + XEXP (mem, 0) = cselib_subst_to_values_from_insn (XEXP (mem, 0), + GET_MODE (mem), insn); } link = alloc_EXPR_LIST (VOIDmode, canon_rtx (mem), *mem_list); *mem_list = link; @@ -2452,7 +2450,9 @@ sched_analyze_1 (struct deps_desc *deps, rtx x, rtx insn) t = shallow_copy_rtx (dest); cselib_lookup_from_insn (XEXP (t, 0), address_mode, 1, GET_MODE (t), insn); - XEXP (t, 0) = cselib_subst_to_values (XEXP (t, 0), GET_MODE (t)); + XEXP (t, 0) + = cselib_subst_to_values_from_insn (XEXP (t, 0), GET_MODE (t), + insn); } t = canon_rtx (t); @@ -2612,7 +2612,9 @@ sched_analyze_2 (struct deps_desc *deps, rtx x, rtx insn) t = shallow_copy_rtx (t); cselib_lookup_from_insn (XEXP (t, 0), address_mode, 1, GET_MODE (t), insn); - XEXP (t, 0) = cselib_subst_to_values (XEXP (t, 0), GET_MODE (t)); + XEXP (t, 0) + = cselib_subst_to_values_from_insn (XEXP (t, 0), GET_MODE (t), + insn); } if (!DEBUG_INSN_P (insn)) |