From: Jason Merrill <jason@redhat.com>
Date: Tue, 17 Nov 2015 21:49:23 +0000 (-0500)
Subject: re PR bootstrap/68346 (Bootstrap failure on i686-linux)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0465369f413dde52e82eb8ecebca9522703d27da;p=gcc.git

re PR bootstrap/68346 (Bootstrap failure on i686-linux)

	PR bootstrap/68346

	* typeck.c (build_static_cast_1): Force a NOP when converting to
	the same type.

From-SVN: r230508
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b46362dfe7d..267bd192335 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2015-11-17  Jason Merrill  <jason@redhat.com>
 
+	PR bootstrap/68346
+	* typeck.c (build_static_cast_1): Force a NOP when converting to
+	the same type.
+
 	* cp-tree.h (LITERAL_ZERO_P): Remove.
 	* parser.c (cp_parser_postfix_expression, literal_zeros)
 	(cp_parser_parenthesized_expression_list): Don't mess with it.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index b7395cf072a..5f7d4bb994a 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -6668,7 +6668,13 @@ build_static_cast_1 (tree type, tree expr, bool c_cast_p,
 	 If T is a reference type, the result is an lvalue; otherwise,
 	 the result is an rvalue.  */
       if (TREE_CODE (type) != REFERENCE_TYPE)
-	result = rvalue (result);
+	{
+	  result = rvalue (result);
+
+	  if (result == expr && SCALAR_TYPE_P (type))
+	    /* Leave some record of the cast.  */
+	    result = build_nop (type, expr);
+	}
       return result;
     }