diff options
author | Rong Xu <xur@google.com> | 2014-07-21 16:47:22 -0700 |
---|---|---|
committer | Rong Xu <xur@google.com> | 2014-07-29 15:31:03 -0700 |
commit | 38a8aecfb882072900434499696b5c32a2274515 (patch) | |
tree | 2aac97f0ae24b03cd98c1a06e989c031c173f889 /gcc-4.9/gcc/gimple-pretty-print.c | |
parent | c231900e5dcc14d8296bd9f62b45997a49d4d5e7 (diff) | |
download | toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.gz toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.bz2 toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.zip |
[4.9] Switch gcc-4.9 to use google/gcc-4_9 branch.
This source drop uses svn version r212828 of google/gcc-4.9 branch.
We also cherry-picked r213062, r213063 and r213064 to fix windows
build issues.
All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9.
The following prior commits has not been merged to google branch yet.
(They are included in this commit).
e7af147f979e657fe2df00808e5b4319b0e088c6,
baf87df3cb2683649ba7e9872362a7e721117c23, and
c231900e5dcc14d8296bd9f62b45997a49d4d5e7.
Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b
Diffstat (limited to 'gcc-4.9/gcc/gimple-pretty-print.c')
-rw-r--r-- | gcc-4.9/gcc/gimple-pretty-print.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/gcc-4.9/gcc/gimple-pretty-print.c b/gcc-4.9/gcc/gimple-pretty-print.c index 741cd9299..3d7fbaeeb 100644 --- a/gcc-4.9/gcc/gimple-pretty-print.c +++ b/gcc-4.9/gcc/gimple-pretty-print.c @@ -437,6 +437,16 @@ dump_ternary_rhs (pretty_printer *buffer, gimple gs, int spc, int flags) dump_generic_node (buffer, gimple_assign_rhs3 (gs), spc, flags, false); pp_greater (buffer); break; + + case SAD_EXPR: + pp_string (buffer, "SAD_EXPR <"); + dump_generic_node (buffer, gimple_assign_rhs1 (gs), spc, flags, false); + pp_string (buffer, ", "); + dump_generic_node (buffer, gimple_assign_rhs2 (gs), spc, flags, false); + pp_string (buffer, ", "); + dump_generic_node (buffer, gimple_assign_rhs3 (gs), spc, flags, false); + pp_greater (buffer); + break; case VEC_PERM_EXPR: pp_string (buffer, "VEC_PERM_EXPR <"); @@ -2057,7 +2067,9 @@ pp_gimple_stmt_1 (pretty_printer *buffer, gimple gs, int spc, int flags) if ((flags & TDF_LINENO) && gimple_has_location (gs)) { - expanded_location xloc = expand_location (gimple_location (gs)); + location_t loc = gimple_location (gs); + expanded_location xloc = expand_location (loc); + int discriminator = get_discriminator_from_locus (loc); pp_left_bracket (buffer); if (xloc.file) { @@ -2067,6 +2079,11 @@ pp_gimple_stmt_1 (pretty_printer *buffer, gimple gs, int spc, int flags) pp_decimal_int (buffer, xloc.line); pp_colon (buffer); pp_decimal_int (buffer, xloc.column); + if (discriminator) + { + pp_string (buffer, " discrim "); + pp_decimal_int (buffer, discriminator); + } pp_string (buffer, "] "); } @@ -2268,8 +2285,6 @@ dump_gimple_bb_header (FILE *outf, basic_block bb, int indent, int flags) indent, "", get_lineno (gsi_stmt (gsi))); break; } - if (bb->discriminator) - fprintf (outf, ", discriminator %i", bb->discriminator); fputc ('\n', outf); } } |