decl.c (gnat_to_gnu_entity): Do not short-circuit the regular handling.

	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Abstract_State>: Do not
	short-circuit the regular handling.

From-SVN: r221446

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 42f91b7bbea838ffc04b7506347d965004804c5a..0977c485a2b8251c48957169ef938d07cfee2999 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-16  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/decl.c (gnat_to_gnu_entity) <E_Abstract_State>: Do not
+       short-circuit the regular handling.
+
 2015-03-13  Robert Dewar  <dewar@adacore.com>
 
        * exp_unst.adb (Note_Uplevel_Reference): Eliminate duplicate

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 06031b131c8aa2e8b4733e22c2e0bdb6195753e9..90ffcb303441d7736bd960dbb318edd01494bfbe 100644 (file)
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -4800,9 +4800,11 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
 
     case E_Abstract_State:
       /* This is a SPARK annotation that only reaches here when compiling in
-        ASIS mode and has no characteristics to annotate.  */
+        ASIS mode.  */
       gcc_assert (type_annotate_only);
-      return error_mark_node;
+      gnu_decl = error_mark_node;
+      saved = true;
+      break;
 
     default:
       gcc_unreachable ();