From: ppalka <ppalka@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 17 Dec 2015 03:46:27 +0000 (+0000)
Subject: Avoid code duplication in cp_tree_[operand|code]_length
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9768b22e01f84717472962b415be5013f9ecc9ee;p=thirdparty%2Fgcc.git

Avoid code duplication in cp_tree_[operand|code]_length

gcc/cp/ChangeLog:

	* tree.c (cp_tree_operand_length): Define in terms of
	cp_tree_code_length.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231735 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1ffa6eb0e762..91bc456399f6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-16  Patrick Palka  <ppalka@gcc.gnu.org>
+
+	* tree.c (cp_tree_operand_length): Define in terms of
+	cp_tree_code_length.
+
 2015-12-16  Martin Sebor  <msebor@redhat.com>
 
 	PR objc++/68932
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 0c0987df0f69..ae176d00f6d8 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -4427,23 +4427,10 @@ cp_tree_operand_length (const_tree t)
 {
   enum tree_code code = TREE_CODE (t);
 
-  switch (code)
-    {
-    case PREINCREMENT_EXPR:
-    case PREDECREMENT_EXPR:
-    case POSTINCREMENT_EXPR:
-    case POSTDECREMENT_EXPR:
-      return 1;
+  if (TREE_CODE_CLASS (code) == tcc_vl_exp)
+    return VL_EXP_OPERAND_LENGTH (t);
 
-    case ARRAY_REF:
-      return 2;
-
-    case EXPR_PACK_EXPANSION:
-      return 1;
-
-    default:
-      return TREE_OPERAND_LENGTH (t);
-    }
+  return cp_tree_code_length (code);
 }
 
 /* Like cp_tree_operand_length, but takes a tree_code CODE.  */