From e83a74b0db9c27bb2be72a6caa361f9a3ffe792e Mon Sep 17 00:00:00 2001 From: Bob Duff Date: Fri, 15 Dec 2017 09:36:12 +0000 Subject: [PATCH] types.ads, [...]: Partly revert r255414, committed by mistake. 2017-12-15 Bob Duff * types.ads, exp_ch6.adb, libgnat/s-regexp.ads, opt.ads: Partly revert r255414, committed by mistake. From-SVN: r255679 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/exp_ch6.adb | 6 +----- gcc/ada/libgnat/s-regexp.ads | 2 +- gcc/ada/opt.ads | 2 +- gcc/ada/types.ads | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1b46154c8fd..60f366cba92 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2017-12-15 Bob Duff + + * types.ads, exp_ch6.adb, libgnat/s-regexp.ads, opt.ads: Partly revert + r255414, committed by mistake. + 2017-12-14 Eric Botcazou * gcc-interface/Makefile.in: Generalize support for symbolic traces. diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index 43731c80239..8a3f3905c76 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -5370,10 +5370,6 @@ package body Exp_Ch6 is Rewrite (Name (Init_Assignment), Make_Explicit_Dereference (Loc, Prefix => New_Occurrence_Of (Alloc_Obj_Id, Loc))); - pragma Assert - (Assignment_OK - (Original_Node (Name (Init_Assignment)))); - Set_Assignment_OK (Name (Init_Assignment)); Set_Etype (Name (Init_Assignment), Etype (Ret_Obj_Id)); @@ -7314,7 +7310,7 @@ package body Exp_Ch6 is begin -- ???For now, enable build-in-place for a very narrow set of -- controlled types. Change "if True" to "if False" to - -- experiment with more controlled types. Eventually, we might + -- experiment more controlled types. Eventually, we would -- like to enable build-in-place for all tagged types, all -- types that need finalization, and all caller-unknown-size -- types. diff --git a/gcc/ada/libgnat/s-regexp.ads b/gcc/ada/libgnat/s-regexp.ads index b399ca9f368..0155b43be4d 100644 --- a/gcc/ada/libgnat/s-regexp.ads +++ b/gcc/ada/libgnat/s-regexp.ads @@ -41,7 +41,7 @@ with Ada.Finalization; -package System.Regexp is -- ???????????????? +package System.Regexp is -- The regular expression must first be compiled, using the Compile -- function, which creates a finite state matching table, allowing diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads index ccb00dc607e..2a32b63d226 100644 --- a/gcc/ada/opt.ads +++ b/gcc/ada/opt.ads @@ -1445,7 +1445,7 @@ package Opt is -- GNAT.Exception_Traces is with'ed. Used to inhibit transformation of -- local raise statements into gotos in the presence of either package. - Sprint_Line_Limit : Nat := 72; -- ???????????????? + Sprint_Line_Limit : Nat := 72; -- GNAT -- Limit values for chopping long lines in Cprint/Sprint output, can be -- reset by use of NNN parameter with -gnatG or -gnatD switches. diff --git a/gcc/ada/types.ads b/gcc/ada/types.ads index c523053be34..0d8eb06c715 100644 --- a/gcc/ada/types.ads +++ b/gcc/ada/types.ads @@ -49,7 +49,7 @@ with System; with Unchecked_Conversion; with Unchecked_Deallocation; -package Types is -- ???????????????? +package Types is pragma Preelaborate; ------------------------------- -- 2.30.2