Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

glr2.cc: also run all the calculator tests

Browse Source 
This revealed issues with yy_symbol_print and yy_reduce_print.
These changes, in turn, reactivated GCC10 warnings:

    559. calc.at:1258: testing Calculator glr2.cc %locations %header parse.error=verbose %debug api.prefix={calc} %verbose %parse-param {semantic_value *result}{int *count}{int *nerrs}  ...
    tests/calc.at:1258: COLUMNS=1000; export COLUMNS; NO_TERM_HYPERLINKS=1; export NO_TERM_HYPERLINKS;  bison --color=no -fno-caret -Wno-deprecated -o calc.cc calc.y
    tests/calc.at:1258: $CXX $CXXFLAGS $CPPFLAGS  $LDFLAGS -o calc calc.cc calc-lex.cc calc-main.cc $LIBS
    stderr:
    calc.cc: In function 'void glr_stack::yyresolveLocations(glr_state*, int)':
    calc.cc:2623:46: error: potential null pointer dereference [-Werror=null-dereference]
     2623 |                 yyrhsloc[0].getState().yyloc = yyoption->state()->yyloc;
          |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
    calc.cc:2623:46: error: potential null pointer dereference [-Werror=null-dereference]
     2623 |                 yyrhsloc[0].getState().yyloc = yyoption->state()->yyloc;
          |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
    calc.cc:2623:46: error: potential null pointer dereference [-Werror=null-dereference]
     2623 |                 yyrhsloc[0].getState().yyloc = yyoption->state()->yyloc;
          |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
    calc.cc:1177:10: error: potential null pointer dereference [-Werror=null-dereference]
     1177 |   return yypred ? &(asItem (this) - yypred)->getState () : YY_NULLPTR;
          |          ^~~~~~
    calc.cc:2623:46: error: potential null pointer dereference [-Werror=null-dereference]
     2623 |                 yyrhsloc[0].getState().yyloc = yyoption->state()->yyloc;
          |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
    calc.cc:2623:46: error: potential null pointer dereference [-Werror=null-dereference]
     2623 |                 yyrhsloc[0].getState().yyloc = yyoption->state()->yyloc;
          |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
    calc.cc: In member function 'YYRESULTTAG glr_stack::yyresolveValue(glr_state*)':
    calc.cc:2623:46: error: potential null pointer dereference [-Werror=null-dereference]
     2623 |                 yyrhsloc[0].getState().yyloc = yyoption->state()->yyloc;
          |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~

* tests/calc.at (AT_CHECK_CALC_GLR_CC): Also check glr2.cc.
* data/skeletons/glr2.cc: Don't pass the user arguments to
yy_symbol_print and yy_reduce_print, since they have it in the parser
object.
(b4_user_formals_no_comma, b4_pure_args, b4_lpure_args)
(b4_locuser_formals, b4_locuser_args): Remove, useless.
(YY_IGNORE_NULL_DEREFERENCE_BEGIN): Enable for GCC >= 10 too.
This commit is contained in:
Akim Demaille
2020-09-20 17:20:50 +02:00
parent f8cd049ecc
commit 8dc60543c8
2 changed files with 17 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
data/skeletons/glr2.cc
View File

