Revert previous change.

From-SVN: r244695

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9ad60015b0ebb60ef540612712a2562f38856c09..75a44945fe92c8a1cefafbf55dd30e4329bbbfcf 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,7 +1,3 @@
-2017-01-20  Arnaud Charlet  <charlet@adacore.com>
-
-       * exp_ch3.adb: Reenable code.
-
 2017-01-20  Yannick Moy  <moy@adacore.com>
 
        * sinfo.ads: Document lack of Do_Division_Check flag

diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index f4f457178bbf4c3f3f8f5c4115ffec3e8df4ffcd..0acd94f1ab9c800a7ff63087fff75e61bb690a8d 100644 (file)
--- a/gcc/ada/exp_ch3.adb
+++ b/gcc/ada/exp_ch3.adb
@@ -5901,7 +5901,10 @@ package body Exp_Ch3 is
          --  would otherwise make two copies. The RM allows removing redunant
          --  Adjust/Finalize calls, but does not allow insertion of extra ones.
 
-         return (Nkind (Expr_Q) = N_Explicit_Dereference
+         --  This part is disabled for now, because it breaks GPS builds
+
+         return (False -- ???
+             and then Nkind (Expr_Q) = N_Explicit_Dereference
              and then not Comes_From_Source (Expr_Q)
              and then Nkind (Original_Node (Expr_Q)) = N_Function_Call
              and then Nkind (Object_Definition (N)) in N_Has_Entity