3 files changed, 18 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d7954ff..7fb0d56 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2017-12-07  Richard Sandiford  <richard.sandiford@linaro.org>
 
+	* tree.c (build_vector): Delete.
+	* tree.h (build_vector): Make static and move into the self-testing
+	block.
+
+2017-12-07  Richard Sandiford  <richard.sandiford@linaro.org>
+
 	* vector-builder.h (vector_builder::derived): New const overload.
 	(vector_builder::elt): New function.
 	* tree-vector-builder.h (tree_vector_builder::type): New function.
diff --git a/gcc/tree.c b/gcc/tree.c
index e696d03..13ae1c9 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -1736,18 +1736,6 @@ make_vector (unsigned log2_npatterns,
 }
 
 /* Return a new VECTOR_CST node whose type is TYPE and whose values
-   are given by VALS.  */
-
-tree
-build_vector (tree type, vec<tree> vals MEM_STAT_DECL)
-{
-  gcc_assert (vals.length () == TYPE_VECTOR_SUBPARTS (type));
-  tree_vector_builder builder (type, vals.length (), 1);
-  builder.splice (vals);
-  return builder.build ();
-}
-
-/* Return a new VECTOR_CST node whose type is TYPE and whose values
    are extracted from V, a vector of CONSTRUCTOR_ELT.  */
 
 tree
@@ -14066,6 +14054,18 @@ test_labels ()
   ASSERT_FALSE (FORCED_LABEL (label_decl));
 }
 
+/* Return a new VECTOR_CST node whose type is TYPE and whose values
+   are given by VALS.  */
+
+static tree
+build_vector (tree type, vec<tree> vals MEM_STAT_DECL)
+{
+  gcc_assert (vals.length () == TYPE_VECTOR_SUBPARTS (type));
+  tree_vector_builder builder (type, vals.length (), 1);
+  builder.splice (vals);
+  return builder.build ();
+}
+
 /* Check that VECTOR_CST ACTUAL contains the elements in EXPECTED.  */
 
 static void
diff --git a/gcc/tree.h b/gcc/tree.h
index b3cf747..306ff09 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -4044,7 +4044,6 @@ extern tree build_int_cst (tree, HOST_WIDE_INT);
 extern tree build_int_cstu (tree type, unsigned HOST_WIDE_INT cst);
 extern tree build_int_cst_type (tree, HOST_WIDE_INT);
 extern tree make_vector (unsigned, unsigned CXX_MEM_STAT_INFO);
-extern tree build_vector (tree, vec<tree> CXX_MEM_STAT_INFO);
 extern tree build_vector_from_ctor (tree, vec<constructor_elt, va_gc> *);
 extern tree build_vector_from_val (tree, tree);
 extern void recompute_constructor_flags (tree);