diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2016-07-04 12:17:30 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2016-07-04 12:17:30 +0200 |
| commit | f50f7e2c00bb3cbf404b241d88af8697b33d2279 (patch) | |
| tree | 250809c1f3f20dfc031662b25454c1bd0249e8a7 /gcc/ada/sinput-l.adb | |
| parent | 96df3ff4bd3b0f2ce63f519955f20f7d93612929 (diff) | |
| download | gcc-f50f7e2c00bb3cbf404b241d88af8697b33d2279.zip gcc-f50f7e2c00bb3cbf404b241d88af8697b33d2279.tar.gz gcc-f50f7e2c00bb3cbf404b241d88af8697b33d2279.tar.bz2 | |
[multiple changes]
2016-07-04 Justin Squirek <squirek@adacore.com>
* sem_prag.adb (Analyze_Unmodified_Or_Unused and
Analyze_Unreferenced_Or_Unused): Change warning message to be
more clear about pragma duplicates.
2016-07-04 Yannick Moy <moy@adacore.com>
* sinput-l.adb (Create_Instantiation_Source): Set component
Inlined_Call for inherited pragma case.
* sinput.adb, sinput.ads (Instantiation): Return component
Inlined_Call for inherited pragma case.
2016-07-04 Bob Duff <duff@adacore.com>
* sem_type.adb (Remove_Conversions): Protect
the call to Left_Opnd by checking for Nkind in N_Unary_Op --
unary operators do not have a left operand.
2016-07-04 Ed Schonberg <schonberg@adacore.com>
* sem_ch3.adb (Analyze_Object_Declaration): A declaration of a
constant in a protected operation may be a homonym of a private
component of the enclosing protected type. This declaration hides
the component renaming constructed within the protected operation.
From-SVN: r237964
Diffstat (limited to 'gcc/ada/sinput-l.adb')
| -rw-r--r-- | gcc/ada/sinput-l.adb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gcc/ada/sinput-l.adb b/gcc/ada/sinput-l.adb index 32c2ac2..f0cce8d 100644 --- a/gcc/ada/sinput-l.adb +++ b/gcc/ada/sinput-l.adb @@ -151,16 +151,12 @@ package body Sinput.L is Snew.Template := Xold; -- For a genuine generic instantiation, assign new instance id. For - -- inlined bodies, we retain that of the template, but we save the - -- call location. For inherited pragmas, we simply retain that of - -- the template. + -- inlined bodies or inherited pragmas, we retain that of the + -- template, but we save the call location. - if Inlined_Body then + if Inlined_Body or Inherited_Pragma then Snew.Inlined_Call := Sloc (Inst_Node); - elsif Inherited_Pragma then - null; - else -- If the spec has been instantiated already, and we are now -- creating the instance source for the corresponding body now, |