From: Kai Tietz <ktietz@redhat.com>
Date: Thu, 13 Nov 2014 09:46:53 +0000 (+0100)
Subject: cp-tree.h (cp_build_function_call): Remove prototype.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=882de2147813cd2b848e1b6295dff6cb82d29852;p=gcc.git

cp-tree.h (cp_build_function_call): Remove prototype.

2014-11-13  Kai Tietz  <ktietz@redhat.com>

	* cp-tree.h (cp_build_function_call): Remove prototype.
	(cp_build_addr_expr_strict): Likewise.
	(build_typed_address): Likewise.
	* typeck.c (build_typed_address): Removed.
	(cp_build_addr_expr_strict): Make static.
	(cp_build_function_call): Likewise.

From-SVN: r217469
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index abb9ffb2380..d4351e7b87c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2014-11-13  Kai Tietz  <ktietz@redhat.com>
+
+	* cp-tree.h (cp_build_function_call): Remove prototype.
+	(cp_build_addr_expr_strict): Likewise.
+	(build_typed_address): Likewise.
+	* typeck.c (build_typed_address): Removed.
+	(cp_build_addr_expr_strict): Make static.
+	(cp_build_function_call): Likewise.
+
 2014-11-12  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	DR 1510
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 82243609870..7a1a0f74b02 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -6136,7 +6136,6 @@ extern tree build_array_ref			(location_t, tree, tree);
 extern tree cp_build_array_ref			(location_t, tree, tree,
 						 tsubst_flags_t);
 extern tree get_member_function_from_ptrfunc	(tree *, tree, tsubst_flags_t);
-extern tree cp_build_function_call              (tree, tree, tsubst_flags_t);
 extern tree cp_build_function_call_nary         (tree, tsubst_flags_t, ...)
 						ATTRIBUTE_SENTINEL;
 extern tree cp_build_function_call_vec		(tree, vec<tree, va_gc> **,
@@ -6152,7 +6151,6 @@ extern tree build_x_unary_op			(location_t,
 						 enum tree_code, tree,
                                                  tsubst_flags_t);
 extern tree cp_build_addr_expr			(tree, tsubst_flags_t);
-extern tree cp_build_addr_expr_strict		(tree, tsubst_flags_t);
 extern tree cp_build_unary_op                   (enum tree_code, tree, int, 
                                                  tsubst_flags_t);
 extern tree unary_complex_lvalue		(enum tree_code, tree);
@@ -6212,7 +6210,6 @@ extern tree build_x_vec_perm_expr               (location_t,
 extern tree build_simple_component_ref		(tree, tree);
 extern tree build_ptrmemfunc_access_expr	(tree, tree);
 extern tree build_address			(tree);
-extern tree build_typed_address			(tree, tree);
 extern tree build_nop				(tree, tree);
 extern tree non_reference			(tree);
 extern tree lookup_anon_field			(tree, tree);
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 1f443ef0b1d..184363e6446 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -42,6 +42,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-family/c-ubsan.h"
 #include "params.h"
 
+static tree cp_build_addr_expr_strict (tree, tsubst_flags_t);
+static tree cp_build_function_call (tree, tree, tsubst_flags_t);
 static tree pfn_from_ptrmemfunc (tree);
 static tree delta_from_ptrmemfunc (tree);
 static tree convert_for_assignment (tree, tree, impl_conv_rhs, tree, int,
@@ -3400,7 +3402,7 @@ build_function_call_vec (location_t /*loc*/, vec<location_t> /*arg_loc*/,
 
 /* Build a function call using a tree list of arguments.  */
 
-tree
+static tree
 cp_build_function_call (tree function, tree params, tsubst_flags_t complain)
 {
   vec<tree, va_gc> *vec;
@@ -5322,19 +5324,6 @@ build_address (tree t)
   return t;
 }
 
-/* Returns the address of T with type TYPE.  */
-
-tree
-build_typed_address (tree t, tree type)
-{
-  if (error_operand_p (t) || !cxx_mark_addressable (t))
-    return error_mark_node;
-  t = build_fold_addr_expr_with_type (t, type);
-  if (TREE_CODE (t) != ADDR_EXPR)
-    t = rvalue (t);
-  return t;
-}
-
 /* Return a NOP_EXPR converting EXPR to TYPE.  */
 
 tree
@@ -5628,7 +5617,7 @@ cp_build_addr_expr (tree arg, tsubst_flags_t complain)
 
 /* Take the address of ARG, but only if it's an lvalue.  */
 
-tree
+static tree
 cp_build_addr_expr_strict (tree arg, tsubst_flags_t complain)
 {
   return cp_build_addr_expr_1 (arg, 1, complain);