From: Nathan Sidwell <nathan@acm.org>
Date: Fri, 12 Jan 2018 18:35:15 +0000 (+0000)
Subject: [C++ PATCH] some reformatting
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b84619155e8f8537140aae55ab53125cafa8bc6c;p=gcc.git

[C++ PATCH] some reformatting

https://gcc.gnu.org/ml/gcc-patches/2018-01/msg01107.html
	* cp-tree.h (mark_rvalue_use): Add parm name.
	* expr.c (mark_lvalue_use, mark_lvalue_use_nonread): Move next to
	mark_rvalue_use.
	* call.c (convert_like_real): Fix formatting.

From-SVN: r256593
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 840cbd4f3e1..c1558040baa 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2018-01-12  Nathan Sidwell  <nathan@acm.org>
+
+	* cp-tree.h (mark_rvalue_use): Add parm name.
+	* expr.c (mark_lvalue_use, mark_lvalue_use_nonread): Move next to
+	mark_rvalue_use.
+	* call.c (convert_like_real): Fix formatting.
+
 2018-01-11  Jason Merrill  <jason@redhat.com>
 
 	PR c++/82728 - wrong -Wunused-but-set-variable
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 5f2c6becb35..f5542850cea 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -6890,9 +6890,9 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
     };
 
   expr = convert_like_real (next_conversion (convs), expr, fn, argnum,
-			    convs->kind == ck_ref_bind ? issue_conversion_warnings : false, 
-			    c_cast_p,
-			    complain);
+			    convs->kind == ck_ref_bind
+			    ? issue_conversion_warnings : false, 
+			    c_cast_p, complain);
   if (expr == error_mark_node)
     return error_mark_node;
 
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 9c6c1791e1a..4300d9217a8 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -6330,7 +6330,7 @@ extern tree create_try_catch_expr               (tree, tree);
 extern tree cplus_expand_constant		(tree);
 extern tree mark_rvalue_use			(tree,
                                                  location_t = UNKNOWN_LOCATION,
-                                                 bool = true);
+                                                 bool reject_builtin = true);
 extern tree mark_lvalue_use			(tree);
 extern tree mark_lvalue_use_nonread		(tree);
 extern tree mark_type_use			(tree);
@@ -6341,7 +6341,8 @@ extern void mark_exp_read			(tree);
 extern int is_friend				(tree, tree);
 extern void make_friend_class			(tree, tree, bool);
 extern void add_friend				(tree, tree, bool);
-extern tree do_friend				(tree, tree, tree, tree, enum overload_flags, bool);
+extern tree do_friend				(tree, tree, tree, tree,
+						 enum overload_flags, bool);
 
 extern void set_global_friend			(tree);
 extern bool is_global_friend			(tree);
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 7d7921597d5..da09ab844cf 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -199,6 +199,22 @@ mark_rvalue_use (tree e,
   return mark_use (e, true, true, loc, reject_builtin);
 }
 
+/* Called whenever an expression is used in an lvalue context.  */
+
+tree
+mark_lvalue_use (tree expr)
+{
+  return mark_use (expr, false, true, input_location, false);
+}
+
+/* As above, but don't consider this use a read.  */
+
+tree
+mark_lvalue_use_nonread (tree expr)
+{
+  return mark_use (expr, false, false, input_location, false);
+}
+
 /* Called when expr appears as a discarded-value expression.  */
 
 tree
@@ -245,22 +261,6 @@ mark_discarded_use (tree expr)
   return mark_use (expr, true, true, input_location, false);
 }
 
-/* Called whenever an expression is used in an lvalue context.  */
-
-tree
-mark_lvalue_use (tree expr)
-{
-  return mark_use (expr, false, true, input_location, false);
-}
-
-/* As above, but don't consider this use a read.  */
-
-tree
-mark_lvalue_use_nonread (tree expr)
-{
-  return mark_use (expr, false, false, input_location, false);
-}
-
 /* Called whenever an expression is used in a type use context.  */
 
 tree