Skip to content

R
riscv-gcc-1
Commit e79fc3d4 by Edward Smith-Rowland Committed by Edward Smith-Rowland
Options

Implement N3928 - Extending static_assert 

cp/

2015-06-24  Edward Smith-Rowland  <3dw4rd@verizon.net>

	Implement N3928 - Extending static_assert
	* parser.c (cp_parser_static_assert): Support static_assert with
	no message string.  Supply an empty string in this case.
	* semantics.c (finish_static_assert): Don't try to print a message if
	the message strnig is empty.


testsuite/

2015-06-24  Edward Smith-Rowland  <3dw4rd@verizon.net>

	Implement N3928 - Extending static_assert
	* g++.dg/cpp0x/static_assert8.C: Adjust.
	* g++.dg/cpp0x/static_assert12.C: New.
	* g++.dg/cpp0x/static_assert13.C: New.
	* g++.dg/cpp1y/static_assert1.C: New.
	* g++.dg/cpp1y/static_assert2.C: New.
	* g++.dg/cpp1z/static_assert-nomsg.C: New.

From-SVN: r224903
parent aa97bb6f
Showing with 203 additions and 15 deletions
gcc/cp/ChangeLog
2015-06-24 Edward Smith-Rowland <3dw4rd@verizon.net>
Implement N3928 - Extending static_assert
* parser.c (cp_parser_static_assert): Support static_assert with
no message string. Supply an empty string in this case.
* semantics.c (finish_static_assert): Don't try to print a message if
the message strnig is empty.
2015-06-24 Adam Butcher <adam@jessamine.co.uk>
PR c++/65750
......
gcc/cp/parser.c
......@@ -12173,6 +12173,7 @@ cp_parser_linkage_specification (cp_parser* parser)
static_assert-declaration:
static_assert ( constant-expression , string-literal ) ;
static_assert ( constant-expression ) ; (C++1Z)
If MEMBER_P, this static_assert is a class member. */
......@@ -12210,20 +12211,35 @@ cp_parser_static_assert(cp_parser *parser, bool member_p)
/*allow_non_constant_p=*/true,
/*non_constant_p=*/&dummy);
/* Parse the separating `,'. */
cp_parser_require (parser, CPP_COMMA, RT_COMMA);
if (cp_lexer_peek_token (parser->lexer)->type == CPP_CLOSE_PAREN)
{
if (cxx_dialect < cxx1z)
pedwarn (input_location, OPT_Wpedantic,
"static_assert without a message "
"only available with -std=c++1z or -std=gnu++1z");
/* Eat the ')' */
cp_lexer_consume_token (parser->lexer);
message = build_string (1, "");
TREE_TYPE (message) = char_array_type_node;
fix_string_type (message);
}
else
{
/* Parse the separating `,'. */
cp_parser_require (parser, CPP_COMMA, RT_COMMA);
/* Parse the string-literal message. */
message = cp_parser_string_literal (parser,
/*translate=*/false,
/*wide_ok=*/true);
/* Parse the string-literal message. */
message = cp_parser_string_literal (parser,
/*translate=*/false,
/*wide_ok=*/true);
/* A `)' completes the static assertion. */
if (!cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN))
cp_parser_skip_to_closing_parenthesis (parser,
/*recovering=*/true,
/*or_comma=*/false,
/*consume_paren=*/true);
/* A `)' completes the static assertion. */
if (!cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN))
cp_parser_skip_to_closing_parenthesis (parser,
/*recovering=*/true,
/*or_comma=*/false,
/*consume_paren=*/true);
}
/* A semicolon terminates the declaration. */
cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON);
......
gcc/cp/semantics.c
......@@ -7174,8 +7174,17 @@ finish_static_assert (tree condition, tree message, location_t location,
input_location = location;
if (TREE_CODE (condition) == INTEGER_CST
&& integer_zerop (condition))
/* Report the error. */
error ("static assertion failed: %s", TREE_STRING_POINTER (message));
{
int sz = TREE_INT_CST_LOW (TYPE_SIZE_UNIT
(TREE_TYPE (TREE_TYPE (message))));
int len = TREE_STRING_LENGTH (message) / sz - 1;
/* Report the error. */
if (len == 0)
error ("static assertion failed");
else
error ("static assertion failed: %s",
TREE_STRING_POINTER (message));
}
else if (condition && condition != error_mark_node)
{
error ("non-constant condition for static assertion");
......
gcc/testsuite/ChangeLog
2015-06-24 Edward Smith-Rowland <3dw4rd@verizon.net>
Implement N3928 - Extending static_assert
* g++.dg/cpp0x/static_assert8.C: Adjust.
* g++.dg/cpp0x/static_assert12.C: New.
* g++.dg/cpp0x/static_assert13.C: New.
* g++.dg/cpp1y/static_assert1.C: New.
* g++.dg/cpp1y/static_assert2.C: New.
* g++.dg/cpp1z/static_assert-nomsg.C: New.
2015-06-24 Adam Butcher <adam@jessamine.co.uk>
PR c++/65750
......
gcc/testsuite/g++.dg/cpp0x/static_assert12.C 0 → 100644
// { dg-do compile }
// { dg-options "-std=gnu++11 -pedantic" }
template<typename T>
struct is_float
{
static constexpr bool value = false;
};
template<>
struct is_float<float>
{
static constexpr bool value = true;
};
template<typename T>
T
float_thing(T __x)
{
static_assert(is_float<T>::value, ""); // { dg-error "static assertion failed" }
static_assert(is_float<T>::value); // { dg-error "static assertion failed" }
}
int
main()
{
float_thing(1);
}
// { dg-warning "static_assert without a message only available with " "" { target *-*-* } 21 }
gcc/testsuite/g++.dg/cpp0x/static_assert13.C 0 → 100644
// { dg-do compile }
// { dg-options "-std=gnu++11" }
template<typename T>
struct is_float
{
static constexpr bool value = false;
};
template<>
struct is_float<float>
{
static constexpr bool value = true;
};
template<typename T>
T
float_thing(T __x)
{
static_assert(is_float<T>::value, ""); // { dg-error "static assertion failed" }
static_assert(is_float<T>::value); // { dg-error "static assertion failed" }
}
int
main()
{
float_thing(1);
}
gcc/testsuite/g++.dg/cpp0x/static_assert8.C
// { dg-do compile { target c++11 } }
static_assert (1 == 0); // { dg-error "expected (string-literal|',') before" }
static_assert (1 == 0); // { dg-error "static assertion failed" }
static_assert (1 == 0,); // { dg-error "expected string-literal before '\\)'" }
static_assert (1 == 0, "oops"); // { dg-error "static assertion failed" }
// { dg-error "static_assert without a message only available with " "" { target *-*-* } 3 }
gcc/testsuite/g++.dg/cpp1y/static_assert1.C 0 → 100644
// { dg-do compile }
// { dg-options "-std=gnu++14 -pedantic" }
template<typename T>
struct is_float
{
static constexpr bool value = false;
};
template<>
struct is_float<float>
{
static constexpr bool value = true;
};
template<typename T>
T
float_thing(T __x)
{
static_assert(is_float<T>::value, ""); // { dg-error "static assertion failed" }
static_assert(is_float<T>::value); // { dg-error "static assertion failed" }
}
int
main()
{
float_thing(1);
}
// { dg-warning "static_assert without a message only available with " "" { target *-*-* } 21 }
gcc/testsuite/g++.dg/cpp1y/static_assert2.C 0 → 100644
// { dg-do compile }
// { dg-options "-std=gnu++14" }
template<typename T>
struct is_float
{
static constexpr bool value = false;
};
template<>
struct is_float<float>
{
static constexpr bool value = true;
};
template<typename T>
T
float_thing(T __x)
{
static_assert(is_float<T>::value, ""); // { dg-error "static assertion failed" }
static_assert(is_float<T>::value); // { dg-error "static assertion failed" }
}
int
main()
{
float_thing(1);
}
gcc/testsuite/g++.dg/cpp1z/static_assert-nomsg.C 0 → 100644
// { dg-do compile { target c++1z } }
template<typename T>
struct is_float
{
static constexpr bool value = false;
};
template<>
struct is_float<float>
{
static constexpr bool value = true;
};
template<typename T>
T
float_thing(T __x)
{
static_assert(is_float<T>::value, ""); // { dg-error "static assertion failed" }
static_assert(is_float<T>::value); // { dg-error "static assertion failed" }
}
int
main()
{
float_thing(1);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment