From 49c8958b5848f2d779b3777c43d7ec02fc62c466 Mon Sep 17 00:00:00 2001
From: Shujing Zhao <pearly.zhao@oracle.com>
Date: Tue, 8 Jun 2010 04:07:55 +0000
Subject: [PATCH] fold-const.c (fold_comparison): Remove redundant parenthesis.

2010-06-08  Shujing Zhao  <pearly.zhao@oracle.com>

        * fold-const.c (fold_comparison): Remove redundant parenthesis.
        * tree-inline.c (expand_call_inline): Pass translated return value of
        cgraph_inline_failed_string to diagnostic function.

From-SVN: r160419
---
 gcc/ChangeLog     | 6 ++++++
 gcc/fold-const.c  | 4 ++--
 gcc/tree-inline.c | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af5337296c24..1711151e2f67 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-08  Shujing Zhao  <pearly.zhao@oracle.com>
+	
+	* fold-const.c (fold_comparison): Remove redundant parenthesis.
+	* tree-inline.c (expand_call_inline): Pass translated return value of
+	cgraph_inline_failed_string to diagnostic function.
+
 2010-06-08  Andrew Pinski <pinskia@gmail.com>
 	    Shujing Zhao  <pearly.zhao@oracle.com>
 
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index b6e8ed687833..9f2c250e2357 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -8651,9 +8651,9 @@ fold_comparison (location_t loc, enum tree_code code, tree type,
 	  && (TREE_CODE (lhs) != INTEGER_CST
 	      || !TREE_OVERFLOW (lhs)))
 	{
-	  fold_overflow_warning (("assuming signed overflow does not occur "
+	  fold_overflow_warning ("assuming signed overflow does not occur "
 				  "when changing X +- C1 cmp C2 to "
-				  "X cmp C1 +- C2"),
+				  "X cmp C1 +- C2",
 				 WARN_STRICT_OVERFLOW_COMPARISON);
 	  return fold_build2_loc (loc, code, type, variable, lhs);
 	}
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 696cb00fbfd3..72bef2189da8 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -3774,7 +3774,7 @@ expand_call_inline (basic_block bb, gimple stmt, copy_body_data *id)
 	  && cgraph_global_info_ready)
 	{
 	  sorry ("inlining failed in call to %q+F: %s", fn,
-		 cgraph_inline_failed_string (reason));
+		 _(cgraph_inline_failed_string (reason)));
 	  sorry ("called from here");
 	}
       else if (warn_inline && DECL_DECLARED_INLINE_P (fn)
@@ -3785,7 +3785,7 @@ expand_call_inline (basic_block bb, gimple stmt, copy_body_data *id)
 	       && cgraph_global_info_ready)
 	{
 	  warning (OPT_Winline, "inlining failed in call to %q+F: %s",
-		   fn, cgraph_inline_failed_string (reason));
+		   fn, _(cgraph_inline_failed_string (reason)));
 	  warning (OPT_Winline, "called from here");
 	}
       goto egress;
-- 
GitLab