diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-27 09:08:20 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-27 09:08:20 +0000 |
| commit | 131f3644ef87d5406722ee42b0989cb5783156fa (patch) | |
| tree | 6f9c3016cb1696987ba7b0cc8c1b8c5400c6157d /gcc/ada/style.adb | |
| parent | 851ccf1afd9b0e045e7dda2539a3dfa30c16bb64 (diff) | |
| download | gcc-131f3644ef87d5406722ee42b0989cb5783156fa.tar.gz | |
2015-05-27 Basile Starynkevitch <basile@starynkevitch.net>
{{merged with almost GCC 5. i.e. trunk r222129 from 2015-04-15,
using svn merge -r219880:222129
svn+ssh://bstarynk@gcc.gnu.org/svn/gcc/trunk }}
[gcc/]
2015-05-27 Basile Starynkevitch <basile@starynkevitch.net>
{{merged with GCC 5, so}}
* melt-runtime.h (melt_fatal_error, melt_fatal_error_at_line):
Pass UNKNOWN_LOCATION for GCC 5. Re-indented with command:
astyle --style=gnu -s2
* melt-runtime.cc: Re-indented with command:
astyle --style=gnu -s2
(melt_branch_process_arguments, melt_ggcstart_callback)
(melt_reserved_allocation_failure): Use melt_fatal_error instead
of fatal_error.
* melt/generated/meltrunsup-inc.cc: Manually edited for fatal_error.
* melt/generated/warmelt-first.cc: Ditto.
* melt/warmelt-first.melt (melt_assert_failure_fun): Ditto.
* melt/warmelt-modes.melt (generate_runtypesupport_scanning):
Ditto, in the emitted code.
* Makefile.in: mention s-gtype instead of gt-melt-runtime.h in
dependencies.
(TEXI_GCCINT_FILES): Add meltgendoc.texi.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@223739 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/style.adb')
| -rw-r--r-- | gcc/ada/style.adb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ada/style.adb b/gcc/ada/style.adb index d3f2d2c99cc..e58d5052d70 100644 --- a/gcc/ada/style.adb +++ b/gcc/ada/style.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2015, Free Software Foundation, Inc. -- -- -- -- 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- -- @@ -264,10 +264,13 @@ package body Style is begin -- Perform the check on source subprograms and on subprogram instances, -- because these can be primitives of untagged types. Note that such - -- indicators were introduced in Ada 2005. + -- indicators were introduced in Ada 2005. We apply Comes_From_Source + -- to Original_Node to catch the case of a procedure body declared with + -- "is null" that has been rewritten as a normal empty body. if Style_Check_Missing_Overriding - and then (Comes_From_Source (N) or else Is_Generic_Instance (E)) + and then (Comes_From_Source (Original_Node (N)) + or else Is_Generic_Instance (E)) and then Ada_Version_Explicit >= Ada_2005 then -- If the subprogram is an instantiation, its declaration appears |