Skip to content

R
riscv-gcc-1
Commit 78f2b7ce by Arnaud Charlet
Options

[multiple changes] 

2017-04-27  Ed Schonberg  <schonberg@adacore.com>

	* freeze.adb: copy-paste typo.

2017-04-27  Yannick Moy  <moy@adacore.com>

	* sem_prag.adb (Analyze_Pre_Post_In_Decl_Part):
	Use correct test to detect call in GNATprove mode instead of
	compilation.

2017-04-27  Claire Dross  <dross@adacore.com>

	* a-cfdlli.adb, a-cfdlli.ads (Formal_Model.M_Elements_In_Union):
	New property function expressing that the element of a
	sequence are contained in the union of two sequences.
	(Formal_Model.M_Elements_Included): New property function
	expressing that the element of a sequence are another sequence.
	(Generic_Sorting): Use new property functions to state that
	elements are preserved by Sort and Merge.
	* a-cofove.adb, a-cofove.ads (=): Generic parameter removed to
	allow the use of regular equality over elements in contracts.
	(Formal_Model): Ghost package containing model functions
	that are used in subprogram contracts.	(Capacity):
	On unbounded containers, return the maximal capacity.
	(Current_To_Last): Removed, model functions should be used instead.
	(First_To_Previous): Removed, model functions should be used instead.
	(Append): Default parameter value replaced
	by new wrapper to allow more precise contracts.
	(Insert): Subprogram restored, it seems it was useful to users even if
	it is inefficient.
	(Delete): Subprogram restored, it seems it was useful to users even if
	it is inefficient.
	(Prepend): Subprogram restored, it seems it was useful to users even
	if it is inefficient.
	(Delete_First): Subprogram restored, it seems it
	was useful to users even if it is inefficient.	(Delete_Last):
	Default parameter value replaced by new wrapper to allow more
	precise contracts.
	(Generic_Sorting.Merge): Subprogram restored.
	* a-cfinve.adb, a-cfinve.ads (=): Generic parameter removed to
	allow the use of regular equality over elements in contracts.
	(Formal_Model): Ghost package containing model functions
	that are used in subprogram contracts.	(Capacity):
	On unbounded containers, return the maximal capacity.
	(Current_To_Last): Removed, model functions should be used
	instead.
	(First_To_Previous): Removed, model functions should be used instead.
	(Append): Default parameter value replaced
	by new wrapper to allow more precise contracts.
	(Insert): Subprogram restored, it seems it was useful to users even if
	it is inefficient.
	(Delete): Subprogram restored, it seems it was useful to users even if
	it is inefficient.
	(Prepend): Subprogram restored, it seems it was useful to users even
	if it is inefficient.
	(Delete_First): Subprogram restored, it seems it
	was useful to users even if it is inefficient.	(Delete_Last):
	Default parameter value replaced by new wrapper to allow more
	precise contracts.
	(Generic_Sorting.Merge): Subprogram restored.
	(Vector): Do not reuse formal vectors, as it is no longer possible
	to supply them with an equality function over elements.

2017-04-27  Bob Duff  <duff@adacore.com>

	* g-dyntab.adb (Release): When allocating the new
	table, use the correct slice of the old table to initialize it.

