summaryrefslogtreecommitdiff
path: root/gcc/ada/s-tpobop.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-03 10:58:47 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-03 10:58:47 +0000
commit42e09e36b18d6d9ae829c1f65dc2ab435a1919ec (patch)
tree748874df3dc0a3314fe920a2323c47f25ce1db05 /gcc/ada/s-tpobop.adb
parent6f2b011d9c7017ba798c7d120cb10f4af9072b9d (diff)
downloadgcc-42e09e36b18d6d9ae829c1f65dc2ab435a1919ec.tar.gz
2013-01-03 Thomas Quinot <quinot@adacore.com>
* exp_ch11.adb: Minor reformatting. 2013-01-03 Thomas Quinot <quinot@adacore.com> * exp_util.adb, einfo.adb, einfo.ads, freeze.adb, exp_aggr.adb, sem_ch13.adb (Einfo.Initialization_Statements, Einfo.Set_Initialization_Statements): New entity attribute for objects. (Exp_Util.Find_Init_Call): Handle case of an object initialized by an aggregate converted to a block of assignment statements. (Freeze.Check_Address_Clause): Do not clear Has_Delayed_Freeze even for objects that require a constant address, because the address expression might involve entities that have yet to be elaborated at the point of the object declaration. (Exp_Aggr.Convert_Aggregate_In_Obj_Decl): For a type that does not require a transient scope, capture the assignment statements in a block so that they can be moved down after elaboration of an address clause if needed. (Sem_Ch13.Check_Constant_Address_Clause.Check_Expr_Constants, case N_Unchecked_Conversion): Do not replace operand subtype with its base type as this violates a GIGI invariant if the operand is an identifier (in which case the etype of the identifier is expected to be equal to that of the denoted entity). 2013-01-03 Javier Miranda <miranda@adacore.com> * sem_util.ads, sem_util.adb (Denotes_Same_Object): Extend the functionality of this routine to cover cases described in the Ada 2012 reference manual. 2013-01-03 Ed Schonberg <schonberg@adacore.com> * sem_elab.adb (Set_Elaboration_Constraint): Handle properly a 'Access attribute reference when the subprogram is called Initialize. 2013-01-03 Arnaud Charlet <charlet@adacore.com> * s-tpobop.adb (PO_Do_Or_Queue): Refine assertion, since a select statement may be called from a controlled (e.g. Initialize) operation and have abort always deferred. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194847 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/s-tpobop.adb')
-rw-r--r--gcc/ada/s-tpobop.adb4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/ada/s-tpobop.adb b/gcc/ada/s-tpobop.adb
index 0ed75a8c392..aaf18208e59 100644
--- a/gcc/ada/s-tpobop.adb
+++ b/gcc/ada/s-tpobop.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1998-2011, Free Software Foundation, Inc. --
+-- Copyright (C) 1998-2012, Free Software Foundation, Inc. --
-- --
-- GNARL 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- --
@@ -379,7 +379,7 @@ package body System.Tasking.Protected_Objects.Operations is
end if;
STPO.Write_Lock (Entry_Call.Self);
- pragma Assert (Entry_Call.State >= Was_Abortable);
+ pragma Assert (Entry_Call.State /= Not_Yet_Abortable);
Initialization.Wakeup_Entry_Caller (Self_ID, Entry_Call, Cancelled);
STPO.Unlock (Entry_Call.Self);