diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2020-04-03 11:36:55 +0200 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2020-06-16 09:07:11 -0400 |
| commit | d7769a80a8ca67be548ad926c81b8a23eedfc3ea (patch) | |
| tree | 1332841a52c8b36a98c6591669ecb8a9b5ee2ce5 /gcc | |
| parent | 0faf0503312ddf6bfc88cecfa1adcd903b20b97c (diff) | |
| download | gcc-d7769a80a8ca67be548ad926c81b8a23eedfc3ea.zip gcc-d7769a80a8ca67be548ad926c81b8a23eedfc3ea.tar.gz gcc-d7769a80a8ca67be548ad926c81b8a23eedfc3ea.tar.bz2 | |
[Ada] Accept renamings of folded string aggregates
2020-06-16 Piotr Trojanek <trojanek@adacore.com>
gcc/ada/
* sem_ch8.adb (Analyze_Object_Renaming): Remove trivially
useless initialization of Is_Object_Reference.
* sem_util.adb (Is_Object_Reference): Simplify detection of
binary and unary operators; literally implement rules about
aggregates and qualified expressions; recognize string literals
as object references.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/sem_ch8.adb | 4 | ||||
| -rw-r--r-- | gcc/ada/sem_util.adb | 26 |
2 files changed, 19 insertions, 11 deletions
diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index b9e5990..069341c 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -754,7 +754,7 @@ package body Sem_Ch8 is Id : constant Entity_Id := Defining_Identifier (N); Loc : constant Source_Ptr := Sloc (N); Nam : constant Node_Id := Name (N); - Is_Object_Ref : Boolean := False; + Is_Object_Ref : Boolean; Dec : Node_Id; T : Entity_Id; T2 : Entity_Id; @@ -1366,7 +1366,7 @@ package body Sem_Ch8 is if T = Any_Type or else Etype (Nam) = Any_Type then return; - -- Verify that the renamed entity is an object or function call. + -- Verify that the renamed entity is an object or function call elsif Is_Object_Ref then if Comes_From_Source (N) then diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index a3dbaaf..dd9ab2e 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -16978,9 +16978,8 @@ package body Sem_Util is -- Note that predefined operators are functions as well, and so -- are attributes that are (can be renamed as) functions. - when N_Binary_Op - | N_Function_Call - | N_Unary_Op + when N_Function_Call + | N_Op => return Etype (N) /= Standard_Void_Type; @@ -17040,12 +17039,21 @@ package body Sem_Util is -- of aggregates in more contexts. when N_Qualified_Expression => - if Ada_Version < Ada_2012 then - return False; - else - return Is_Object_Reference (Expression (N)) - or else Nkind (Expression (N)) = N_Aggregate; - end if; + return Ada_Version >= Ada_2012 + and then Is_Object_Reference (Expression (N)); + + -- In Ada 95 an aggreate is an object reference + + when N_Aggregate => + return Ada_Version >= Ada_95; + + -- A string literal is not an object reference, but it might come + -- from rewriting of an object reference, e.g. from folding of an + -- aggregate. + + when N_String_Literal => + return Is_Rewrite_Substitution (N) + and then Is_Object_Reference (Original_Node (N)); when others => return False; |