@@ -352,42 +352,7 @@ b4_define_flag_if([pure])
# This is not shared with yacc.c in c.m4 because GLR relies on ISO C # This is not shared with yacc.c in c.m4 because GLR relies on ISO C
# formal argument declarations. # formal argument declarations.
m4_define([b4_user_formals], m4_define([b4_user_formals],
[m4_ifset([b4_parse_param], [, b4_user_formals_no_comma])]) [m4_ifset([b4_parse_param], [, b4_formals(b4_parse_param)])])
# b4_user_formals_no_comma
# ------------------------
# The possible parse-params formal arguments.
m4_define([b4_user_formals_no_comma],
[m4_ifset([b4_parse_param], [b4_formals(b4_parse_param)])])
# b4_pure_args
# ------------
# Optional effective arguments passed to yyerror: user args plus yylloc, and
# a leading comma.
m4_define([b4_pure_args],
[b4_pure_if([b4_locations_if([, yylocp])])[]b4_user_args])
# b4_lpure_args
# -------------
# Same as above, but on the lookahead, hence &yylloc instead of yylocp. This is
# used only inside glr_stack, so there's no need to explicitly pass yyparser.
m4_define([b4_lpure_args],
[b4_pure_if([b4_locations_if([, &yylloc])])[]b4_user_args])
# b4_locuser_formals(LOC = yylocp)
# --------------------------------
# User formal arguments, possibly preceded by location argument.
m4_define([b4_locuser_formals],
[b4_locations_if([, YYLTYPE *m4_default([$1], [yylocp])])[]b4_user_formals])
# b4_locuser_args(LOC = yylocp)
# -----------------------------
m4_define([b4_locuser_args],
[b4_locations_if([, m4_default([$1], [yylocp])])[]b4_user_args])
# b4_symbol_kind(NUM) # b4_symbol_kind(NUM)
@@ -552,7 +517,7 @@ static YYLTYPE yyloc_default][]b4_yyloc_default;])[
]b4_attribute_define([noreturn])[ ]b4_attribute_define([noreturn])[
#if defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ && __GNUC__ <= 9 #if defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__
# define YY_IGNORE_NULL_DEREFERENCE_BEGIN \ # define YY_IGNORE_NULL_DEREFERENCE_BEGIN \
_Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic push") \
_Pragma ("GCC diagnostic ignored \"-Wnull-dereference\"") _Pragma ("GCC diagnostic ignored \"-Wnull-dereference\"")
@@ -715,7 +680,7 @@ enum YYRESULTTAG { yyok, yyaccept, yyabort, yyerr };
if (yydebug) \ if (yydebug) \
{ \ { \
std::cerr << Title << ' '; \ std::cerr << Title << ' '; \
yyparser.yy_symbol_print_ (Type, Value]b4_locuser_args([Location])[);\ yyparser.yy_symbol_print_ (Type, Value]b4_locations_if([, Location])[); \
std::cerr << '\n'; \ std::cerr << '\n'; \
} \ } \
} while (0) } while (0)
@@ -1634,7 +1599,7 @@ class state_stack {
inline void inline void
yy_reduce_print (bool yynormal, glr_stack_item* yyvsp, state_set_index yyk, yy_reduce_print (bool yynormal, glr_stack_item* yyvsp, state_set_index yyk,
rule_num yyrule, ]b4_namespace_ref[::]b4_parser_class[& yyparser]b4_user_formals[) rule_num yyrule, ]b4_namespace_ref[::]b4_parser_class[& yyparser)
{ {
int yynrhs = yyrhsLength (yyrule);]b4_locations_if([ int yynrhs = yyrhsLength (yyrule);]b4_locations_if([
int yylow = 1;])[ int yylow = 1;])[
@@ -1648,9 +1613,8 @@ class state_stack {
std::cerr << " $" << yyi + 1 << " = "; std::cerr << " $" << yyi + 1 << " = ";
yyparser.yy_symbol_print_ yyparser.yy_symbol_print_
(static_cast<yysymbol_kind_t>(yystos[yyvsp[yyi - yynrhs + 1].getState().yylrState]), (static_cast<yysymbol_kind_t>(yystos[yyvsp[yyi - yynrhs + 1].getState().yylrState]),
&yyvsp[yyi - yynrhs + 1].getState().semanticVal()]b4_locations_if([, &yyvsp[yyi - yynrhs + 1].getState().semanticVal()]b4_locations_if([[,
&]b4_rhs_location(yynrhs, yyi + 1))[]dnl &]b4_rhs_location(yynrhs, yyi + 1)])[);
b4_user_args[);
if (!yyvsp[yyi - yynrhs + 1].getState().yyresolved) if (!yyvsp[yyi - yynrhs + 1].getState().yyresolved)
std::cerr << " (unresolved)"; std::cerr << " (unresolved)";
std::cerr << '\n'; std::cerr << '\n';
@@ -1816,13 +1780,12 @@ class glr_stack
{ {
public: public:
glr_stack(size_t yysize, ]b4_namespace_ref[::]b4_parser_class[& yyparser_yyarg]m4_ifset([b4_parse_param], [, b4_parse_param_decl])[) glr_stack (size_t yysize, ]b4_namespace_ref[::]b4_parser_class[& yyparser_yyarg]m4_ifset([b4_parse_param], [, b4_parse_param_decl])[)
: yyerrState(0) : yyerrState (0)
, yystateStack(yysize) , yystateStack (yysize)
, yyerrcnt(0) , yyerrcnt (0)
, yyrawchar(0) , yyrawchar (0)
, yyparser(yyparser_yyarg)]m4_ifset([b4_parse_param], [ , yyparser (yyparser_yyarg)]m4_ifset([b4_parse_param], [,b4_parse_param_cons])[
, b4_parse_param_cons])[
{} {}
~glr_stack () ~glr_stack ()
@@ -2274,7 +2237,7 @@ public:
/* Standard special case: single stack. */ /* Standard special case: single stack. */
YYASSERT (yyk.get() == 0); YYASSERT (yyk.get() == 0);
glr_stack_item* yyrhs = yystateStack.firstTop()->asItem(); glr_stack_item* yyrhs = yystateStack.firstTop()->asItem();
YY_REDUCE_PRINT ((true, yyrhs, yyk, yyrule, yyparser]b4_user_args[)); YY_REDUCE_PRINT ((true, yyrhs, yyk, yyrule, yyparser));
YYRESULTTAG res = yyuserAction (yyrule, yynrhs, yyrhs, YYRESULTTAG res = yyuserAction (yyrule, yynrhs, yyrhs,
yyvalp]b4_locations_if([, yylocp])[); yyvalp]b4_locations_if([, yylocp])[);
yystateStack.pop_back(static_cast<size_t>(yynrhs)); yystateStack.pop_back(static_cast<size_t>(yynrhs));
@@ -2296,7 +2259,7 @@ public:
} }
yystateStack.yyupdateSplit (*yys); yystateStack.yyupdateSplit (*yys);
yystateStack.setTopAt(yyk, yys); yystateStack.setTopAt(yyk, yys);
YY_REDUCE_PRINT ((false, yyrhsVals + YYMAXRHS + YYMAXLEFT - 1, yyk, yyrule, yyparser]b4_user_args[)); YY_REDUCE_PRINT ((false, yyrhsVals + YYMAXRHS + YYMAXLEFT - 1, yyk, yyrule, yyparser));
return yyuserAction (yyrule, yynrhs, yyrhsVals + YYMAXRHS + YYMAXLEFT - 1, return yyuserAction (yyrule, yynrhs, yyrhsVals + YYMAXRHS + YYMAXLEFT - 1,
yyvalp]b4_locations_if([, yylocp])[); yyvalp]b4_locations_if([, yylocp])[);
} }

4
tests/calc.at
View File

@@ -1239,7 +1239,9 @@ AT_CHECK_CALC([%skeleton "glr.cc"])
AT_CHECK_CALC([%skeleton "glr2.cc"]) AT_CHECK_CALC([%skeleton "glr2.cc"])
m4_define([AT_CHECK_CALC_GLR_CC], m4_define([AT_CHECK_CALC_GLR_CC],
[AT_CHECK_CALC([%language "C++" %glr-parser] $@)]) [AT_CHECK_CALC([%language "C++" %glr-parser] $@) # glr.cc
AT_CHECK_CALC([%skeleton "glr2.cc"] $@)
])
AT_CHECK_CALC_GLR_CC([]) AT_CHECK_CALC_GLR_CC([])
AT_CHECK_CALC_GLR_CC([%locations]) AT_CHECK_CALC_GLR_CC([%locations])