From 60b68e56cecc0af3e14698ba66e620c2eb76705c Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Fri, 5 Oct 2012 14:22:55 +0000 Subject: [PATCH] checks.adb, [...]: Minor reformatting. 2012-10-05 Robert Dewar * checks.adb, checks.ads, s-tassta.adb, s-stposu.adb, s-spsufi.adb, s-spsufi.ads, exp_ch4.adb: Minor reformatting. From-SVN: r192125 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/checks.adb | 7 +++---- gcc/ada/checks.ads | 2 +- gcc/ada/exp_ch4.adb | 12 ++++++------ gcc/ada/s-spsufi.adb | 6 +++--- gcc/ada/s-spsufi.ads | 9 ++++++--- gcc/ada/s-stposu.adb | 4 +++- gcc/ada/s-tassta.adb | 10 +++++----- 8 files changed, 32 insertions(+), 23 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7936d18be8f..b6e00a1243a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2012-10-05 Robert Dewar + + * checks.adb, checks.ads, s-tassta.adb, s-stposu.adb, s-spsufi.adb, + s-spsufi.ads, exp_ch4.adb: Minor reformatting. + 2012-10-05 Yannick Moy * switch-c.adb, checks.adb, checks.ads, sem_prag.adb, exp_ch4.adb, diff --git a/gcc/ada/checks.adb b/gcc/ada/checks.adb index 8ec1b2ec588..225c3ee0a4b 100644 --- a/gcc/ada/checks.adb +++ b/gcc/ada/checks.adb @@ -1207,10 +1207,9 @@ package body Checks is Analyze_And_Resolve (Op); end; - -- Here we know the result is Long_Long_Integer'Base, - -- or that it has been rewritten because the parent - -- is a conversion (see Conversion_Optimization in - -- Apply_Arithmetic_Overflow_Checked_Suppressed). + -- Here we know the result is Long_Long_Integer'Base, of that it has + -- been rewritten because the parent operation is a conversion. See + -- Conversion_Optimization.Apply_Arithmetic_Overflow_Checked_Suppressed. else pragma Assert diff --git a/gcc/ada/checks.ads b/gcc/ada/checks.ads index a989cfac05f..f7a4399386d 100644 --- a/gcc/ada/checks.ads +++ b/gcc/ada/checks.ads @@ -320,7 +320,7 @@ package Checks is -- -- Overflow checks are applied to the operands of a comparison operation. -- In this case, the comparison is done on the result Long_Long_Integer - -- or Bignum values, without raising any exception. + -- or Bignum values, without raising any exceptions. -- -- Overflow checks are applied to the left operand of a membership test. -- In this case no exception is raised if a Long_Long_Integer or Bignum diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index 9e28fc6d01c..ee9ce0c50f2 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -7084,7 +7084,7 @@ package body Exp_Ch4 is Typl := Base_Type (Typl); -- Deal with overflow checks in MINIMIZED/ELIMINATED mode and if that - -- results in not having a comparison operation anymore, we are done. + -- means we no longer have a comparison operation, we are all done. Expand_Compare_Minimize_Eliminate_Overflow (N); @@ -7678,7 +7678,7 @@ package body Exp_Ch4 is Binary_Op_Validity_Checks (N); -- Deal with overflow checks in MINIMIZED/ELIMINATED mode and if that - -- results in not having a comparison operation anymore, we are done. + -- means we no longer have a comparison operation, we are all done. Expand_Compare_Minimize_Eliminate_Overflow (N); @@ -7728,7 +7728,7 @@ package body Exp_Ch4 is Binary_Op_Validity_Checks (N); -- Deal with overflow checks in MINIMIZED/ELIMINATED mode and if that - -- results in not having a comparison operation anymore, we are done. + -- means we no longer have a comparison operation, we are all done. Expand_Compare_Minimize_Eliminate_Overflow (N); @@ -7778,7 +7778,7 @@ package body Exp_Ch4 is Binary_Op_Validity_Checks (N); -- Deal with overflow checks in MINIMIZED/ELIMINATED mode and if that - -- results in not having a comparison operation anymore, we are done. + -- means we no longer have a comparison operation, we are all done. Expand_Compare_Minimize_Eliminate_Overflow (N); @@ -7828,7 +7828,7 @@ package body Exp_Ch4 is Binary_Op_Validity_Checks (N); -- Deal with overflow checks in MINIMIZED/ELIMINATED mode and if that - -- results in not having a comparison operation anymore, we are done. + -- means we no longer have a comparison operation, we are all done. Expand_Compare_Minimize_Eliminate_Overflow (N); @@ -8263,7 +8263,7 @@ package body Exp_Ch4 is Binary_Op_Validity_Checks (N); -- Deal with overflow checks in MINIMIZED/ELIMINATED mode and if - -- that results in not having a /= operation anymore, we are done. + -- means we no longer have a /= operation, we are all done. Expand_Compare_Minimize_Eliminate_Overflow (N); diff --git a/gcc/ada/s-spsufi.adb b/gcc/ada/s-spsufi.adb index 9ed8e3ee5ec..ef2c935f341 100644 --- a/gcc/ada/s-spsufi.adb +++ b/gcc/ada/s-spsufi.adb @@ -2,12 +2,11 @@ -- -- -- GNAT COMPILER COMPONENTS -- -- -- --- S Y S T E M . S T O R A G E _ P O O L S . S U B P O O L S . -- --- F I N A L I Z A T I O N -- +-- SYSTEM.STORAGE_POOLS.SUBPOOLS.FINALIZATION -- -- -- -- B o d y -- -- -- --- Copyright (C) 2011-2012, Free Software Foundation, Inc. -- +-- Copyright (C) 2011-2012, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -31,6 +30,7 @@ ------------------------------------------------------------------------------ with Ada.Unchecked_Deallocation; + with System.Finalization_Masters; use System.Finalization_Masters; package body System.Storage_Pools.Subpools.Finalization is diff --git a/gcc/ada/s-spsufi.ads b/gcc/ada/s-spsufi.ads index c1f4d641eaa..1de738b6f84 100644 --- a/gcc/ada/s-spsufi.ads +++ b/gcc/ada/s-spsufi.ads @@ -2,12 +2,11 @@ -- -- -- GNAT COMPILER COMPONENTS -- -- -- --- S Y S T E M . S T O R A G E _ P O O L S . S U B P O O L S . -- --- F I N A L I Z A T I O N -- +-- SYSTEM.STORAGE_POOLS.SUBPOOLS.FINALIZATION -- -- -- -- S p e c -- -- -- --- Copyright (C) 2011-2012, Free Software Foundation, Inc. -- +-- Copyright (C) 2011-2012, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -33,6 +32,10 @@ pragma Compiler_Unit; package System.Storage_Pools.Subpools.Finalization is + + -- The pragma is needed because package System.Storage_Pools.Subpools which + -- is already preelaborated now depends on this unit. + pragma Preelaborate; procedure Finalize_And_Deallocate (Subpool : in out Subpool_Handle); diff --git a/gcc/ada/s-stposu.adb b/gcc/ada/s-stposu.adb index 99a61174e0f..cf43f2232d3 100644 --- a/gcc/ada/s-stposu.adb +++ b/gcc/ada/s-stposu.adb @@ -29,13 +29,15 @@ -- -- ------------------------------------------------------------------------------ -with Ada.Exceptions; use Ada.Exceptions; +with Ada.Exceptions; use Ada.Exceptions; with Ada.Unchecked_Conversion; + with System.Address_Image; with System.Finalization_Masters; use System.Finalization_Masters; with System.IO; use System.IO; with System.Soft_Links; use System.Soft_Links; with System.Storage_Elements; use System.Storage_Elements; + with System.Storage_Pools.Subpools.Finalization; use System.Storage_Pools.Subpools.Finalization; diff --git a/gcc/ada/s-tassta.adb b/gcc/ada/s-tassta.adb index 0b4a742ec1f..08886c157bb 100644 --- a/gcc/ada/s-tassta.adb +++ b/gcc/ada/s-tassta.adb @@ -1905,11 +1905,11 @@ package body System.Tasking.Stages is C := All_Tasks_List; P := null; while C /= null loop - -- If Free_On_Termination is set, do nothing here, and let - -- the task free itself if not already done, otherwise we - -- risk a race condition where Vulnerable_Free_Task is called - -- in the loop below, while the task calls Free_Task itself, - -- in Terminate_Task. + + -- If Free_On_Termination is set, do nothing here, and let the + -- task free itself if not already done, otherwise we risk a race + -- condition where Vulnerable_Free_Task is called in the loop below, + -- while the task calls Free_Task itself, in Terminate_Task. if C.Common.Parent = Self_ID and then C.Master_of_Task >= CM -- 2.30.2