[Ada] Simplify conditions by removing always true conjuncts

Checking "Original_Node (N) /= N" is equivalent to "Is_Rewrite_Substitution
(N)", which is checked just two lines before. Trivial simplification,
semantics unaffected.

2018-05-30  Piotr Trojanek  <trojanek@adacore.com>

gcc/ada/

	* sem_prag.adb (Analyze_Pragma): Remove conjuncts that are always true.

From-SVN: r260934

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e14d14eb32da1c89c9f360021ba135512eced8fd..c6bd08bc50b1eed3fd76398fb7ac0a1191110c0c 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-30  Piotr Trojanek  <trojanek@adacore.com>
+
+       * sem_prag.adb (Analyze_Pragma): Remove conjuncts that are always true.
+
 2018-05-30  Hristian Kirtchev  <kirtchev@adacore.com>
 
        * sem_util.adb (Is_Atomic_Object): Cleaned up. Split the entity logic

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index ae340aade447537be3d3f3261775f8f4b06de064..4547ef1d78e99e2a692fc8b3a3c0b34aa7a54b03 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -11104,7 +11104,7 @@ package body Sem_Prag is
 
       --  Here to start processing for recognized pragma
 
-      Pname   := Original_Aspect_Pragma_Name (N);
+      Pname := Original_Aspect_Pragma_Name (N);
 
       --  Capture setting of Opt.Uneval_Old
 
@@ -11135,7 +11135,6 @@ package body Sem_Prag is
 
       elsif Is_Rewrite_Substitution (N)
         and then Nkind (Original_Node (N)) = N_Pragma
-        and then Original_Node (N) /= N
       then
          Set_Is_Ignored (N, Is_Ignored (Original_Node (N)));
          Set_Is_Checked (N, Is_Checked (Original_Node (N)));
@@ -13293,7 +13292,6 @@ package body Sem_Prag is
 
             elsif Is_Rewrite_Substitution (N)
               and then Nkind (Original_Node (N)) = N_Pragma
-              and then Original_Node (N) /= N
             then
                Set_Is_Ignored (N, Is_Ignored (Original_Node (N)));
                Set_Is_Checked (N, Is_Checked (Original_Node (N)));