summaryrefslogtreecommitdiff
path: root/gcc/ada/exp_ch7.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2011-08-04 15:39:29 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2011-08-04 15:39:29 +0000
commit2880d07c65dddf86a25825e13e5b90dd9639c6e4 (patch)
tree74c2008ce6ed267b2d7fb03bcf097fcef4d4d4d3 /gcc/ada/exp_ch7.adb
parent9eb919116e4eba4b38519ee961ebfa9bc3ac32cc (diff)
downloadgcc-2880d07c65dddf86a25825e13e5b90dd9639c6e4.tar.gz
2011-08-04 Robert Dewar <dewar@adacore.com>
* exp_ch7.adb: Minor reformatting. 2011-08-04 Robert Dewar <dewar@adacore.com> * exp_strm.adb: Minor reformatting. 2011-08-04 Vadim Godunko <godunko@adacore.com> * s-atocou.adb: Replace by dummy version and use on targets where atomic operations are not supported. * s-atocou-builtin.adb: Renamed from s-atocou.adb. * s-atocou-x86.adb: New file. * Makefile.rtl: Add s-atocou.o file 2011-08-04 Arnaud Charlet <charlet@adacore.com> * make.adb (Compile): Move setting of CodePeer_Mode to ... (Compilation_Phase): ... here. (Scan_Make_Arg): Now bind and link by default in CodePeer mode. 2011-08-04 Thomas Quinot <quinot@adacore.com> * Make-generated.in: Fix minor typo in comment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177403 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/exp_ch7.adb')
-rw-r--r--gcc/ada/exp_ch7.adb30
1 files changed, 10 insertions, 20 deletions
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index 40499bc7c79..8343d2af0b4 100644
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -1130,8 +1130,8 @@ package body Exp_Ch7 is
-- object.
Has_Tagged_Types : Boolean := False;
- -- A general flag which denotes whether N has at least one library-level
- -- tagged type declaration.
+ -- A general flag which indicates whether N has at least one library-
+ -- level tagged type declaration.
HSS : Node_Id := Empty;
-- The sequence of statements of N (if available)
@@ -1741,6 +1741,7 @@ package body Exp_Ch7 is
then
Last_Top_Level_Ctrl_Construct := Decl;
end if;
+
else
Process_Tagged_Type_Declaration (Decl);
end if;
@@ -1757,6 +1758,7 @@ package body Exp_Ch7 is
then
Last_Top_Level_Ctrl_Construct := Decl;
end if;
+
else
Process_Object_Declaration (Decl, Has_No_Init, Is_Protected);
end if;
@@ -2774,19 +2776,15 @@ package body Exp_Ch7 is
-- cases, the finalizer must be created and carry the additional
-- statements.
- if Acts_As_Clean
- or else Has_Ctrl_Objs
- or else Has_Tagged_Types
- then
+ if Acts_As_Clean or Has_Ctrl_Objs or Has_Tagged_Types then
Build_Components;
end if;
-- The preprocessing has determined that the context has controlled
-- objects or library-level tagged types.
- if Has_Ctrl_Objs
- or else Has_Tagged_Types
- then
+ if Has_Ctrl_Objs or Has_Tagged_Types then
+
-- Private declarations are processed first in order to preserve
-- possible dependencies between public and private objects.
@@ -2820,16 +2818,11 @@ package body Exp_Ch7 is
-- cases, the finalizer must be created and carry the additional
-- statements.
- if Acts_As_Clean
- or else Has_Ctrl_Objs
- or else Has_Tagged_Types
- then
+ if Acts_As_Clean or Has_Ctrl_Objs or Has_Tagged_Types then
Build_Components;
end if;
- if Has_Ctrl_Objs
- or else Has_Tagged_Types
- then
+ if Has_Ctrl_Objs or Has_Tagged_Types then
Process_Declarations (Stmts);
Process_Declarations (Decls);
end if;
@@ -2837,10 +2830,7 @@ package body Exp_Ch7 is
-- Step 3: Finalizer creation
- if Acts_As_Clean
- or else Has_Ctrl_Objs
- or else Has_Tagged_Types
- then
+ if Acts_As_Clean or Has_Ctrl_Objs or Has_Tagged_Types then
Create_Finalizer;
end if;
end Build_Finalizer;