- recognize __attribute__((returns_twice)) and __declspec(returns_twice) now

[r24478]

diff --git a/ast2firm.c b/ast2firm.c
index 79e5eb3..7e26f71 100644 (file)
--- a/ast2firm.c
+++ b/ast2firm.c
@@ -5254,6 +5254,10 @@ static void initialize_function_parameters(entity_t *entity)
  */
 static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_modifiers)
 {
+       if (decl_modifiers & DM_RETURNS_TWICE) {
+               /* TRUE if the declaration includes __attribute__((returns_twice)) */
+               set_irg_additional_property(irg, mtp_property_returns_twice);
+       }
        if (decl_modifiers & DM_NORETURN) {
                /* TRUE if the declaration includes the Microsoft
                   __declspec(noreturn) specifier. */

diff --git a/ast_t.h b/ast_t.h
index ab3e6ee..182c85a 100644 (file)
--- a/ast_t.h
+++ b/ast_t.h
@@ -465,6 +465,7 @@ typedef enum gnu_attribute_kind_t {
        GNU_AK_FASTCALL,
        GNU_AK_DEPRECATED,
        GNU_AK_NOINLINE,
+       GNU_AK_RETURNS_TWICE,
        GNU_AK_NORETURN,
        GNU_AK_NAKED,
        GNU_AK_PURE,

diff --git a/entity_t.h b/entity_t.h
index d894ef7..76f8110 100644 (file)
--- a/entity_t.h
+++ b/entity_t.h
@@ -89,7 +89,8 @@ typedef enum decl_modifier_t {
        DM_FASTCALL          = 1 << 22,
        DM_STDCALL           = 1 << 23,
        DM_THISCALL          = 1 << 24,
-       DM_DEPRECATED        = 1 << 25
+       DM_DEPRECATED        = 1 << 25,
+       DM_RETURNS_TWICE     = 1 << 26,
 } decl_modifier_t;
 
 typedef unsigned decl_modifiers_t;

diff --git a/parser.c b/parser.c
index c430829..e226fa7 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -150,24 +150,25 @@ static declaration_t      **incomplete_arrays;
 static const symbol_t *sym_anonymous = NULL;
 
 /* symbols for Microsoft extended-decl-modifier */
-static const symbol_t *sym_align      = NULL;
-static const symbol_t *sym_allocate   = NULL;
-static const symbol_t *sym_dllimport  = NULL;
-static const symbol_t *sym_dllexport  = NULL;
-static const symbol_t *sym_naked      = NULL;
-static const symbol_t *sym_noinline   = NULL;
-static const symbol_t *sym_noreturn   = NULL;
-static const symbol_t *sym_nothrow    = NULL;
-static const symbol_t *sym_novtable   = NULL;
-static const symbol_t *sym_property   = NULL;
-static const symbol_t *sym_get        = NULL;
-static const symbol_t *sym_put        = NULL;
-static const symbol_t *sym_selectany  = NULL;
-static const symbol_t *sym_thread     = NULL;
-static const symbol_t *sym_uuid       = NULL;
-static const symbol_t *sym_deprecated = NULL;
-static const symbol_t *sym_restrict   = NULL;
-static const symbol_t *sym_noalias    = NULL;
+static const symbol_t *sym_align         = NULL;
+static const symbol_t *sym_allocate      = NULL;
+static const symbol_t *sym_dllimport     = NULL;
+static const symbol_t *sym_dllexport     = NULL;
+static const symbol_t *sym_naked         = NULL;
+static const symbol_t *sym_noinline      = NULL;
+static const symbol_t *sym_returns_twice = NULL;
+static const symbol_t *sym_noreturn      = NULL;
+static const symbol_t *sym_nothrow       = NULL;
+static const symbol_t *sym_novtable      = NULL;
+static const symbol_t *sym_property      = NULL;
+static const symbol_t *sym_get           = NULL;
+static const symbol_t *sym_put           = NULL;
+static const symbol_t *sym_selectany     = NULL;
+static const symbol_t *sym_thread        = NULL;
+static const symbol_t *sym_uuid          = NULL;
+static const symbol_t *sym_deprecated    = NULL;
+static const symbol_t *sym_restrict      = NULL;
+static const symbol_t *sym_noalias       = NULL;
 
 /** The token anchor set */
 static unsigned char token_anchor_set[T_LAST_TOKEN];
@@ -1241,6 +1242,7 @@ static const char *const gnu_attribute_names[GNU_AK_LAST] = {
        [GNU_AK_FASTCALL]               = "fastcall",
        [GNU_AK_DEPRECATED]             = "deprecated",
        [GNU_AK_NOINLINE]               = "noinline",
+       [GNU_AK_RETURNS_TWICE]          = "returns_twice",
        [GNU_AK_NORETURN]               = "noreturn",
        [GNU_AK_NAKED]                  = "naked",
        [GNU_AK_PURE]                   = "pure",
@@ -1788,6 +1790,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes)
                                case GNU_AK_DLLEXPORT:         modifiers |= DM_DLLEXPORT;         goto no_arg;
                                case GNU_AK_PACKED:            modifiers |= DM_PACKED;            goto no_arg;
                                case GNU_AK_NOINLINE:          modifiers |= DM_NOINLINE;          goto no_arg;
+                               case GNU_AK_RETURNS_TWICE:     modifiers |= DM_RETURNS_TWICE;     goto no_arg;
                                case GNU_AK_NORETURN:          modifiers |= DM_NORETURN;          goto no_arg;
                                case GNU_AK_NOTHROW:           modifiers |= DM_NOTHROW;           goto no_arg;
                                case GNU_AK_TRANSPARENT_UNION: modifiers |= DM_TRANSPARENT_UNION; goto no_arg;
@@ -3372,6 +3375,9 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe
                } else if (symbol == sym_noinline) {
                        next_token();
                        DET_MOD(noinline, DM_NOINLINE);
+               } else if (symbol == sym_returns_twice) {
+                       next_token();
+                       DET_MOD(returns_twice, DM_RETURNS_TWICE);
                } else if (symbol == sym_noreturn) {
                        next_token();
                        DET_MOD(noreturn, DM_NORETURN);
@@ -11373,24 +11379,25 @@ void init_parser(void)
 
        if (c_mode & _MS) {
                /* add predefined symbols for extended-decl-modifier */
-               sym_align      = symbol_table_insert("align");
-               sym_allocate   = symbol_table_insert("allocate");
-               sym_dllimport  = symbol_table_insert("dllimport");
-               sym_dllexport  = symbol_table_insert("dllexport");
-               sym_naked      = symbol_table_insert("naked");
-               sym_noinline   = symbol_table_insert("noinline");
-               sym_noreturn   = symbol_table_insert("noreturn");
-               sym_nothrow    = symbol_table_insert("nothrow");
-               sym_novtable   = symbol_table_insert("novtable");
-               sym_property   = symbol_table_insert("property");
-               sym_get        = symbol_table_insert("get");
-               sym_put        = symbol_table_insert("put");
-               sym_selectany  = symbol_table_insert("selectany");
-               sym_thread     = symbol_table_insert("thread");
-               sym_uuid       = symbol_table_insert("uuid");
-               sym_deprecated = symbol_table_insert("deprecated");
-               sym_restrict   = symbol_table_insert("restrict");
-               sym_noalias    = symbol_table_insert("noalias");
+               sym_align         = symbol_table_insert("align");
+               sym_allocate      = symbol_table_insert("allocate");
+               sym_dllimport     = symbol_table_insert("dllimport");
+               sym_dllexport     = symbol_table_insert("dllexport");
+               sym_naked         = symbol_table_insert("naked");
+               sym_noinline      = symbol_table_insert("noinline");
+               sym_returns_twice = symbol_table_insert("returns_twice");
+               sym_noreturn      = symbol_table_insert("noreturn");
+               sym_nothrow       = symbol_table_insert("nothrow");
+               sym_novtable      = symbol_table_insert("novtable");
+               sym_property      = symbol_table_insert("property");
+               sym_get           = symbol_table_insert("get");
+               sym_put           = symbol_table_insert("put");
+               sym_selectany     = symbol_table_insert("selectany");
+               sym_thread        = symbol_table_insert("thread");
+               sym_uuid          = symbol_table_insert("uuid");
+               sym_deprecated    = symbol_table_insert("deprecated");
+               sym_restrict      = symbol_table_insert("restrict");
+               sym_noalias       = symbol_table_insert("noalias");
        }
        memset(token_anchor_set, 0, sizeof(token_anchor_set));