sem_ch3.adb (Analyze_Object_Declaration): Swap a couple of tests in a condition so...

2014-11-20  Eric Botcazou  <ebotcazou@adacore.com>

	* sem_ch3.adb (Analyze_Object_Declaration): Swap a couple of
	tests in a condition so Following_Address_Clause is invoked
	only if need be.
	* exp_util.ads (Following_Address_Clause): Add small note.

From-SVN: r217834

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e12e368833fd630931b6ae41c14e22591262d9bb..d2746e1511d3fbd09c853bb51fd765192af643fc 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * sem_ch3.adb (Analyze_Object_Declaration): Swap a couple of
+       tests in a condition so Following_Address_Clause is invoked
+       only if need be.
+       * exp_util.ads (Following_Address_Clause): Add small note.
+
 2014-11-20  Pascal Obry  <obry@adacore.com>
 
        * adaint.c (remove_handle): New local routine without a lock.

diff --git a/gcc/ada/exp_util.ads b/gcc/ada/exp_util.ads
index c0edb4b8e606d8ba74c40aa12ae5b0ee64230301..671b13a19b851c0cefa3da70a16c9b00fe0d8c57 100644 (file)
--- a/gcc/ada/exp_util.ads
+++ b/gcc/ada/exp_util.ads
@@ -507,6 +507,10 @@ package Exp_Util is
    --  current declarative part to look for an address clause for the object
    --  being declared, and returns the clause if one is found, returns
    --  Empty otherwise.
+   --
+   --  Note: this function can be costly and must be invoked with special care.
+   --  Possibly we could introduce a flag at parse time indicating the presence
+   --  of an address clause to speed this up???
 
    procedure Force_Evaluation
      (Exp      : Node_Id;

diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index db348d7a61794edc692df62690f8f3ffac194464..28b44718406ee0e9b8f3b909aecb817e89f3081f 100644 (file)
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -3648,8 +3648,13 @@ package body Sem_Ch3 is
 
          if Comes_From_Source (N)
            and then Expander_Active
-           and then Present (Following_Address_Clause (N))
            and then Nkind (E) = N_Aggregate
+
+           --  Note the importance of doing this the following test after the
+           --  N_Aggregate test to avoid inefficiencies from too many calls to
+           --  the function Following_Address_Clause which can be expensive.
+
+           and then Present (Following_Address_Clause (N))
          then
             Set_Etype (E, T);