From: Richard Biener <rguenther@suse.de>
Date: Mon, 30 Apr 2018 10:16:11 +0000 (+0000)
Subject: tree-chrec.h (evolution_function_is_constant_p): Remove redundant check.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5885f02733f9bab7e9508bfebbeed5b3c9254aaa;p=gcc.git

tree-chrec.h (evolution_function_is_constant_p): Remove redundant check.

2018-04-30  Richard Biener  <rguenther@suse.de>

	* tree-chrec.h (evolution_function_is_constant_p): Remove
	redundant check.
	* tree-cfg.c (tree_node_can_be_shared): Re-order checks.

From-SVN: r259756
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 11b7a83e508..5edb052836a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-30  Richard Biener  <rguenther@suse.de>
+
+	* tree-chrec.h (evolution_function_is_constant_p): Remove
+	redundant check.
+	* tree-cfg.c (tree_node_can_be_shared): Re-order checks.
+
 2018-04-30  Richard Biener  <rguenther@suse.de>
 
 	PR bootstrap/85571
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 8726a530aaf..19a378a7da9 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -5212,16 +5212,13 @@ static bool
 tree_node_can_be_shared (tree t)
 {
   if (IS_TYPE_OR_DECL_P (t)
-      || is_gimple_min_invariant (t)
       || TREE_CODE (t) == SSA_NAME
-      || t == error_mark_node
-      || TREE_CODE (t) == IDENTIFIER_NODE)
+      || TREE_CODE (t) == IDENTIFIER_NODE
+      || TREE_CODE (t) == CASE_LABEL_EXPR
+      || is_gimple_min_invariant (t))
     return true;
 
-  if (TREE_CODE (t) == CASE_LABEL_EXPR)
-    return true;
-
-  if (DECL_P (t))
+  if (t == error_mark_node)
     return true;
 
   return false;
diff --git a/gcc/tree-chrec.h b/gcc/tree-chrec.h
index b2efa339af5..e6e16491781 100644
--- a/gcc/tree-chrec.h
+++ b/gcc/tree-chrec.h
@@ -170,8 +170,6 @@ evolution_function_is_constant_p (const_tree chrec)
   if (chrec == NULL_TREE)
     return false;
 
-  if (CONSTANT_CLASS_P (chrec))
-    return true;
   return is_gimple_min_invariant (chrec);
 }