From-SVN: r247316
parent 02848684
Showing with 162 additions and 48 deletions
gcc/ada/ChangeLog
2017-04-27 Ed Schonberg <schonberg@adacore.com>
* freeze.adb: copy-paste typo.
2017-04-27 Yannick Moy <moy@adacore.com>
* sem_prag.adb (Analyze_Pre_Post_In_Decl_Part):
Use correct test to detect call in GNATprove mode instead of
compilation.
2017-04-27 Claire Dross <dross@adacore.com>
* a-cfdlli.adb, a-cfdlli.ads (Formal_Model.M_Elements_In_Union):
New property function expressing that the element of a
sequence are contained in the union of two sequences.
(Formal_Model.M_Elements_Included): New property function
expressing that the element of a sequence are another sequence.
(Generic_Sorting): Use new property functions to state that
elements are preserved by Sort and Merge.
* a-cofove.adb, a-cofove.ads (=): Generic parameter removed to
allow the use of regular equality over elements in contracts.
(Formal_Model): Ghost package containing model functions
that are used in subprogram contracts. (Capacity):
On unbounded containers, return the maximal capacity.
(Current_To_Last): Removed, model functions should be used instead.
(First_To_Previous): Removed, model functions should be used instead.
(Append): Default parameter value replaced
by new wrapper to allow more precise contracts.
(Insert): Subprogram restored, it seems it was useful to users even if
it is inefficient.
(Delete): Subprogram restored, it seems it was useful to users even if
it is inefficient.
(Prepend): Subprogram restored, it seems it was useful to users even
if it is inefficient.
(Delete_First): Subprogram restored, it seems it
was useful to users even if it is inefficient. (Delete_Last):
Default parameter value replaced by new wrapper to allow more
precise contracts.
(Generic_Sorting.Merge): Subprogram restored.
* a-cfinve.adb, a-cfinve.ads (=): Generic parameter removed to
allow the use of regular equality over elements in contracts.
(Formal_Model): Ghost package containing model functions
that are used in subprogram contracts. (Capacity):
On unbounded containers, return the maximal capacity.
(Current_To_Last): Removed, model functions should be used
instead.
(First_To_Previous): Removed, model functions should be used instead.
(Append): Default parameter value replaced
by new wrapper to allow more precise contracts.
(Insert): Subprogram restored, it seems it was useful to users even if
it is inefficient.
(Delete): Subprogram restored, it seems it was useful to users even if
it is inefficient.
(Prepend): Subprogram restored, it seems it was useful to users even
if it is inefficient.
(Delete_First): Subprogram restored, it seems it
was useful to users even if it is inefficient. (Delete_Last):
Default parameter value replaced by new wrapper to allow more
precise contracts.
(Generic_Sorting.Merge): Subprogram restored.
(Vector): Do not reuse formal vectors, as it is no longer possible
to supply them with an equality function over elements.
2017-04-27 Bob Duff <duff@adacore.com>
* g-dyntab.adb (Release): When allocating the new
table, use the correct slice of the old table to initialize it.
2017-04-27 Eric Botcazou <ebotcazou@adacore.com>
* einfo.ads: Minor fixes in comments.
......
gcc/ada/a-cfdlli.adb
......@@ -488,54 +488,70 @@ is
procedure Lift_Abstraction_Level (Container : List) is null;
-------------------------
-- M_Elements_Reversed --
-- M_Elements_In_Union --
-------------------------
function M_Elements_Reversed
(Left : M.Sequence;
Right : M.Sequence) return Boolean
function M_Elements_In_Union
(Container : M.Sequence;
Left : M.Sequence;
Right : M.Sequence) return Boolean
is
L : constant Count_Type := M.Length (Left);
begin
if L /= M.Length (Right) then
return False;
end if;
for I in 1 .. M.Length (Container) loop
declare
Found : Boolean := False;
J : Count_Type := 0;
for I in 1 .. L loop
if Element (Left, I) /= Element (Right, L - I + 1)
then
return False;
end if;
begin
while not Found and J < M.Length (Left) loop
J := J + 1;
if Element (Container, I) = Element (Left, J) then
Found := True;
end if;
end loop;
J := 0;
while not Found and J < M.Length (Right) loop
J := J + 1;
if Element (Container, I) = Element (Right, J) then
Found := True;
end if;
end loop;
if not Found then
return False;
end if;
end;
end loop;
return True;
end M_Elements_Reversed;
end M_Elements_In_Union;
-------------------------
-- M_Elements_Shuffled --
-- M_Elements_Included --
-------------------------
function M_Elements_Shuffle
(Left : M.Sequence;
Right : M.Sequence;
Fst : Positive_Count_Type;
Lst : Count_Type;
Offset : Count_Type'Base) return Boolean
function M_Elements_Included
(Left : M.Sequence;
L_Fst : Positive_Count_Type := 1;
L_Lst : Count_Type;
Right : M.Sequence;
R_Fst : Positive_Count_Type := 1;
R_Lst : Count_Type) return Boolean
is
begin
for I in Fst .. Lst loop
for I in L_Fst .. L_Lst loop
declare
Found : Boolean := False;
J : Count_Type := Fst;
J : Count_Type := R_Fst - 1;
begin
while not Found and J <= Lst loop
if Element (Left, I) = Element (Right, J + Offset) then
while not Found and J < R_Lst loop
J := J + 1;
if Element (Left, I) = Element (Right, J) then
Found := True;
end if;
J := J + 1;
end loop;
if not Found then
......@@ -545,7 +561,32 @@ is
end loop;
return True;
end M_Elements_Shuffle;
end M_Elements_Included;
-------------------------
-- M_Elements_Reversed --
-------------------------
function M_Elements_Reversed
(Left : M.Sequence;
Right : M.Sequence) return Boolean
is
L : constant Count_Type := M.Length (Left);
begin
if L /= M.Length (Right) then
return False;
end if;
for I in 1 .. L loop
if Element (Left, I) /= Element (Right, L - I + 1)
then
return False;
end if;
end loop;
return True;
end M_Elements_Reversed;
------------------------
-- M_Elements_Swapted --
......@@ -892,7 +933,8 @@ is
begin
if Target'Address = Source'Address then
return;
raise Program_Error with
"Target and Source denote same container";
end if;
LI := First (Target);
......@@ -1466,7 +1508,7 @@ is
begin
if CFirst = 0 then
CFirst := Container.First;
CFirst := Container.Last;
end if;
if Container.Length = 0 then
......@@ -1497,14 +1539,13 @@ is
SN : Node_Array renames Source.Nodes;
begin
if Before.Node /= 0 then
pragma Assert (Vet (Target, Before), "bad cursor in Splice");
if Target'Address = Source'Address then
raise Program_Error with
"Target and Source denote same container";
end if;
if Target'Address = Source'Address
or else Source.Length = 0
then
return;
if Before.Node /= 0 then
pragma Assert (Vet (Target, Before), "bad cursor in Splice");
end if;
pragma Assert (SN (Source.First).Prev = 0);
......@@ -1535,8 +1576,8 @@ is
begin
if Target'Address = Source'Address then
Splice (Target, Before, Position);
return;
raise Program_Error with
"Target and Source denote same container";
end if;
if Position.Node = 0 then
......
gcc/ada/freeze.adb
......@@ -1482,7 +1482,7 @@ package body Freeze is
A_Post := Get_Pragma (Par_Prim, Pragma_Postcondition);
if Present (A_Post) and then Class_Present (A_Post) then
New_Prag := New_Copy_Tree (A_Pre);
New_Prag := New_Copy_Tree (A_Post);
Build_Class_Wide_Expression
(Prag => New_Prag,
Subp => Prim,
......
gcc/ada/g-dyntab.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2000-2016, AdaCore --
-- Copyright (C) 2000-2017, AdaCore --
-- --
-- GNAT 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- --
......@@ -279,7 +279,8 @@ package body GNAT.Dynamic_Tables is
new Ada.Unchecked_Conversion (Alloc_Ptr, Table_Ptr);
Old_Table : Old_Alloc_Ptr := To_Old_Alloc_Ptr (T.Table);
New_Table : constant Alloc_Ptr := new Alloc_Type'(Old_Table.all);
New_Table : constant Alloc_Ptr :=
new Alloc_Type'(Old_Table (Alloc_Type'Range));
begin
T.P.Last_Allocated := T.P.Last;
Free (Old_Table);
......
gcc/ada/sem_prag.adb
......@@ -24007,16 +24007,20 @@ package body Sem_Prag is
& "of &", Nod, Disp_Typ);
end if;
-- Otherwise we have a call to an overridden primitive, and
-- we will create a common class-wide clone for the body of
-- original operation and its eventual inherited versions.
-- If the original operation dispatches on result it is
-- never inherited and there is no need for a clone.
-- Otherwise we have a call to an overridden primitive, and we
-- will create a common class-wide clone for the body of
-- original operation and its eventual inherited versions. If
-- the original operation dispatches on result it is never
-- inherited and there is no need for a clone. There is not
-- need for a clone either in GNATprove mode, as cases that
-- would require it are rejected (when an inherited primitive
-- calls an overridden operation in a class-wide contract), and
-- the clone would make proof impossible in some cases.
elsif not Is_Abstract_Subprogram (Spec_Id)
and then No (Class_Wide_Clone (Spec_Id))
and then not Has_Controlling_Result (Spec_Id)
and then SPARK_Mode /= On
and then not GNATprove_Mode
then
Build_Class_Wide_Clone_Decl (Spec_Id);
end if;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment