backport: re PR preprocessor/83722 (the ICE dumper doesn't comment-out some error...

	Backported from mainline
	2018-01-09  Jakub Jelinek  <jakub@redhat.com>

	PR preprocessor/83722
	* gcc.c (try_generate_repro): Pass
	&temp_stderr_files[RETRY_ICE_ATTEMPTS - 1] rather than
	&temp_stdout_files[RETRY_ICE_ATTEMPTS - 1] as last argument to
	do_report_bug.

From-SVN: r262053

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 16e5b1a06f170702ee5a204a587f4c4e051bd2ca..80fcd2997a3806f5281d29917199ed7eebdc8e49 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,14 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-01-09  Jakub Jelinek  <jakub@redhat.com>
+
+       PR preprocessor/83722
+       * gcc.c (try_generate_repro): Pass
+       &temp_stderr_files[RETRY_ICE_ATTEMPTS - 1] rather than
+       &temp_stdout_files[RETRY_ICE_ATTEMPTS - 1] as last argument to
+       do_report_bug.
+
        2018-01-05  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/83605

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 85ea19bd3a092d656beb7b36e4ec2deb29638db9..d47108852e257c854c2f93ecbd2f1439e488829e 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -6920,8 +6920,8 @@ try_generate_repro (const char **argv)
 
     /* In final attempt we append compiler options and preprocesssed code to last
        generated .out file with configuration and backtrace.  */
-    char **output = &temp_stdout_files[RETRY_ICE_ATTEMPTS - 1];
-    do_report_bug (new_argv, nargs, stderr_commented, output);
+    char **err = &temp_stderr_files[RETRY_ICE_ATTEMPTS - 1];
+    do_report_bug (new_argv, nargs, stderr_commented, err);
   }
 
 out: