diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-04 15:59:18 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-04 15:59:18 +0200 |
| commit | d69cf005d0df53b9ebcd3eaf0c1e2740d5b36f1c (patch) | |
| tree | c898b07342d6c0021f6b3c1addd069381f36bee7 /gcc/ada/exp_cg.adb | |
| parent | f5d96d00381bbdf2f14e03e89966de624c2f293b (diff) | |
| download | gcc-d69cf005d0df53b9ebcd3eaf0c1e2740d5b36f1c.zip gcc-d69cf005d0df53b9ebcd3eaf0c1e2740d5b36f1c.tar.gz gcc-d69cf005d0df53b9ebcd3eaf0c1e2740d5b36f1c.tar.bz2 | |
[multiple changes]
2010-10-04 Robert Dewar <dewar@adacore.com>
* exp_cg.adb: Minor reformatting.
2010-10-04 Javier Miranda <miranda@adacore.com>
* exp_cg.adb (Expand_N_Assignment_Statement): Restore tag check when
the target object is an interface.
* sem_disp.adb (Propagate_Tag): If the controlling argument is an
interface type then we generate an implicit conversion to force
displacement of the pointer to the object to reference the secondary
dispatch table associated with the interface.
2010-10-04 Robert Dewar <dewar@adacore.com>
* sem_ch13.adb (Analyze_Enumeration_Representation_Clause): Set
Enumeration_Rep_Expr to point to the literal, not the identifier.
(Analyze_Enumeration_Representation_Clause): Improve error message for
size too small for enum rep value
(Analyze_Enumeration_Representation_Clause): Fix size test to use proper
size (RM_Size, not Esize).
From-SVN: r164939
Diffstat (limited to 'gcc/ada/exp_cg.adb')
| -rw-r--r-- | gcc/ada/exp_cg.adb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/ada/exp_cg.adb b/gcc/ada/exp_cg.adb index 1addb94..4aa7b0b 100644 --- a/gcc/ada/exp_cg.adb +++ b/gcc/ada/exp_cg.adb @@ -409,6 +409,7 @@ package body Exp_CG is Nul : constant Character := Character'First; Line : String (Str'First .. Str'Last + 1); Errno : Integer; + begin -- Add the null character to the string as required by fputs @@ -583,9 +584,9 @@ package body Exp_CG is if Present (Interface_Alias (Prim)) or else - (Present (Alias (Prim)) - and then Find_Dispatching_Type (Prim) - /= Find_Dispatching_Type (Alias (Prim))) + (Present (Alias (Prim)) + and then Find_Dispatching_Type (Prim) /= + Find_Dispatching_Type (Alias (Prim))) then goto Continue; end if; @@ -641,8 +642,8 @@ package body Exp_CG is Int_Alias := Interface_Alias (Prim_Op); if Present (Int_Alias) - and then not Is_Ancestor - (Find_Dispatching_Type (Int_Alias), Typ) + and then + not Is_Ancestor (Find_Dispatching_Type (Int_Alias), Typ) and then (Alias (Prim_Op)) = Prim then Write_Char (','); |