exp_attr.adb (Expand_N_Attribute_Reference [Attribute_Valid]): Disable expansion when generating C code.
2016-04-20 Arnaud Charlet <charlet@adacore.com> * exp_attr.adb (Expand_N_Attribute_Reference [Attribute_Valid]): Disable expansion when generating C code. * sinfo.ads, inline.ads: Minor editing. From-SVN: r235247
This commit is contained in:
Arnaud Charlet
Arnaud Charlet
parent
c37e6613f5
commit
88438c0e87
4 changed files with 83 additions and 80 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2016-04-20 Arnaud Charlet <charlet@adacore.com>
|
||||
|
||||
* exp_attr.adb (Expand_N_Attribute_Reference [Attribute_Valid]):
|
||||
Disable expansion when generating C code.
|
||||
* sinfo.ads, inline.ads: Minor editing.
|
||||
|
||||
2016-04-20 Hristian Kirtchev <kirtchev@adacore.com>
|
||||
|
||||
* sem_util.adb, contracts.adb, ghost.adb, exp_ch6.adb: Minor
|
||||
|
|
|
|||
|
|
@ -6352,96 +6352,93 @@ package body Exp_Attr is
|
|||
-- Start of processing for Float_Valid
|
||||
|
||||
begin
|
||||
case Float_Rep (Btyp) is
|
||||
-- The C and AAMP back-ends handle Valid for fpt types
|
||||
|
||||
-- The AAMP back end handles Valid for floating-point types
|
||||
if Generate_C_Code or else Float_Rep (Btyp) = AAMP then
|
||||
Analyze_And_Resolve (Pref, Ptyp);
|
||||
Set_Etype (N, Standard_Boolean);
|
||||
Set_Analyzed (N);
|
||||
|
||||
when AAMP =>
|
||||
Analyze_And_Resolve (Pref, Ptyp);
|
||||
Set_Etype (N, Standard_Boolean);
|
||||
Set_Analyzed (N);
|
||||
else
|
||||
Find_Fat_Info (Ptyp, Ftp, Pkg);
|
||||
|
||||
when IEEE_Binary =>
|
||||
Find_Fat_Info (Ptyp, Ftp, Pkg);
|
||||
-- If the prefix is a reverse SSO component, or is possibly
|
||||
-- unaligned, first create a temporary copy that is in
|
||||
-- native SSO, and properly aligned. Make it Volatile to
|
||||
-- prevent folding in the back-end. Note that we use an
|
||||
-- intermediate constrained string type to initialize the
|
||||
-- temporary, as the value at hand might be invalid, and in
|
||||
-- that case it cannot be copied using a floating point
|
||||
-- register.
|
||||
|
||||
-- If the prefix is a reverse SSO component, or is
|
||||
-- possibly unaligned, first create a temporary copy
|
||||
-- that is in native SSO, and properly aligned. Make it
|
||||
-- Volatile to prevent folding in the back-end. Note
|
||||
-- that we use an intermediate constrained string type
|
||||
-- to initialize the temporary, as the value at hand
|
||||
-- might be invalid, and in that case it cannot be copied
|
||||
-- using a floating point register.
|
||||
if In_Reverse_Storage_Order_Object (Pref)
|
||||
or else Is_Possibly_Unaligned_Object (Pref)
|
||||
then
|
||||
declare
|
||||
Temp : constant Entity_Id :=
|
||||
Make_Temporary (Loc, 'F');
|
||||
|
||||
if In_Reverse_Storage_Order_Object (Pref)
|
||||
or else
|
||||
Is_Possibly_Unaligned_Object (Pref)
|
||||
then
|
||||
declare
|
||||
Temp : constant Entity_Id :=
|
||||
Make_Temporary (Loc, 'F');
|
||||
Fat_S : constant Entity_Id :=
|
||||
Get_Fat_Entity (Name_S);
|
||||
-- Constrained string subtype of appropriate size
|
||||
|
||||
Fat_S : constant Entity_Id :=
|
||||
Get_Fat_Entity (Name_S);
|
||||
-- Constrained string subtype of appropriate size
|
||||
Fat_P : constant Entity_Id :=
|
||||
Get_Fat_Entity (Name_P);
|
||||
-- Access to Fat_S
|
||||
|
||||
Fat_P : constant Entity_Id :=
|
||||
Get_Fat_Entity (Name_P);
|
||||
-- Access to Fat_S
|
||||
Decl : constant Node_Id :=
|
||||
Make_Object_Declaration (Loc,
|
||||
Defining_Identifier => Temp,
|
||||
Aliased_Present => True,
|
||||
Object_Definition =>
|
||||
New_Occurrence_Of (Ptyp, Loc));
|
||||
|
||||
Decl : constant Node_Id :=
|
||||
Make_Object_Declaration (Loc,
|
||||
Defining_Identifier => Temp,
|
||||
Aliased_Present => True,
|
||||
Object_Definition =>
|
||||
New_Occurrence_Of (Ptyp, Loc));
|
||||
begin
|
||||
Set_Aspect_Specifications (Decl, New_List (
|
||||
Make_Aspect_Specification (Loc,
|
||||
Identifier =>
|
||||
Make_Identifier (Loc, Name_Volatile))));
|
||||
|
||||
begin
|
||||
Set_Aspect_Specifications (Decl, New_List (
|
||||
Make_Aspect_Specification (Loc,
|
||||
Identifier =>
|
||||
Make_Identifier (Loc, Name_Volatile))));
|
||||
Insert_Actions (N,
|
||||
New_List (
|
||||
Decl,
|
||||
|
||||
Insert_Actions (N,
|
||||
New_List (
|
||||
Decl,
|
||||
Make_Assignment_Statement (Loc,
|
||||
Name =>
|
||||
Make_Explicit_Dereference (Loc,
|
||||
Prefix =>
|
||||
Unchecked_Convert_To (Fat_P,
|
||||
Make_Attribute_Reference (Loc,
|
||||
Prefix =>
|
||||
New_Occurrence_Of (Temp, Loc),
|
||||
Attribute_Name =>
|
||||
Name_Unrestricted_Access))),
|
||||
Expression =>
|
||||
Unchecked_Convert_To (Fat_S,
|
||||
Relocate_Node (Pref)))),
|
||||
|
||||
Make_Assignment_Statement (Loc,
|
||||
Name =>
|
||||
Make_Explicit_Dereference (Loc,
|
||||
Prefix =>
|
||||
Unchecked_Convert_To (Fat_P,
|
||||
Make_Attribute_Reference (Loc,
|
||||
Prefix =>
|
||||
New_Occurrence_Of (Temp, Loc),
|
||||
Attribute_Name =>
|
||||
Name_Unrestricted_Access))),
|
||||
Expression =>
|
||||
Unchecked_Convert_To (Fat_S,
|
||||
Relocate_Node (Pref)))),
|
||||
Suppress => All_Checks);
|
||||
|
||||
Suppress => All_Checks);
|
||||
Rewrite (Pref, New_Occurrence_Of (Temp, Loc));
|
||||
end;
|
||||
end if;
|
||||
|
||||
Rewrite (Pref, New_Occurrence_Of (Temp, Loc));
|
||||
end;
|
||||
end if;
|
||||
-- We now have an object of the proper endianness and
|
||||
-- alignment, and can construct a Valid attribute.
|
||||
|
||||
-- We now have an object of the proper endianness and
|
||||
-- alignment, and can construct a Valid attribute.
|
||||
-- We make sure the prefix of this valid attribute is
|
||||
-- marked as not coming from source, to avoid losing
|
||||
-- warnings from 'Valid looking like a possible update.
|
||||
|
||||
-- We make sure the prefix of this valid attribute is
|
||||
-- marked as not coming from source, to avoid losing
|
||||
-- warnings from 'Valid looking like a possible update.
|
||||
Set_Comes_From_Source (Pref, False);
|
||||
|
||||
Set_Comes_From_Source (Pref, False);
|
||||
|
||||
Expand_Fpt_Attribute
|
||||
(N, Pkg, Name_Valid,
|
||||
New_List (
|
||||
Make_Attribute_Reference (Loc,
|
||||
Prefix => Unchecked_Convert_To (Ftp, Pref),
|
||||
Attribute_Name => Name_Unrestricted_Access)));
|
||||
end case;
|
||||
Expand_Fpt_Attribute
|
||||
(N, Pkg, Name_Valid,
|
||||
New_List (
|
||||
Make_Attribute_Reference (Loc,
|
||||
Prefix => Unchecked_Convert_To (Ftp, Pref),
|
||||
Attribute_Name => Name_Unrestricted_Access)));
|
||||
end if;
|
||||
|
||||
-- One more task, we still need a range check. Required
|
||||
-- only if we have a constraint, since the Valid routine
|
||||
|
|
|
|||
|
|
@ -74,9 +74,9 @@ package Inline is
|
|||
-- must be inhibited.
|
||||
|
||||
Current_Sem_Unit : Unit_Number_Type;
|
||||
-- The semantic unit within which the instantiation is found. Must
|
||||
-- be restored when compiling the body, to insure that internal enti-
|
||||
-- ties use the same counter and are unique over spec and body.
|
||||
-- The semantic unit within which the instantiation is found. Must be
|
||||
-- restored when compiling the body, to insure that internal entities
|
||||
-- use the same counter and are unique over spec and body.
|
||||
|
||||
Scope_Suppress : Suppress_Record;
|
||||
Local_Suppress_Stack_Top : Suppress_Stack_Entry_Ptr;
|
||||
|
|
|
|||
|
|
@ -879,9 +879,9 @@ package Sinfo is
|
|||
-- Present in subprogram declarations. Denotes analyzed but unexpanded
|
||||
-- body of subprogram, to be used when inlining calls. Present when the
|
||||
-- subprogram has an Inline pragma and inlining is enabled. If the
|
||||
-- declaration is completed by a renaming_as_body, and the renamed en-
|
||||
-- tity is a subprogram, the Body_To_Inline is the name of that entity,
|
||||
-- which is used directly in later calls to the original subprogram.
|
||||
-- declaration is completed by a renaming_as_body, and the renamed entity
|
||||
-- is a subprogram, the Body_To_Inline is the name of that entity, which
|
||||
-- is used directly in later calls to the original subprogram.
|
||||
|
||||
-- Body_Required (Flag13-Sem)
|
||||
-- A flag that appears in the N_Compilation_Unit node indicating that
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue