2019-08-13 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/90561
* trans.h (gfc_evaluate_now_function_scope): New function.
* trans.c (gfc_evaluate_now_function_scope): New function.
* trans-expr.c (gfc_trans_assignment): Use it.
2019-08-13 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/90561
* gfortran.dg/deferred_character_34.f90: New test.
From-SVN: r274383
* call.c (null_ptr_cst_p): Update quote from the standard.
* decl.c (check_default_argument): Don't return nullptr when the arg
has side-effects.
* g++.dg/cpp0x/nullptr42.C: New test.
From-SVN: r274382
* rtlanal.c (tablejump_casesi_pattern): New function, to
determine if a tablejump insn is a casesi dispatcher. Extracted
from patch_jump_insn.
* rtl.h (tablejump_casesi_pattern): Declare.
* cfgrtl.c (patch_jump_insn): Use it.
* dwarf2cfi.c (create_trace_edges): Use it.
testsuite/
* gnat.dg/casesi.ad[bs], test_casesi.adb: New test.
From-SVN: r274377
PR81800 is about the lrint inline giving spurious FE_INEXACT exceptions.
The previous change for PR81800 didn't fix this: when lrint is disabled
in the backend, the midend will simply use llrint. This actually makes
things worse since llrint now also ignores FE_INVALID exceptions!
The fix is to disable lrint/llrint on double if the size of a long is
smaller (ie. ilp32).
gcc/
PR target/81800
* gcc/config/aarch64/aarch64.md (lrint): Disable lrint pattern if GPF
operand is larger than a long int.
testsuite/
PR target/81800
* gcc.target/aarch64/no-inline-lrint_3.c: New test.
From-SVN: r274376
If there's no SVE instruction to load a given constant directly, this
patch instead tries to use an Advanced SIMD constant move and then
duplicates the constant to fill an SVE vector. The main use of this
is to support constants in which each byte is in { 0, 0xff }.
Also, the patch prefers a simple integer move followed by a duplicate
over a load from memory, like we already do for Advanced SIMD. This is
a useful option to have and would be easy to turn off via a tuning
parameter if necessary.
The patch also extends the handling of wide LD1Rs to big endian,
whereas previously we punted to a full LD1RQ.
2019-08-13 Richard Sandiford <richard.sandiford@arm.com>
gcc/
* machmode.h (opt_mode::else_mode): New function.
(opt_mode::else_blk): Use it.
* config/aarch64/aarch64-protos.h (aarch64_vq_mode): Declare.
(aarch64_full_sve_mode, aarch64_sve_ld1rq_operand_p): Likewise.
(aarch64_gen_stepped_int_parallel): Likewise.
(aarch64_stepped_int_parallel_p): Likewise.
(aarch64_expand_mov_immediate): Remove the optional gen_vec_duplicate
argument.
* config/aarch64/aarch64.c
(aarch64_expand_sve_widened_duplicate): Delete.
(aarch64_expand_sve_dupq, aarch64_expand_sve_ld1rq): New functions.
(aarch64_expand_sve_const_vector): Rewrite to handle more cases.
(aarch64_expand_mov_immediate): Remove the optional gen_vec_duplicate
argument. Use early returns in the !CONST_INT_P handling.
Pass all SVE data vectors to aarch64_expand_sve_const_vector rather
than handling some inline.
(aarch64_full_sve_mode, aarch64_vq_mode): New functions, split out
from...
(aarch64_simd_container_mode): ...here.
(aarch64_gen_stepped_int_parallel, aarch64_stepped_int_parallel_p)
(aarch64_sve_ld1rq_operand_p): New functions.
* config/aarch64/predicates.md (descending_int_parallel)
(aarch64_sve_ld1rq_operand): New predicates.
* config/aarch64/constraints.md (UtQ): New constraint.
* config/aarch64/aarch64.md (UNSPEC_REINTERPRET): New unspec.
* config/aarch64/aarch64-sve.md (mov<SVE_ALL:mode>): Remove the
gen_vec_duplicate from call to aarch64_expand_mov_immediate.
(@aarch64_sve_reinterpret<mode>): New expander.
(*aarch64_sve_reinterpret<mode>): New pattern.
(@aarch64_vec_duplicate_vq<mode>_le): New pattern.
(@aarch64_vec_duplicate_vq<mode>_be): Likewise.
(*sve_ld1rq<Vesize>): Replace with...
(@aarch64_sve_ld1rq<mode>): ...this new pattern.
gcc/testsuite/
* gcc.target/aarch64/sve/init_2.c: Expect ld1rd to be used
instead of a full vector load.
* gcc.target/aarch64/sve/init_4.c: Likewise.
* gcc.target/aarch64/sve/ld1r_2.c: Remove constants that no longer
need to be loaded from memory.
* gcc.target/aarch64/sve/slp_2.c: Expect the same output for
big and little endian.
* gcc.target/aarch64/sve/slp_3.c: Likewise. Expect 3 of the
doubles to be moved via integer registers rather than loaded
from memory.
* gcc.target/aarch64/sve/slp_4.c: Likewise but for 4 doubles.
* gcc.target/aarch64/sve/spill_4.c: Expect 16-bit constants to be
loaded via an integer register rather than from memory.
* gcc.target/aarch64/sve/const_1.c: New test.
* gcc.target/aarch64/sve/const_2.c: Likewise.
* gcc.target/aarch64/sve/const_3.c: Likewise.
From-SVN: r274375
With -mcpu=generic the function alignment is currently 8, however almost all
supported cores prefer 16 or higher, so increase the default to 16:12.
This gives ~0.2% performance increase on SPECINT2017, while codesize is 0.12%
larger.
gcc/
* config/aarch64/aarch64.c (generic_tunings): Set function alignment to
16:12.
From-SVN: r274374
This patch makes predicate constants use the normal simd_immediate_info
machinery, rather than treating PFALSE and PTRUE as special cases.
This makes it easier to add other types of predicate constant later.
2019-08-13 Richard Sandiford <richard.sandiford@arm.com>
gcc/
* config/aarch64/aarch64-protos.h (aarch64_output_ptrue): Delete.
* config/aarch64/aarch64-sve.md (*aarch64_sve_mov<PRED_ALL:mode>):
Use a single Dn alternative instead of separate Dz and Dm
alternatives. Use aarch64_output_sve_move_immediate.
* config/aarch64/aarch64.c (aarch64_sve_element_int_mode): New
function.
(aarch64_simd_valid_immediate): Fill in the simd_immediate_info
for predicates too.
(aarch64_output_sve_mov_immediate): Handle predicate modes.
(aarch64_output_ptrue): Delete.
From-SVN: r274372
This patch tweaks the representation of SVE INDEX instructions in
simd_immediate_info so that it's easier to add new types of
constant on top.
2019-08-13 Richard Sandiford <richard.sandiford@arm.com>
gcc/
* config/aarch64/aarch64.c (simd_immediate_info::insn_type): Add
INDEX.
(simd_immediate_info::value, simd_immediate_info::step)
(simd_immediate_info::modifier, simd_immediate_info::shift): Replace
with...
(simd_immediate_info::u): ...this new union.
(simd_immediate_info::simd_immediate_info): Update accordingly.
(aarch64_output_simd_mov_immediate): Likewise.
(aarch64_output_sve_mov_immediate): Likewise.
From-SVN: r274371
aarch64_classify_vector_mode used properties of a mode to test whether
the mode was a single Advanced SIMD vector, a single SVE vector, or a
tuple of SVE vectors. That works well for current trunk and is simpler
than checking for modes by name.
However, for the ACLE and for planned autovec improvements, we also
need partial SVE vector modes that hold:
- half of the available 32-bit elements
- a half or quarter of the available 16-bit elements
- a half, quarter, or eighth of the available 8-bit elements
These should be packed in memory and unpacked in registers. E.g.
VNx2SI has half the number of elements of VNx4SI, and so is half the
size in memory. When stored in registers, each VNx2SI element occupies
the low 32 bits of a VNx2DI element, with the upper bits being undefined.
The upshot is that:
GET_MODE_SIZE (VNx4SImode) == 2 * GET_MODE_SIZE (VNx2SImode)
since GET_MODE_SIZE must always be the memory size. This in turn means
that for fixed-length SVE, some partial modes can have the same size as
Advanced SIMD modes. We then need to be specific about which mode we're
dealing with.
This patch prepares for that by switching based on the mode instead
of querying properties.
A later patch makes sure that Advanced SIMD modes always win over
partial SVE vector modes in normal queries.
2019-08-13 Richard Sandiford <richard.sandiford@arm.com>
gcc/
* config/aarch64/aarch64.c (aarch64_classify_vector_mode): Switch
based on the mode instead of testing properties of it.
From-SVN: r274368
Some indexed SVE FCMLA operations have a 3-bit register field that
requires one of Z0-Z7. This patch adds a public "y" constraint for that.
The patch also documents "x", which is again intended to be a public
constraint.
2019-08-13 Richard Sandiford <richard.sandiford@arm.com>
gcc/
* doc/md.texi: Document the x and y constraints for AArch64.
* config/aarch64/aarch64.h (FP_LO8_REGNUM_P): New macro.
(FP_LO8_REGS): New reg_class.
(REG_CLASS_NAMES, REG_CLASS_CONTENTS): Add an entry for FP_LO8_REGS.
* config/aarch64/aarch64.c (aarch64_hard_regno_nregs)
(aarch64_regno_regclass, aarch64_class_max_nregs): Handle FP_LO8_REGS.
* config/aarch64/predicates.md (aarch64_simd_register): Use
FP_REGNUM_P instead of checking the classes manually.
* config/aarch64/constraints.md (y): New constraint.
gcc/testsuite/
* gcc.target/aarch64/asm-x-constraint-1.c: New test.
* gcc.target/aarch64/asm-y-constraint-1.c: Likewise.
From-SVN: r274367
The Advanced SIMD and SVE permute patterns both split the permute
operation into a base name and a hilo suffix. That works well, but it
means that for "@" patterns, we need to pass the permute code twice,
once for the base name and once for the suffix.
Having a unified name avoids that and also makes the definitions
slightly simpler.
2019-08-13 Richard Sandiford <richard.sandiford@arm.com>
gcc/
* config/aarch64/iterators.md (perm_insn): Include the "1"/"2" suffix.
(perm_hilo): Remove UNSPEC_ZIP*, UNSEPC_TRN* and UNSPEC_UZP*.
* config/aarch64/aarch64-simd.md
(aarch64_<PERMUTE:perm_insn><PERMUTE:perm_hilo><mode>): Rename to..
(aarch64_<PERMUTE:perm_insn><mode>): ...this and remove perm_hilo
from the asm template.
* config/aarch64/aarch64-sve.md
(aarch64_<perm_insn><perm_hilo><PRED_ALL:mode>): Rename to..
(aarch64_<perm_insn><PRED_ALL:mode>): ...this and remove perm_hilo
from the asm template.
(aarch64_<perm_insn><perm_hilo><SVE_ALL:mode>): Rename to..
(aarch64_<perm_insn><SVE_ALL:mode>): ...this and remove perm_hilo
from the asm template.
* config/aarch64/aarch64-simd-builtins.def: Update comment.
From-SVN: r274366
Update the PRNG from xorshift1024* to xoshiro256** by the same
author. For details see
http://prng.di.unimi.it/
and the paper at
https://arxiv.org/abs/1805.01407
Also the seeding is slightly improved, by reading only 8 bytes from
the operating system and using the simple splitmix64 PRNG to fill in
the rest of the PRNG state (as recommended by the xoshiro author),
instead of reading the entire state from the OS.
Regtested on x86_64-pc-linux-gnu, Ok for trunk?
gcc/fortran/ChangeLog:
2019-08-13 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/91414
* check.c (gfc_check_random_seed): Reduce seed_size.
* intrinsic.texi (RANDOM_NUMBER): Update to match new PRNG.
gcc/testsuite/ChangeLog:
2019-08-13 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/91414
* gfortran.dg/random_seed_1.f90: Update to match new seed size.
libgfortran/ChangeLog:
2019-08-13 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/91414
* intrinsics/random.c (prng_state): Update state struct.
(master_state): Update to match new size.
(get_rand_state): Update to match new PRNG.
(rotl): New function.
(xorshift1024star): Replace with prng_next.
(prng_next): New function.
(jump): Update for new PRNG.
(lcg_parkmiller): Replace with splitmix64.
(splitmix64): New function.
(getosrandom): Fix return value, simplify.
(init_rand_state): Use getosrandom only to get 8 bytes, splitmix64
to fill rest of state.
(random_r4): Update to new function and struct names.
(random_r8): Likewise.
(random_r10): Likewise.
(random_r16): Likewise.
(arandom_r4): Liekwise.
(arandom_r8): Likewise.
(arandom_r10): Likwewise.
(arandom_r16): Likewise.
(xor_keys): Reduce size to match new PRNG.
(random_seed_i4): Update to new function and struct names, remove
special handling of variable p used in previous PRNG.
(random_seed_i8): Likewise.
From-SVN: r274361
The component has been unused for a while. No functional changes.
2019-08-13 Eric Botcazou <ebotcazou@adacore.com>
gcc/ada/
* ali.ads (Linker_Option_Record): Remove Original_Pos component.
* ali.adb (Scan_ALI): Do not set it.
From-SVN: r274360
This extends the processing done for the derivation of private
discriminated types to concurrent types, which is now required because
this derivation is no longer redone when a subtype of the derived
concurrent type is built.
This increases the number of entities generated internally in the
compiler but this case is sufficiently rare as not to be a real concern.
2019-08-13 Eric Botcazou <ebotcazou@adacore.com>
gcc/ada/
* sem_ch3.adb (Build_Derived_Concurrent_Type): Add a couple of
local variables and use them. When the derived type fully
constrains the parent type, rewrite it as a subtype of an
implicit (unconstrained) derived type instead of the other way
around.
(Copy_And_Build): Deal with concurrent types and use predicates.
(Build_Derived_Private_Type): Build the full derivation if
needed for concurrent types too.
(Build_Derived_Record_Type): Add marker comment.
(Complete_Private_Subtype): Use predicates.
gcc/testsuite/
* gnat.dg/discr56.adb, gnat.dg/discr56.ads,
gnat.dg/discr56_pkg1.adb, gnat.dg/discr56_pkg1.ads,
gnat.dg/discr56_pkg2.ads: New testcase.
From-SVN: r274359
This patch adds an RM reference for the rule that in a generic body a
type extension cannot have ancestors that are generic formal types. The
patch also extends the check to interface progenitors that may appear in
a derived type declaration or private extension declaration.
2019-08-13 Ed Schonberg <schonberg@adacore.com>
gcc/ada/
* sem_ch3.adb (Check_Generic_Ancestor): New subprogram,
aubsidiary to Build_Derived_Record_Type. to enforce the rule
that a type extension declared in a generic body cznnot have an
ancestor that is a generic formal (RM 3.9.1 (4/2)). The rule
applies to all ancestors of the type, including interface
progenitors.
gcc/testsuite/
* gnat.dg/tagged4.adb: New testcase.
From-SVN: r274358
This change was initially aimed at fixing a spurious instantiation error
due to a disambiguation issue which happens when a generic unit with two
formal type parameters is instantiated on a single actual type that is
private.
The compiler internally sets the Is_Generic_Actual_Type flag on the
actual subtypes built for the instantiation in order to ease the
disambiguation, but it would fail to set it on the full view if the
subtypes are private. The change makes it so that the flag is properly
set and reset on the full view in this case.
But this uncovered an issue in Subtypes_Statically_Match, which was
relying on a stalled Is_Generic_Actual_Type flag set on a full view
outside of the instantiation to return a positive answer. This bypass
was meant to solve an issue arising with a private discriminated record
type whose completion is a discriminated record type itself derived from
a private discriminated record type, which is used as actual type in an
instantiation in another unit, and the instantiation is used in a child
unit of the original unit. In this case, the private and full views of
the generic actual type are swapped in the child unit, but there was a
mismatch between the chain of full and underlying full views of the
private discriminated record type and that of the generic actual type.
This secondary issue is solved by avoiding to skip the full view in the
preparation of the completion of the private subtype and by directly
constraining the underlying full view of the full view of the base type
instead of building an underlying full view from scratch.
2019-08-13 Eric Botcazou <ebotcazou@adacore.com>
gcc/ada/
* sem_ch3.adb (Build_Underlying_Full_View): Delete.
(Complete_Private_Subtype): Do not set the full view on the
private subtype here. If the full base is itself derived from
private, do not re-derive the parent type but instead constrain
an existing underlying full view.
(Prepare_Private_Subtype_Completion): Do not get to the
underlying full view, if any. Set the full view on the private
subtype here.
(Process_Full_View): Likewise.
* sem_ch12.adb (Check_Generic_Actuals): Also set
Is_Generic_Actual_Type on the full view if the type of the
actual is private.
(Restore_Private_Views): Also reset Is_Generic_Actual_Type on
the full view if the type of the actual is private.
* sem_eval.adb (Subtypes_Statically_Match): Remove bypass for
generic actual types.
gcc/testsuite/
* gnat.dg/generic_inst10.adb, gnat.dg/generic_inst10_pkg.ads:
New testcase.
From-SVN: r274357
When a record type with an an access to class-wide type discriminant
has aspect Implicit_Dereference, and the discriminant is used as the
controlling argument of a dispatching call, the compiler may generate
wrong code to dispatch the call.
2019-08-13 Javier Miranda <miranda@adacore.com>
gcc/ada/
* sem_res.adb (Resolve_Selected_Component): When the type of the
component is an access to a class-wide type and the type of the
context is an access to a tagged type the relevant type is that
of the component (since in such case we may need to generate
implicit type conversions or dispatching calls).
gcc/testsuite/
* gnat.dg/tagged3.adb, gnat.dg/tagged3_pkg.adb,
gnat.dg/tagged3_pkg.ads: New testcase.
From-SVN: r274356
An aggregate can be handled by the backend if it consists of static
constants of an elementary type, or null. If a component is a type
conversion we must preanalyze and resolve it to determine whether the
ultimate value is in one of these categories. Previously we did a full
analysis and resolution of the expression for the component, which could
lead to a removal of side-effects, which is semantically incorrect if
the expression includes functions with side-effects (e.g. a call to a
random generator).
2019-08-13 Ed Schonberg <schonberg@adacore.com>
gcc/ada/
* exp_aggr.adb (Aggr_Assignment_OK_For_Backend): Preanalyze
expression, rather do a full analysis, to prevent unwanted
removal of side effects which mask the intent of the expression.
gcc/testsuite/
* gnat.dg/aggr27.adb: New testcase.
From-SVN: r274355
This is a small cleanup in the inlining machinery of the front-end
dealing with back-end inlining. It should save a few cycles at -O0 by
stopping it from doing useless work. No functional changes.
2019-08-13 Eric Botcazou <ebotcazou@adacore.com>
gcc/ada/
* exp_ch6.adb: Remove with and use clauses for Sem_Ch12.
(Expand_Call_Helper): Swap the back-end inlining case and the
special front-end expansion case. In back-end inlining mode, do
not invoke Add_Inlined_Body unless the call may be inlined.
* inline.ads (Add_Pending_Instantiation): New function moved
from...
* inline.adb (Add_Inlined_Body): Simplify comment. Turn test on
the enclosing unit into assertion.
(Add_Pending_Instantiation): New function moved from...
* sem_ch12.ads (Add_Pending_Instantiation): ...here.
* sem_ch12.adb (Add_Pending_Instantiation): ...here.
From-SVN: r274353
This fixes a bogus style check failure for long lines in rare cases
where the compiler is invoked, with a -gnatyX switch where X is neither
'm' nor 'M', on a unit which contains "with" clauses for other units
that contain a pragma Style_Checks (Off).
2019-08-13 Eric Botcazou <ebotcazou@adacore.com>
gcc/ada/
* sem.adb (Do_Analyze): Recompute Style_Check_Max_Line_Length
after restoring Style_Max_Line_Length.
From-SVN: r274352
This patch properly diagnoses a conformance error between a formal
subprogram and the corresponding actual, when the instance is that of a
child unit that is instantiated as a compilation unit. The error is
normally suppressed on an instantiation nested within another generic,
given that analysis of the enclosing generic will have performed the
conformance check on the nested instance already. In the case of a
child unit, its instantiation requires an explicit check if it is a
compilation unit, because it has not been analyzed in the context of the
parent generic.
Compiling test.adb must yield:
container-list.ads:3:01: instantiation error at new_container_g-list_g.ads:12
container-list.ads:3:01: not mode conformant with declaration at types.ads:5
container-list.ads:3:01: mode of "Self" does not match
----
with New_Container_G.List_G;
pragma Elaborate_All (New_Container_G.List_G);
package Container.List is new Container.List_G (Init => Types.Init_Object);
with Types;
with Erreur;
with New_Container_G;
pragma Elaborate_All (New_Container_G);
package Container is new New_Container_G (
Element_T => Types.Integer_T,
Pos_Range_T => Types.Integer_Idx_T,
Container_Name => Erreur.None);
package Erreur is
type Container_Name_T is (None, Everything);
end;
----
package body New_Container_G.List_G is
function Get_Element_At_Pos
(Self : access List_T;
Pos : in Index_Range_T)
return Element_Ptr is
begin
if not Self.T_Status (Pos) then
Erreur.Treat_Container_Error
(Error_Name => Erreur.Element_Not_Valid,
Container_Name => Container_Name,
Procedure_Name => Erreur.Get_Element_Ptr_At_Pos,
Context => Erreur.Null_Context_C);
end if;
return Pos;
end Get_Element_At_Pos;
function Get_Element_At_Pos
(Self : in List_T;
Pos : in Index_Range_T)
return Element_T is
begin
if not Self.T_Status (Pos) then
Erreur.Treat_Container_Error
(Error_Name => Erreur.Element_Not_Valid,
Container_Name => Container_Name,
Procedure_Name => Erreur.Get_Element_At_Pos,
Context => Erreur.Null_Context_C);
end if;
return Self.Data (Pos);
end Get_Element_At_Pos;
procedure Add_New
(Self : in out List_T;
Pos : out Pos_Range_T) is
Free_Found : Boolean := False;
begin
if Self.First_Free = Rbc_Constants.Null_Pos then
Pos := Rbc_Constants.Null_Pos;
else
Self.Size := Self.Size + 1;
Self.T_Status (Self.First_Free) := True;
Pos := Self.First_Free;
Init (Self.Data (Pos));
if Self.First_Relevant not in
Rbc_Constants.Null_Pos + 1 .. Self.First_Free
then
Self.First_Relevant := Self.First_Free;
end if;
while not (Free_Found or Self.First_Free = Rbc_Constants.Null_Pos) loop
if Self.First_Free = Pos_Range_T'Last then
Self.First_Free := Rbc_Constants.Null_Pos;
else
Self.First_Free := Self.First_Free + 1;
if not Self.T_Status (Self.First_Free) then
Free_Found := True;
end if;
end if;
end loop;
end if;
end Add_New;
procedure Add_New_At_Pos
(Self : in out List_T;
Pos : in out Index_Range_T) is
Free_Found : Boolean := False;
begin
if Self.T_Status (Pos) then
Erreur.Treat_Container_Error
(Error_Name => Erreur.Element_Not_Valid,
Container_Name => Container_Name,
Procedure_Name => Erreur.Add_New_At_Pos,
Context => Erreur.Null_Context_C);
else
Self.Size := Self.Size + 1;
Self.T_Status (Pos) := True;
Init (Self.Data (Pos));
if Self.First_Relevant = Rbc_Constants.Null_Pos
or Pos < Self.First_Relevant
then
Self.First_Relevant := Pos;
end if;
if Self.First_Free = Pos
then
-- Look for a new First_Free
while not (Free_Found or Self.First_Free = Rbc_Constants.Null_Pos) loop
if Self.First_Free = Pos_Range_T'Last then
Self.First_Free := Rbc_Constants.Null_Pos;
else
Self.First_Free := Self.First_Free + 1;
if not Self.T_Status (Self.First_Free) then
Free_Found := True;
end if;
end if;
end loop;
end if;
-------------------------------------------------------------------------
end if;
end Add_New_At_Pos;
procedure Clear (Self : out List_T) is
begin
Self.T_Status := (others => False);
Self.First_Free := Init_First_Free;
Self.First_Relevant := Rbc_Constants.Null_Pos;
Self.Size := Empty;
end Clear;
procedure Remove_Element_At_Pos
(Self : in out List_T;
Pos : in Index_Range_T) is
Relevant_Found : Boolean := False;
begin
-- REMOVE ITEM IF VALID ---------------------------------------------
if not Self.T_Status (Pos) then
Erreur.Treat_Container_Error
(Error_Name => Erreur.Element_Not_Valid,
Container_Name => Container_Name,
Procedure_Name => Erreur.Remove_Element_At_Pos,
Context => Erreur.Null_Context_C);
end if;
Self.Size := Self.Size - 1;
Self.T_Status (Pos) := False;
if Self.First_Free not in Rbc_Constants.Null_Pos + 1 .. Pos then
Self.First_Free := Pos;
end if;
-- UPDATE FIRST_RELEVANT IF NECESSARY -----------------------------------
if Self.First_Relevant = Pos then
while
not (Relevant_Found or Self.First_Relevant = Rbc_Constants.Null_Pos)
loop
if Self.First_Relevant = Pos_Range_T'Last then
Self.First_Relevant := Rbc_Constants.Null_Pos;
else
Self.First_Relevant := Self.First_Relevant + 1;
if Self.T_Status (Self.First_Relevant) then
Relevant_Found := True;
end if;
end if;
end loop;
end if;
-------------------------------------------------------------------------
end Remove_Element_At_Pos;
procedure Next
(It : in out Iterator_T;
Self : in List_T) is
Relevant_Found : Boolean := False;
begin
if It = Rbc_Constants.Null_Pos then
Erreur.Treat_Container_Error
(Error_Name => Erreur.Iterator_Not_Valid,
Container_Name => Container_Name,
Procedure_Name => Erreur.Next,
Context => Erreur.Null_Context_C);
end if;
while not (Relevant_Found or It = Rbc_Constants.Null_Pos) loop
if It = Pos_Range_T'Last then
It := Rbc_Constants.Null_Pos;
else
It := It + 1;
if Self.T_Status (It) then
Relevant_Found := True;
end if;
end if;
end loop;
end Next;
function New_Iterator
(Self : in List_T)
return Iterator_T is
begin
return Self.First_Relevant;
end New_Iterator;
function Get
(It : in Iterator_T;
Self : in List_T)
return Element_Ptr is
begin
if It = Rbc_Constants.Null_Pos or else not Self.T_Status (It) then
Erreur.Treat_Container_Error
(Error_Name => Erreur.Iterator_Not_Valid,
Container_Name => Container_Name,
Procedure_Name => Erreur.Get_Ptr,
Context => Erreur.Null_Context_C);
end if;
return It;
end Get;
function Get
(It : in Iterator_T;
Self : in List_T)
return Element_T is
begin
if It = Rbc_Constants.Null_Pos or else not Self.T_Status (It) then
Erreur.Treat_Container_Error
(Error_Name => Erreur.Iterator_Not_Valid,
Container_Name => Container_Name,
Procedure_Name => Erreur.Get,
Context => Erreur.Null_Context_C);
end if;
return Self.Data (It);
end Get;
function Getstatus
(Self : in List_T;
Pos : in Index_Range_T)
return Boolean is
begin
return Self.T_Status (Pos);
end Getstatus;
function Init_First_Free return Pos_Range_T is
First_Free_Value : Pos_Range_T;
begin
if Full = Rbc_Constants.Null_Pos then
-- size is 0
First_Free_Value := Rbc_Constants.Null_Pos;
else
-- first free cell index is 1
First_Free_Value := Index_Range_T'First;
end if;
return First_Free_Value;
end Init_First_Free;
end New_Container_G.List_G;
with Rbc_Constants;
generic
with procedure Init (Self : out Element_T);
package New_Container_G.List_G is
type List_T is new Container_T with private;
function Get_Element_At_Pos
(Self : access List_T;
Pos : in Index_Range_T)
return Element_Ptr;
function Get_Element_At_Pos
(Self : in List_T;
Pos : in Index_Range_T)
return Element_T;
procedure Add_New
(Self : in out List_T;
Pos : out Pos_Range_T);
procedure Add_New_At_Pos
(Self : in out List_T;
Pos : in out Index_Range_T);
procedure Clear (Self : out List_T);
procedure Remove_Element_At_Pos
(Self : in out List_T;
Pos : in Index_Range_T);
procedure Next
(It : in out Iterator_T;
Self : in List_T);
function New_Iterator
(Self : in List_T)
return Iterator_T;
function Get
(It : in Iterator_T;
Self : in List_T)
return Element_Ptr;
function Get
(It : in Iterator_T;
Self : in List_T)
return Element_T;
function Getstatus
(Self : in List_T;
Pos : in Index_Range_T)
return Boolean;
private
function Init_First_Free return Pos_Range_T;
type Status_Array_T is array (Index_Range_T) of Boolean;
type List_T is new Container_T with
record
T_Status : Status_Array_T := (others => False);
First_Free : Pos_Range_T := Init_First_Free;
First_Relevant : Pos_Range_T := Rbc_Constants.Null_Pos;
end record;
end New_Container_G.List_G;
with Types_Alstom; use Types_Alstom;
with Rbc_Constants;
package body New_Container_G is
function Done
(It : in Iterator_T;
Self : in Container_T)
return Boolean is
pragma Unreferenced (Self);
Report : Boolean;
begin
if It = Rbc_Constants.Null_Pos then
Report := True;
else
Report := False;
end if;
return Report;
end Done;
procedure Execute (Self : in out Container_T'class;
This_Proc : in Proc_Access_T) is
begin
for I in Self.Data'First .. Self.Size loop
This_Proc (Self.Data (I));
end loop;
end Execute;
procedure Execute (Self : in out Container_T'class;
This_Proc : in Proc_Idx_Access_T) is
begin
for I in Self.Data'First .. Self.Size loop
This_Proc (Self.Data (I), I);
end loop;
end Execute;
function Selected_Subset
(Self : in Container_T'Class;
Ref : in Reference_T)
return Element_Set_T is
Set : Element_Set_T := (others => Rbc_Constants.Null_Pos);
Current : Pos_Range_T := 0;
begin
for I in Self.Data'Range loop
if Getstatus (Self, I) and then Is_Selected
(Elem => Self.Data (I),
Ref => Ref)
then
Current := Current + 1;
Set (Current) := I;
end if;
end loop;
return Set;
end Selected_Subset;
function Selected_Element
(Self : in Container_T'Class;
Ref : in Reference_T)
return Element_Ptr is
begin
for I in Self.Data'Range loop
if Getstatus (Self, I) and then Is_Selected
(Elem => Self.Data (I),
Ref => Ref)
then
return I;
end if;
end loop;
return Rbc_Constants.Null_Pos;
end Selected_Element;
function Getsize
(Self : in Container_T)
return Pos_Range_T is
begin
return Self.Size;
end Getsize;
end New_Container_G;
with Types;
with Erreur;
generic
-- Type of element to be stored
type Element_T is private;
type Pos_Range_T is range <>;
Container_Name : in Erreur.Container_Name_T;
package New_Container_G is
pragma Unreferenced (Container_Name);
subtype Element_Acc_T is Pos_Range_T;
subtype Element_Ptr is Element_Acc_T; -- for compatibility
subtype Iterator_T is Pos_Range_T;
subtype Index_Range_T is Pos_Range_T range 1 .. Pos_Range_T'Last;
type Element_Set_T is array (Index_Range_T) of Element_Ptr;
Full : constant Pos_Range_T := Pos_Range_T'Last;
Empty : constant Pos_Range_T := Pos_Range_T'First;
type Element_Array_T is array (Index_Range_T) of Element_T;
type Container_T is abstract tagged
record
Data : Element_Array_T;
Size : Pos_Range_T := Empty;
end record;
function Get
(It : in Iterator_T;
Self : in Container_T)
return Element_Ptr is abstract;
function Get
(It : in Iterator_T;
Self : in Container_T)
return Element_T is abstract;
procedure Next
(It : in out Iterator_T;
Self : in Container_T) is abstract;
function Done
(It : in Iterator_T;
Self : in Container_T)
return Boolean;
type Proc_Access_T is access procedure (Elem : in out Element_T);
type Proc_Idx_Access_T is access procedure (Elem : in out Element_T;
Idx : in Index_Range_T);
procedure Execute (Self : in out Container_T'class;
This_Proc : in Proc_Access_T);
procedure Execute (Self : in out Container_T'class;
This_Proc : in Proc_Idx_Access_T);
function Getstatus
(Self : in Container_T;
Pos : in Index_Range_T)
return Boolean is abstract;
generic
-- Type of the parameter of the is_selected () function.
type Reference_T is private;
with function Is_Selected
(Elem : in Element_T;
Ref : in Reference_T)
return Boolean;
function Selected_Subset
(Self : in Container_T'Class;
Ref : in Reference_T)
return Element_Set_T;
generic
-- Type of the parameter of the is_selected () function.
type Reference_T is private;
with function Is_Selected
(Elem : in Element_T;
Ref : in Reference_T)
return Boolean;
function Selected_Element
(Self : in Container_T'Class;
Ref : in Reference_T)
return Element_Ptr;
function Getsize
(Self : in Container_T)
return Pos_Range_T;
end New_Container_G;
----
package Rbc_Constants is
Null_Pos : constant := 0;
Irrelevant_Id : constant String := " ";
Nmax_Mc_Bits : constant := 32;
end Rbc_Constants;
with Ada.Text_IO;
with Types;
with Container.List;
procedure Test is
List : Container.List.List_T;
Pos : Types.Integer_Idx_T;
begin
Container.List.Add_New (Self => List,
Pos => Pos);
Ada.Text_IO.Put_Line ("no exception raised");
end Test;
package Types is
type Integer_T is range -1000 .. 1000;
type Integer_Idx_T is range 0 .. 100;
procedure Init_Object (Elem : in Integer_T);
end Types;
2019-08-13 Ed Schonberg <schonberg@adacore.com>
gcc/ada/
* sem_ch8.adb (Analyze_Subprogram_Renaming): Do no suppress mode
conformance checks on child unit instance that is a compilation
unit.
From-SVN: r274350
Exceptions declared within subprograms are associated with objects
allocated statically (at the global level), and it's helpful for the
LLVM compiler (and likely others, such as CCG) if the exception name is
fully qualified, to avoid link name clashes (gcc-based GNAT has always
"uniquified" these names). GNAT was using the simple name for local
exceptions (as for other local objects), but it now uses fully qualified
names for all exceptions.
When compiled with the command:
gcc -c -gnatG local_exception.adb | grep "local_exception__local_exc"
the following output is generated for the test further below:
local_exception__local_exc : static exception := (
local_exception__local_exc'unrestricted_access));
procedure Local_Exception is
Local_Exc : exception;
begin
null;
end Local_Exception;
2019-08-13 Gary Dismukes <dismukes@adacore.com>
gcc/ada/
* exp_dbug.adb (Fully_Qualify_Name): Add full name qualification
for the E_Exception case.
From-SVN: r274349
The compiler may crash when compiling array aggregates where the
computation of the size produces a very large number that overflows
(possibly producing a small result), such as with an aggregate of a type
that is an array of arrays, where each array range has close to
Integer'Last elements. That can lead to Aggr_Size_OK returning
incorrectly returning True, following on to allocating a very large
array in function Flatten that blows the stack. The size computation
was being performed using type Int, so this was changed to use universal
arithmetic.
2019-08-13 Gary Dismukes <dismukes@adacore.com>
gcc/ada/
* exp_aggr.adb (Aggr_Size_OK): Compute the aggregate size using
universal arithmetic, to avoid situations where the size
computation overflows.
gcc/testsuite/
* gnat.dg/aggr26.adb: New testcase.
From-SVN: r274348
This patch modifies the behavior of -gnatR4 so that representation
information for bit and scalar storage order gets displayed in all cases
and not just when defaults are overriden.
------------
-- Source --
------------
-- pkg.ads
package Pkg is
type Root is tagged record
Data0 : Integer;
end record;
type Derived is new Root with record
Data1 : Integer;
end record;
end Pkg;
-----------------
-- Compilation --
-----------------
$ gnatmake -gnatR4 pkg.ads
Representation information for unit Pkg (spec)
----------------------------------------------
for Root'Size use 128;
for Root'Alignment use 8;
for Root use record
Data0 at 8 range 0 .. 31;
end record;
for Root'Bit_Order use System.Low_Order_First;
for Root'Scalar_Storage_Order use System.Low_Order_First;
for Trootc'Size use 0;
for Trootc'Alignment use 0;
for Trootc use record
end record;
for Trootc'Bit_Order use System.Low_Order_First;
for Trootc'Scalar_Storage_Order use System.Low_Order_First;
for Derived'Size use 192;
for Derived'Alignment use 8;
for Derived use record
Data0 at 8 range 0 .. 31;
Data1 at 16 range 0 .. 31;
end record;
for Derived'Bit_Order use System.Low_Order_First;
for Derived'Scalar_Storage_Order use System.Low_Order_First;
for Tderivedc'Size use 0;
for Tderivedc'Alignment use 0;
for Tderivedc use record
Data0 at 8 range 0 .. 31;
Data1 at 16 range 0 .. 31;
end record;
for Tderivedc'Bit_Order use System.Low_Order_First;
for Tderivedc'Scalar_Storage_Order use System.Low_Order_First;i
2019-08-13 Justin Squirek <squirek@adacore.com>
gcc/ada/
* repinfo.adb (List_Scalar_Storage_Order): Modify conditionals
for displaying ordering to always be triggered when -gnatR4 is
in effect.
From-SVN: r274347
This patch implements AI12-0164-1 for the aspect/pragma
Max_Entry_Queue_Length. Previously, the GNAT specific pragma
Max_Queue_Length fulfilled this role, but was not named to match the
standard and thus was insufficent.
------------
-- Source --
------------
-- pass.ads
with System;
package Pass is
SOMETHING : constant Integer := 5;
Variable : Boolean := False;
protected type Protected_Example is
entry A (Item : Integer)
with Max_Entry_Queue_Length => 2; -- OK
entry B (Item : Integer);
pragma Max_Entry_Queue_Length (SOMETHING); -- OK
entry C (Item : Integer); -- OK
entry D (Item : Integer)
with Max_Entry_Queue_Length => 4; -- OK
entry D (Item : Integer; Item_B : Integer)
with Max_Entry_Queue_Length => Float'Digits; -- OK
entry E (Item : Integer);
pragma Max_Entry_Queue_Length (SOMETHING * 2); -- OK
entry E (Item : Integer; Item_B : Integer);
pragma Max_Entry_Queue_Length (11); -- OK
entry F (Item : Integer; Item_B : Integer);
pragma Pre (Variable = True);
pragma Max_Entry_Queue_Length (11); -- OK
entry G (Item : Integer; Item_B : Integer)
with Pre => (Variable = True),
Max_Entry_Queue_Length => 11; -- OK
private
Data : Boolean := True;
end Protected_Example;
Prot_Ex : Protected_Example;
end Pass;
-- fail.ads
package Fail is
-- Not near entry
pragma Max_Entry_Queue_Length (40); -- ERROR
-- Task type
task type Task_Example is
entry Insert (Item : in Integer)
with Max_Entry_Queue_Length => 10; -- ERROR
-- Entry family in task type
entry A (Positive) (Item : in Integer)
with Max_Entry_Queue_Length => 10; -- ERROR
end Task_Example;
Task_Ex : Task_Example;
-- Aspect applied to protected type
protected type Protected_Failure_0
with Max_Entry_Queue_Length => 50 is -- ERROR
entry A (Item : Integer);
private
Data : Integer := 0;
end Protected_Failure_0;
Protected_Failure_0_Ex : Protected_Failure_0;
protected type Protected_Failure is
pragma Max_Entry_Queue_Length (10); -- ERROR
-- Duplicates
entry A (Item : Integer)
with Max_Entry_Queue_Length => 10; -- OK
pragma Max_Entry_Queue_Length (4); -- ERROR
entry B (Item : Integer);
pragma Max_Entry_Queue_Length (40); -- OK
pragma Max_Entry_Queue_Length (4); -- ERROR
entry C (Item : Integer)
with Max_Entry_Queue_Length => 10, -- OK
Max_Entry_Queue_Length => 40; -- ERROR
-- Duplicates with the same value
entry AA (Item : Integer)
with Max_Entry_Queue_Length => 10; -- OK
pragma Max_Entry_Queue_Length (10); -- ERROR
entry BB (Item : Integer);
pragma Max_Entry_Queue_Length (40); -- OK
pragma Max_Entry_Queue_Length (40); -- ERROR
entry CC (Item : Integer)
with Max_Entry_Queue_Length => 10, -- OK
Max_Entry_Queue_Length => 10; -- ERROR
-- On subprogram
procedure D (Item : Integer)
with Max_Entry_Queue_Length => 10; -- ERROR
procedure E (Item : Integer);
pragma Max_Entry_Queue_Length (4); -- ERROR
function F (Item : Integer) return Integer
with Max_Entry_Queue_Length => 10; -- ERROR
function G (Item : Integer) return Integer;
pragma Max_Entry_Queue_Length (4); -- ERROR
-- Bad parameters
entry H (Item : Integer)
with Max_Entry_Queue_Length => 0; -- ERROR
entry I (Item : Integer)
with Max_Entry_Queue_Length => -1; -- ERROR
entry J (Item : Integer)
with Max_Entry_Queue_Length => 16#FFFF_FFFF_FFFF_FFFF_FFFF#; -- ERROR
entry K (Item : Integer)
with Max_Entry_Queue_Length => False; -- ERROR
entry L (Item : Integer)
with Max_Entry_Queue_Length => "JUNK"; -- ERROR
entry M (Item : Integer)
with Max_Entry_Queue_Length => 1.0; -- ERROR
entry N (Item : Integer)
with Max_Entry_Queue_Length => Long_Integer'(3); -- ERROR
-- Entry family
entry O (Boolean) (Item : Integer)
with Max_Entry_Queue_Length => 5; -- ERROR
private
Data : Integer := 0;
end Protected_Failure;
I : Positive := 1;
Protected_Failure_Ex : Protected_Failure;
end Fail;
-- dtest.adb
with Ada.Text_IO; use Ada.Text_IO;
procedure Dtest is
protected Prot is
entry Wait;
pragma Max_Entry_Queue_Length (2);
procedure Wakeup;
private
Barrier : Boolean := False;
end Prot;
protected body Prot is
entry Wait when Barrier is
begin
null;
end Wait;
procedure Wakeup is
begin
Barrier := True;
end Wakeup;
end Prot;
task type T;
task body T is
begin
Put_Line ("Waiting...");
Prot.Wait;
exception
when others =>
Put_Line ("Got exception");
end T;
T1, T2 : T;
begin
delay 0.1;
Prot.Wait;
Put_Line ("Done");
exception
when others =>
Put_Line ("Main got exception");
Prot.Wakeup;
end Dtest;
----------------------------
-- Compilation and output --
----------------------------
& gcc -c -g -gnatDG pass.ads
& gcc -c -g fail.ads
& grep -c "(2, 5, 0, 4, 6, 10, 11, 11, 11)" pass.ads.dg
& gnatmake -g -q dtest
fail.ads:5:04: pragma "Max_Entry_Queue_Length" must apply to a protected entry
fail.ads:12:15: aspect "Max_Entry_Queue_Length" cannot apply to task entries
fail.ads:17:15: aspect "Max_Entry_Queue_Length" cannot apply to task entries
fail.ads:26:12: aspect "Max_Entry_Queue_Length" must apply to a protected entry
fail.ads:36:07: pragma "Max_Entry_Queue_Length" must apply to a protected entry
fail.ads:42:07: pragma "Max_Entry_Queue_Length" duplicates aspect declared at
line 41
fail.ads:46:07: pragma "Max_Entry_Queue_Length" duplicates pragma declared at
line 45
fail.ads:50:15: aspect "Max_Entry_Queue_Length" for "C" previously given at
line 49
fail.ads:56:07: pragma "Max_Entry_Queue_Length" duplicates aspect declared at
line 55
fail.ads:60:07: pragma "Max_Entry_Queue_Length" duplicates pragma declared at
line 59
fail.ads:64:15: aspect "Max_Entry_Queue_Length" for "CC" previously given at
line 63
fail.ads:69:15: aspect "Max_Entry_Queue_Length" must apply to a protected entry
fail.ads:72:07: pragma "Max_Entry_Queue_Length" must apply to a protected entry
fail.ads:75:15: aspect "Max_Entry_Queue_Length" must apply to a protected entry
fail.ads:78:07: pragma "Max_Entry_Queue_Length" must apply to a protected entry
fail.ads:83:35: entity for aspect "Max_Entry_Queue_Length" must be positive
fail.ads:86:35: entity for aspect "Max_Entry_Queue_Length" must be positive
fail.ads:89:35: entity for aspect "Max_Entry_Queue_Length" out of range of
Integer
fail.ads:92:35: expected an integer type
fail.ads:92:35: found type "Standard.Boolean"
fail.ads:95:35: expected an integer type
fail.ads:95:35: found a string type
fail.ads:98:35: expected an integer type
fail.ads:98:35: found type universal real
2019-08-13 Justin Squirek <squirek@adacore.com>
gcc/ada/
* aspects.adb, aspects.ads: Register new aspect.
* par-prag.adb (Prag): Register new pragma
* sem_ch13.adb (Analyze_Aspect_Specifications): Add processing
for new aspect similar to Aspect_Max_Entry_Queue_Length.
* sem_prag.adb, sem_prag.ads (Analyze_Pragma): Register new
pragma and set it to use the same processing as
Pragma_Max_Queue_Length.
* snames.ads-tmpl: Move definition of
Name_Max_Entry_Queue_Length so that it can be processed as a
pragma in addition to a restriction and add an entry for the
pragma itself.
From-SVN: r274346
In the special mode for GNATprove, subtypes should be declared for
allocators when constraints are used. This was done previously but it
does not work inside spec expressions, as the declaration is not
inserted and analyzed in the AST in that case, leading to a later crash
on an incomplete entity. Thus, no declaration should be created in such
a case, letting GNATprove later reject such code due to the use of an
allocator in an interfering context.
2019-08-13 Yannick Moy <moy@adacore.com>
gcc/ada/
* sem_ch4.adb (Analyze_Allocator): Do not insert subtype
declaration for allocator inside a spec expression.
gcc/testsuite/
* gnat.dg/allocator2.adb, gnat.dg/allocator2.ads: New testcase.
From-SVN: r274345
The special inlining for GNATprove should not inline calls inside record
types, used for the constraints of components.
There is no impact on compilation.
2019-08-13 Yannick Moy <moy@adacore.com>
gcc/ada/
* sem_res.adb (Resolve_Call): Do not inline calls inside record
types.
From-SVN: r274344
This fixes a spurious error given by the compiler for a call to a
subprogram which is the formal subprogram parameter of a generic
package, if the generic package is instantiated in the body of an
enclosing generic package with two formal types and two formal
subprogram parameter homonyms taking them, and this instantiation takes
one the two formal types as actual, and the enclosing generic package is
instantiated on the same actual type with a single actual subprogram
parameter, and the aforementioned call is overloaded.
In this case, the renaming generated for the actual subprogram parameter
in the nested instantiation is ambiguous and must be disambiguated using
the corresponding formal parameter of the enclosing instantiation,
otherwise a (sub)type mismatch is created and later subprogram
disambiguation is not really possible.
2019-08-13 Eric Botcazou <ebotcazou@adacore.com>
gcc/ada/
* sem_ch4.adb (Analyze_One_Call): Remove bypass for type
mismatch in nested instantiations.
* sem_ch8.adb (Find_Nearer_Entity): New function.
(Find_Renamed_Entity): Use it to disambiguate the candidates for
the renaming generated for an instantiation when it is
ambiguous.
gcc/testsuite/
* gnat.dg/generic_inst9.adb, gnat.dg/generic_inst9.ads,
gnat.dg/generic_inst9_pkg1-operator.ads,
gnat.dg/generic_inst9_pkg1.ads, gnat.dg/generic_inst9_pkg2.adb,
gnat.dg/generic_inst9_pkg2.ads: New testcase.
From-SVN: r274343
No impact on compilation.
2019-08-13 Eric Botcazou <ebotcazou@adacore.com>
gcc/ada/
* gnat1drv.adb (Adjust_Global_Switches): Do not set
Back_End_Inlining in ASIS mode either.
From-SVN: r274342
Despite the "dw" prefix on the name, the dwNumberOfBytesToMap argument
to MapViewOfFile was changed from DWORD to SIZE_T when 64bit Windows
came about.
This change adjusts the binding we have for it in System.Win32
accordingly. For consistency with established practice, an s-win32
specific version of size_t is introduced and g-sercom__mingw.adb is
adjusted to disambiguate between this new size_t and the one already
exposed in System.CRTL.
2019-08-13 Olivier Hainque <hainque@adacore.com>
gcc/ada/
* libgnat/s-win32.ads: Define size_t and fix the MapViewOfFile
binding to use it instead of DWORD for the dwNumberOfBytesToMap
argument.
* libgnat/g-sercom__mingw.adb (Read): State which definition of
size_t to fetch in call to Last_Index.
From-SVN: r274341
Complete the partial treatment that was started in r273405. Instead of
checking for the special case of nodes inside inlined bodies at the call
site, check for this condition inside the top-level procedures called
for dimensionality checking.
There is no impact on compilation.
2019-08-13 Yannick Moy <moy@adacore.com>
gcc/ada/
* sem_dim.adb (Analyze_Dimension,
Analyze_Dimension_Array_Aggregate, Analyze_Dimension_Call,
Analyze_Dimension_Extension_Or_Record_Aggregate): Return
immediately when inside an inlined body.
* sem_res.adb (Resolve_Call): Remove special checking now done
inside Analyze_Dimension_Call.
From-SVN: r274339
This patch modifies the behavior of anonymous allocator warnings so that
they no longer get triggered in the case of an object declaration at
library-level.
2019-08-13 Justin Squirek <squirek@adacore.com>
gcc/ada/
* exp_ch4.adb (Expand_N_Allocator): Add condition to detect
library-level object declarations
gcc/testsuite/
* gnat.dg/anon3.adb, gnat.dg/anon3.ads: New testcase.
From-SVN: r274338
This prevents the compiler from issuing a spurious error in a convoluted
case where a child generic package declared in an enclosing parent
generic package, which contains a second child generic package, contains
an inlined subprogram and the second child generic package contains an
instantiation of the first, and the enclosing parent generic package is
instantiated with inlining across units enabled (-gnatn[12]).
The problem is that the compiler attempts to instantiate the body of the
first child generic package in the context of the enclosing parent
generic package, instead of doing it in the context of the instantiation
of the parent generic package, because of the presence of the inlined
subprogram.
2019-08-13 Eric Botcazou <ebotcazou@adacore.com>
gcc/ada/
* exp_ch6.adb (Expand_Call_Helper): If back-end inlining is
enabled, also instantiate the body of a generic unit containing
a subprogram subject to aspect/pragma Inline_Always at
optimization level zero.
* sem_ch12.adb (Might_Inline_Subp): Minor tweak.
(Analyze_Package_Instantiation): Do not instantiate the package
body because of inlining considerations if the instantiation is
done in a generic unit. Move around similar condition involving
the main unit. Add test on Back_End_Inlining to processing for
front-end inlining.
gcc/testsuite/
* gnat.dg/generic_inst8.adb, gnat.dg/generic_inst8.ads,
gnat.dg/generic_inst8_g.adb, gnat.dg/generic_inst8_g.ads: New
testcase.
From-SVN: r274336
The compiler does not initialize well the runtime information required
to perform at runtime interface conversions on derivations of tagged
types that implement interfaces and have variable size components.
2019-08-13 Javier Miranda <miranda@adacore.com>
gcc/ada/
* exp_disp.adb (Make_Secondary_DT): Handle record type
derivations that have interface components located at fixed
positions and interface components located at variable offset.
The offset of components located at fixed positions is computed
using the dummy object (similar to the case where all the
interface components are located at fixed positions).
(Make_DT): Build the dummy object for all tagged types that
implement interface types (that is, build it also for types with
variable size components), and use the dummy object to compute
the offset of all tag components located at fixed positions when
initializing the Interface_Table object.
gcc/testsuite/
* gnat.dg/tag2.adb, gnat.dg/tag2_pkg.ads: New testcase.
From-SVN: r274335
This patch adds a new switch (--help-ada) to gnatcmd for displaying all
the availible build flags as well as fixing some minor differences in
output between implicit and explicit help for gnatcmd (e.g. "gnat" vs
"gnat --help").
$ gnat
GNAT Pro 20.0w (19940713)
Copyright 1996-2019, Free Software Foundation, Inc.
To list Ada build switches use --help-ada
List of available commands
gnat bind gnatbind
gnat chop gnatchop
gnat clean gnatclean
gnat compile gnatmake -f -u -c
gnat check gnatcheck
gnat elim gnatelim
gnat find gnatfind
gnat krunch gnatkr
gnat link gnatlink
gnat list gnatls
gnat make gnatmake
gnat metric gnatmetric
gnat name gnatname
gnat preprocess gnatprep
gnat pretty gnatpp
gnat stack gnatstack
gnat stub gnatstub
gnat test gnattest
gnat xref gnatxref
Report bugs to report@adacore.com
$ gnat --help
GNAT Pro 20.0w (19940713)
Copyright 1996-2019, Free Software Foundation, Inc.
To list Ada build switches use --help-ada
List of available commands
gnat bind gnatbind
gnat chop gnatchop
gnat clean gnatclean
gnat compile gnatmake -f -u -c
gnat check gnatcheck
gnat elim gnatelim
gnat find gnatfind
gnat krunch gnatkr
gnat link gnatlink
gnat list gnatls
gnat make gnatmake
gnat metric gnatmetric
gnat name gnatname
gnat preprocess gnatprep
gnat pretty gnatpp
gnat stack gnatstack
gnat stub gnatstub
gnat test gnattest
gnat xref gnatxref
Report bugs to report@adacore.com
$ gnat --help-ada
Usage: gnat switches sfile
sfile Source file name
-g Generate debugging information
-Idir Specify source files search path
-I- Do not look for sources in current directory
-O[0123] Control the optimization level
-gnata Assertions enabled. Pragma Assert/Debug to be activated
-gnatA Avoid processing gnat.adc, if present file will be ignored
-gnatb Generate brief messages to stderr even if verbose mode set
-gnatB Assume no bad (invalid) values except in 'Valid attribute
-gnatc Check syntax and semantics only (no code generation)
-gnatC Generate CodePeer intermediate format (no code generation)
-gnatd? Compiler debug option ? ([.]a-z,A-Z,0-9), see debug.adb
-gnatD Debug expanded generated code (max line length = 72)
-gnatDnn Debug expanded generated code (max line length = nn)
-gnateA Aliasing checks on subprogram parameters
-gnatec=? Specify configuration pragmas file, e.g. -gnatec=/x/f.adc
-gnateC Generate CodePeer messages (ignored without -gnatcC)
-gnated Disable synchronization of atomic variables
-gnateD? Define or redefine preprocessing symbol, e.g. -gnateDsym=val
-gnateE Generate extra information in exception messages
-gnatef Full source path in brief error messages
-gnateF Check overflow on predefined Float types
-gnateG Generate preprocessed source
-gnateinn Set maximum number of instantiations to nn
-gnateInn Index in multi-unit source, e.g. -gnateI2
-gnatel Turn on info messages on generated Elaborate[_All] pragmas
-gnateL Turn off info messages on generated Elaborate[_All] pragmas
-gnatem=? Specify mapping file, e.g. -gnatem=mapping
-gnatep=? Specify preprocessing data file, e.g. -gnatep=prep.data
-gnateP Pure/Prelaborate errors generate warnings rather than errors
-gnateS Generate SCO (Source Coverage Obligation) information
-gnatet=? Write target dependent information file ?, e.g. gnatet=tdf
-gnateT=? Read target dependent information file ?, e.g. gnateT=tdf
-gnateu Ignore unrecognized style/validity/warning switches
-gnateV Validity checks on subprogram parameters
-gnateY Ignore all Style_Checks pragmas in source
-gnatE Dynamic elaboration checking mode enabled
-gnatf Full errors. Verbose details, all undefined references
-gnatF Force all import/export external names to all uppercase
-gnatg GNAT implementation mode (used for compiling GNAT units)
-gnatG Output generated expanded code (max line length = 72)
-gnatGnn Output generated expanded code (max line length = nn)
-gnath Output this usage (help) information
-gnatH Legacy elaboration checking mode enabled
-gnati? Identifier char set (?=1/2/3/4/5/8/9/p/f/n/w)
-gnatI Ignore all representation clauses
-gnatjnn Format error and warning messages to fit nn character lines
-gnatJ Relaxed elaboration checking mode enabled
-gnatk Limit file names to nn characters (k = krunch)
-gnatl Output full source listing with embedded error messages
-gnatl=f Output full source listing to specified file
-gnatL List corresponding source text in -gnatG or -gnatD output
-gnatmnn Limit number of detected errors/warnings to nn (1-999999)
-gnatn[?] Enable pragma Inline across units (?=1/2 for moderate/full)
-gnato0 Disable overflow checking
-gnato Enable overflow checking in STRICT (-gnato1) mode (default)
-gnato? Enable overflow checks in STRICT/MINIMIZED/ELIMINATED (1/2/3) mode
-gnato?? Set mode for general/assertion expressions separately
-gnatp Suppress all checks
-gnatP Generate periodic calls to System.Polling.Poll
-gnatq Don't quit, try semantics, even if parse errors
-gnatQ Don't quit, write ali/tree file even if compile errors
-gnatr Treat pragma Restrictions as Restriction_Warnings
-gnatR? List rep info (?=0/1/2/3/4/e/m for none/types/all/sym/cg/ext/mech)
-gnatR?j List rep info in the JSON data interchange format
-gnatR?s List rep info to file.rep instead of standard output
-gnats Syntax check only
-gnatS Print listing of package Standard
-gnatt Tree output file to be generated
-gnatTnn All compiler tables start at nn times usual starting size
-gnatu List units for this compilation
-gnatU Enable unique tag for error messages
-gnatv Verbose mode. Full error output with source lines to stdout
-gnatVxx Enable selected validity checking mode, xx = list of parameters:
a turn on all validity checking options
c turn on checking for copies
C turn off checking for copies
d turn on default (RM) checking
D turn off default (RM) checking
e turn on checking for elementary components
E turn off checking for elementary components
f turn on checking for floating-point
F turn off checking for floating-point
i turn on checking for in params
I turn off checking for in params
m turn on checking for in out params
M turn off checking for in out params
n turn off all validity checks (including RM)
o turn on checking for operators/attributes
O turn off checking for operators/attributes
p turn on checking for parameters
P turn off checking for parameters
r turn on checking for returns
R turn off checking for returns
s turn on checking for subscripts
S turn off checking for subscripts
t turn on checking for tests
T turn off checking for tests
-gnatwxx Enable selected warning modes, xx = list of parameters:
* indicates default setting
+ indicates warning flag included in -gnatwa
a turn on all info/warnings marked below with +
A turn off all optional info/warnings
.a*+ turn on warnings for failing assertion
.A turn off warnings for failing assertion
_a*+ turn on warnings for anonymous allocators
_A turn off warnings for anonymous allocators
b+ turn on warnings for bad fixed value (not multiple of small)
B* turn off warnings for bad fixed value (not multiple of small)
.b*+ turn on warnings for biased representation
.B turn off warnings for biased representation
c+ turn on warnings for constant conditional
C* turn off warnings for constant conditional
.c+ turn on warnings for unrepped components
.C* turn off warnings for unrepped components
d turn on warnings for implicit dereference
D* turn off warnings for implicit dereference
.d turn on tagging of warnings with -gnatw switch
.D* turn off tagging of warnings with -gnatw switch
e treat all warnings (but not info) as errors
.e turn on every optional info/warning (no exceptions)
E treat all run-time warnings as errors
f+ turn on warnings for unreferenced formal
F* turn off warnings for unreferenced formal
.f turn on warnings for suspicious Subp'Access
.F* turn off warnings for suspicious Subp'Access
g*+ turn on warnings for unrecognized pragma
G turn off warnings for unrecognized pragma
.g turn on GNAT warnings
h turn on warnings for hiding declarations
H* turn off warnings for hiding declarations
.h turn on warnings for holes in records
.H* turn off warnings for holes in records
i*+ turn on warnings for implementation unit
I turn off warnings for implementation unit
.i*+ turn on warnings for overlapping actuals
.I turn off warnings for overlapping actuals
j+ turn on warnings for obsolescent (annex J) feature
J* turn off warnings for obsolescent (annex J) feature
.j+ turn on warnings for late dispatching primitives
.J* turn off warnings for late dispatching primitives
k+ turn on warnings on constant variable
K* turn off warnings on constant variable
.k turn on warnings for standard redefinition
.K* turn off warnings for standard redefinition
l turn on warnings for elaboration problems
L* turn off warnings for elaboration problems
.l turn on info messages for inherited aspects
.L* turn off info messages for inherited aspects
m+ turn on warnings for variable assigned but not read
M* turn off warnings for variable assigned but not read
.m*+ turn on warnings for suspicious modulus value
.M turn off warnings for suspicious modulus value
n* normal warning mode (cancels -gnatws/-gnatwe)
.n turn on info messages for atomic synchronization
.N* turn off info messages for atomic synchronization
o* turn on warnings for address clause overlay
O turn off warnings for address clause overlay
.o turn on warnings for out parameters assigned but not read
.O* turn off warnings for out parameters assigned but not read
p+ turn on warnings for ineffective pragma Inline in frontend
P* turn off warnings for ineffective pragma Inline in frontend
.p+ turn on warnings for suspicious parameter order
.P* turn off warnings for suspicious parameter order
q*+ turn on warnings for questionable missing parenthesis
Q turn off warnings for questionable missing parenthesis
.q+ turn on warnings for questionable layout of record types
.Q* turn off warnings for questionable layout of record types
r+ turn on warnings for redundant construct
R* turn off warnings for redundant construct
.r+ turn on warnings for object renaming function
.R* turn off warnings for object renaming function
s suppress all info/warnings
.s turn on warnings for overridden size clause
.S* turn off warnings for overridden size clause
t turn on warnings for tracking deleted code
T* turn off warnings for tracking deleted code
.t*+ turn on warnings for suspicious contract
.T turn off warnings for suspicious contract
u+ turn on warnings for unused entity
U* turn off warnings for unused entity
.u turn on warnings for unordered enumeration
.U* turn off warnings for unordered enumeration
v*+ turn on warnings for unassigned variable
V turn off warnings for unassigned variable
.v*+ turn on info messages for reverse bit order
.V turn off info messages for reverse bit order
w*+ turn on warnings for wrong low bound assumption
W turn off warnings for wrong low bound assumption
.w turn on warnings on pragma Warnings Off
.W* turn off warnings on pragma Warnings Off
x*+ turn on warnings for export/import
X turn off warnings for export/import
.x+ turn on warnings for non-local exception
.X* turn off warnings for non-local exception
y*+ turn on warnings for Ada compatibility issues
Y turn off warnings for Ada compatibility issues
.y turn on info messages for why pkg body needed
.Y* turn off info messages for why pkg body needed
z*+ turn on warnings for suspicious unchecked conversion
Z turn off warnings for suspicious unchecked conversion
.z*+ turn on warnings for record size not a multiple of alignment
.Z turn off warnings for record size not a multiple of alignment
-gnatW? Wide character encoding method (?=h/u/s/e/8/b)
-gnatx Suppress output of cross-reference information
-gnatX Language extensions permitted
-gnaty Enable default style checks (same as -gnaty3abcefhiklmnprst)
-gnatyxx Enable selected style checks xx = list of parameters:
1-9 check indentation
a check attribute casing
A check array attribute indexes
b check no blanks at end of lines
B check no use of AND/OR for boolean expressions
c check comment format (two spaces)
C check comment format (one space)
d check no DOS line terminators
e check end/exit labels present
f check no form feeds/vertical tabs in source
g check standard GNAT style rules, same as ydISux
h check no horizontal tabs in source
i check if-then layout
I check mode in
k check casing rules for keywords
l check reference manual layout
Lnn check max nest level < nn
m check line length <= 79 characters
Mnn check line length <= nn characters
n check casing of package Standard identifiers
N turn off all checks
o check subprogram bodies in alphabetical order
O check overriding indicators
p check pragma casing
r check casing for identifier references
s check separate subprogram specs present
S check separate lines after THEN or ELSE
t check token separation rules
u check no unnecessary blank lines
x check extra parentheses around conditionals
y turn on default style checks
- subtract (turn off) subsequent checks
+ add (turn on) subsequent checks
-gnatyN Cancel all previously set style checks
-gnatzc Distribution stub generation for caller stubs
-gnatzr Distribution stub generation for receiver stubs
-gnat83 Ada 83 mode
-gnat95 Ada 95 mode
-gnat2005 Ada 2005 mode
-gnat2012 Ada 2012 mode (default)
-gnat-p Cancel effect of previous -gnatp switch
2019-08-13 Justin Squirek <squirek@adacore.com>
gcc/ada/
* gnatcmd.adb (GNATCmd): Add constant for new compiler switch
--help-ada, and include usage subprogram. Add line to usage help
explaining the new flag.
(GNATCmd_Usage): Rename from locally declared Usage so as not to
confuse with the newly imported version. Add new argument case
for --help-ada and add bug report email to implicit display of
help without the --help flag so as to unify output between the
two cases.
From-SVN: r274334
Following the work on the Ada 202X feature of iterated aggregates
(AI12-061), Loop_Actions should have been listed as a semantic field of
nodes of kind N_Iterated_Component_Association. Fix this as well as the
new extended AST traversal which should traverse these fields.
There is no impact on compilation.
2019-08-13 Yannick Moy <moy@adacore.com>
gcc/ada/
* sem_util.adb (Traverse_More_Func): Take into account
Loop_Actions inside N_Iterated_Component_Association nodes.
* sinfo.ads: Document correctly Loop_Actions as a field of nodes
of kind N_Iterated_Component_Association.
From-SVN: r274332
2019-08-13 Claire Dross <dross@adacore.com>
gcc/ada/
* libgnat/a-cfinve.adb, libgnat/a-cofove.adb (Find_Index,
Reverse_Find_Index): Use bigger type to avoid range check
failure at the last loop iteration.
From-SVN: r274331
2019-08-13 Martin Liska <mliska@suse.cz>
* value-prof.c (gimple_ic_transform): Add new line.
Print details with MSG_NOTE.
2019-08-13 Martin Liska <mliska@suse.cz>
* gcc.dg/tree-prof/ic-misattribution-1.c: Use -fdump-ipa-profile-node.
From-SVN: r274330