encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-06 14:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review feeback from 106420

Browse Source 
Change-Id: I9c1ec7f26b0fda25bcedc86fec66d174fe81ed5f
Bug: tint:1633, tint:1451
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/106843
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
This commit is contained in:
dan sinclair 2022-10-24 17:49:20 +00:00 committed by Dawn LUCI CQ
parent 29f61747bf
commit 3a1b799585
13 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tint/ast/break_if_statement.h
View File

@ -22,7 +22,7 @@
namespace tint::ast { namespace tint::ast {
/// A break if statement /// A break-if statement
class BreakIfStatement final : public Castable<BreakIfStatement, Statement> { class BreakIfStatement final : public Castable<BreakIfStatement, Statement> {
public: public:
/// Constructor /// Constructor

6
src/tint/reader/wgsl/parser_impl.cc
View File

@ -2456,10 +2456,10 @@ Maybe<const ast::Statement*> ParserImpl::break_if_statement() {
return Failure::kErrored; return Failure::kErrored;
} }
if (!expr.matched) { if (!expr.matched) {
return add_error(t1, "expected expression for `break if`"); return add_error(t1, "expected expression for `break-if`");
} }
if (!match(Token::Type::kSemicolon)) { if (!expect("`break-if` statement", Token::Type::kSemicolon)) {
return add_error(peek(), "expected ';' for `break if` statement"); return Failure::kErrored;
} }
return create<ast::BreakIfStatement>(t1.source(), expr.value); return create<ast::BreakIfStatement>(t1.source(), expr.value);

6
src/tint/reader/wgsl/parser_impl_loop_stmt_test.cc
View File

@ -129,7 +129,7 @@ TEST_F(ParserImplTest, LoopStmt_Continuing_BreakIf_MissingExpr) {
EXPECT_TRUE(e.errored); EXPECT_TRUE(e.errored);
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(e.value, nullptr); EXPECT_EQ(e.value, nullptr);
EXPECT_EQ(p->error(), "1:21: expected expression for `break if`"); EXPECT_EQ(p->error(), "1:21: expected expression for `break-if`");
} }
TEST_F(ParserImplTest, LoopStmt_Continuing_BreakIf_InvalidExpr) { TEST_F(ParserImplTest, LoopStmt_Continuing_BreakIf_InvalidExpr) {
@ -139,7 +139,7 @@ TEST_F(ParserImplTest, LoopStmt_Continuing_BreakIf_InvalidExpr) {
EXPECT_TRUE(e.errored); EXPECT_TRUE(e.errored);
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(e.value, nullptr); EXPECT_EQ(e.value, nullptr);
EXPECT_EQ(p->error(), "1:21: expected expression for `break if`"); EXPECT_EQ(p->error(), "1:21: expected expression for `break-if`");
} }
TEST_F(ParserImplTest, LoopStmt_NoContinuing_BreakIf) { TEST_F(ParserImplTest, LoopStmt_NoContinuing_BreakIf) {
@ -159,7 +159,7 @@ TEST_F(ParserImplTest, LoopStmt_Continuing_BreakIf_MissingSemicolon) {
EXPECT_TRUE(e.errored); EXPECT_TRUE(e.errored);
EXPECT_TRUE(p->has_error()); EXPECT_TRUE(p->has_error());
EXPECT_EQ(e.value, nullptr); EXPECT_EQ(e.value, nullptr);
EXPECT_EQ(p->error(), "1:40: expected ';' for `break if` statement"); EXPECT_EQ(p->error(), "1:40: expected ';' for `break-if` statement");
} }
} // namespace } // namespace

20
src/tint/resolver/validation_test.cc
View File

@ -1126,7 +1126,7 @@ TEST_F(ResolverValidationTest, Stmt_BreakInIfTrueInContinuing) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 warning: use of deprecated language feature: `break` must not be used to exit " "12:34 warning: use of deprecated language feature: `break` must not be used to exit "
"from a continuing block. Use break-if instead."); "from a continuing block. Use `break-if` instead.");
} }
TEST_F(ResolverValidationTest, Stmt_BreakInIfElseInContinuing) { TEST_F(ResolverValidationTest, Stmt_BreakInIfElseInContinuing) {
@ -1140,7 +1140,7 @@ TEST_F(ResolverValidationTest, Stmt_BreakInIfElseInContinuing) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 warning: use of deprecated language feature: `break` must not be used to exit " "12:34 warning: use of deprecated language feature: `break` must not be used to exit "
"from a continuing block. Use break-if instead."); "from a continuing block. Use `break-if` instead.");
} }
TEST_F(ResolverValidationTest, Stmt_BreakInContinuing) { TEST_F(ResolverValidationTest, Stmt_BreakInContinuing) {
@ -1151,7 +1151,7 @@ TEST_F(ResolverValidationTest, Stmt_BreakInContinuing) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 warning: use of deprecated language feature: `break` must not be used to exit " "12:34 warning: use of deprecated language feature: `break` must not be used to exit "
"from a continuing block. Use break-if instead.\n" "from a continuing block. Use `break-if` instead.\n"
"12:34 error: break statement in a continuing block must be the single " "12:34 error: break statement in a continuing block must be the single "
"statement of an if statement's true or false block, and that if " "statement of an if statement's true or false block, and that if "
"statement must be the last statement of the continuing block\n" "statement must be the last statement of the continuing block\n"
@ -1170,7 +1170,7 @@ TEST_F(ResolverValidationTest, Stmt_BreakInIfInIfInContinuing) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 warning: use of deprecated language feature: `break` must not be used to exit " "12:34 warning: use of deprecated language feature: `break` must not be used to exit "
"from a continuing block. Use break-if instead.\n" "from a continuing block. Use `break-if` instead.\n"
"12:34 error: break statement in a continuing block must be the single " "12:34 error: break statement in a continuing block must be the single "
"statement of an if statement's true or false block, and that if " "statement of an if statement's true or false block, and that if "
"statement must be the last statement of the continuing block\n" "statement must be the last statement of the continuing block\n"
@ -1189,7 +1189,7 @@ TEST_F(ResolverValidationTest, Stmt_BreakInIfTrueMultipleStmtsInContinuing) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 warning: use of deprecated language feature: `break` must not be used to exit " "12:34 warning: use of deprecated language feature: `break` must not be used to exit "
"from a continuing block. Use break-if instead.\n" "from a continuing block. Use `break-if` instead.\n"
"12:34 error: break statement in a continuing block must be the single " "12:34 error: break statement in a continuing block must be the single "
"statement of an if statement's true or false block, and that if " "statement of an if statement's true or false block, and that if "
"statement must be the last statement of the continuing block\n" "statement must be the last statement of the continuing block\n"
@ -1208,7 +1208,7 @@ TEST_F(ResolverValidationTest, Stmt_BreakInIfElseMultipleStmtsInContinuing) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 warning: use of deprecated language feature: `break` must not be used to exit " "12:34 warning: use of deprecated language feature: `break` must not be used to exit "
"from a continuing block. Use break-if instead.\n" "from a continuing block. Use `break-if` instead.\n"
"12:34 error: break statement in a continuing block must be the single " "12:34 error: break statement in a continuing block must be the single "
"statement of an if statement's true or false block, and that if " "statement of an if statement's true or false block, and that if "
"statement must be the last statement of the continuing block\n" "statement must be the last statement of the continuing block\n"
@ -1226,7 +1226,7 @@ TEST_F(ResolverValidationTest, Stmt_BreakInIfElseIfInContinuing) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 warning: use of deprecated language feature: `break` must not be used to exit " "12:34 warning: use of deprecated language feature: `break` must not be used to exit "
"from a continuing block. Use break-if instead.\n" "from a continuing block. Use `break-if` instead.\n"
"12:34 error: break statement in a continuing block must be the single " "12:34 error: break statement in a continuing block must be the single "
"statement of an if statement's true or false block, and that if " "statement of an if statement's true or false block, and that if "
"statement must be the last statement of the continuing block\n" "statement must be the last statement of the continuing block\n"
@ -1245,7 +1245,7 @@ TEST_F(ResolverValidationTest, Stmt_BreakInIfNonEmptyElseInContinuing) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 warning: use of deprecated language feature: `break` must not be used to exit " "12:34 warning: use of deprecated language feature: `break` must not be used to exit "
"from a continuing block. Use break-if instead.\n" "from a continuing block. Use `break-if` instead.\n"
"12:34 error: break statement in a continuing block must be the single " "12:34 error: break statement in a continuing block must be the single "
"statement of an if statement's true or false block, and that if " "statement of an if statement's true or false block, and that if "
"statement must be the last statement of the continuing block\n" "statement must be the last statement of the continuing block\n"
@ -1264,7 +1264,7 @@ TEST_F(ResolverValidationTest, Stmt_BreakInIfElseNonEmptyTrueInContinuing) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 warning: use of deprecated language feature: `break` must not be used to exit " "12:34 warning: use of deprecated language feature: `break` must not be used to exit "
"from a continuing block. Use break-if instead.\n" "from a continuing block. Use `break-if` instead.\n"
"12:34 error: break statement in a continuing block must be the single " "12:34 error: break statement in a continuing block must be the single "
"statement of an if statement's true or false block, and that if " "statement of an if statement's true or false block, and that if "
"statement must be the last statement of the continuing block\n" "statement must be the last statement of the continuing block\n"
@ -1282,7 +1282,7 @@ TEST_F(ResolverValidationTest, Stmt_BreakInIfInContinuingNotLast) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 warning: use of deprecated language feature: `break` must not be used to exit " "12:34 warning: use of deprecated language feature: `break` must not be used to exit "
"from a continuing block. Use break-if instead.\n" "from a continuing block. Use `break-if` instead.\n"
"12:34 error: break statement in a continuing block must be the single " "12:34 error: break statement in a continuing block must be the single "
"statement of an if statement's true or false block, and that if " "statement of an if statement's true or false block, and that if "
"statement must be the last statement of the continuing block\n" "statement must be the last statement of the continuing block\n"

7
src/tint/resolver/validator.cc
View File

@ -1465,7 +1465,7 @@ bool Validator::BreakStatement(const sem::Statement* stmt,
if (auto* continuing = ClosestContinuing(/*stop_at_loop*/ true, current_statement)) { if (auto* continuing = ClosestContinuing(/*stop_at_loop*/ true, current_statement)) {
AddWarning( AddWarning(
"use of deprecated language feature: `break` must not be used to exit from " "use of deprecated language feature: `break` must not be used to exit from "
"a continuing block. Use break-if instead.", "a continuing block. Use `break-if` instead.",
stmt->Declaration()->source); stmt->Declaration()->source);
auto fail = [&](const char* note_msg, const Source& note_src) { auto fail = [&](const char* note_msg, const Source& note_src) {
@ -1651,9 +1651,8 @@ bool Validator::BreakIfStatement(const sem::BreakIfStatement* stmt,
if (s->Is<sem::LoopStatement>()) { if (s->Is<sem::LoopStatement>()) {
break; break;
} }
if (s->Is<sem::LoopContinuingBlockStatement>()) { if (auto* continuing = s->As<sem::LoopContinuingBlockStatement>()) {
if (s->Declaration()->As<ast::BlockStatement>()->statements.Back() != if (continuing->Declaration()->statements.Back() != stmt->Declaration()) {
stmt->Declaration()) {
AddError("break-if must be last statement in a continuing block", AddError("break-if must be last statement in a continuing block",
stmt->Declaration()->source); stmt->Declaration()->source);
AddNote("see continuing block here", s->Declaration()->source); AddNote("see continuing block here", s->Declaration()->source);

4
src/tint/sem/loop_statement.cc
View File

@ -40,4 +40,8 @@ LoopContinuingBlockStatement::LoopContinuingBlockStatement(const ast::BlockState
} }
LoopContinuingBlockStatement::~LoopContinuingBlockStatement() = default; LoopContinuingBlockStatement::~LoopContinuingBlockStatement() = default;
const ast::BlockStatement* LoopContinuingBlockStatement::Declaration() const {
return static_cast<const ast::BlockStatement*>(Base::Declaration());
}
} // namespace tint::sem } // namespace tint::sem

3
src/tint/sem/loop_statement.h
View File

@ -53,6 +53,9 @@ class LoopContinuingBlockStatement final
/// Destructor /// Destructor
~LoopContinuingBlockStatement() override; ~LoopContinuingBlockStatement() override;
/// @returns the AST node
const ast::BlockStatement* Declaration() const;
}; };
} // namespace tint::sem } // namespace tint::sem

2
test/tint/bug/tint/1064.wgsl.expected.dxc.hlsl
View File

@ -1,4 +1,4 @@
bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use break-if instead. bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use `break-if` instead.
break; break;
^^^^^ ^^^^^

2
test/tint/bug/tint/1064.wgsl.expected.fxc.hlsl
View File

@ -1,4 +1,4 @@
bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use break-if instead. bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use `break-if` instead.
break; break;
^^^^^ ^^^^^

2
test/tint/bug/tint/1064.wgsl.expected.glsl
View File

@ -1,4 +1,4 @@
bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use break-if instead. bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use `break-if` instead.
break; break;
^^^^^ ^^^^^

2
test/tint/bug/tint/1064.wgsl.expected.msl
View File

@ -1,4 +1,4 @@
bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use break-if instead. bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use `break-if` instead.
break; break;
^^^^^ ^^^^^

2
test/tint/bug/tint/1064.wgsl.expected.spvasm
View File

@ -1,4 +1,4 @@
bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use break-if instead. bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use `break-if` instead.
break; break;
^^^^^ ^^^^^

2
test/tint/bug/tint/1064.wgsl.expected.wgsl
View File

@ -1,4 +1,4 @@
bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use break-if instead. bug/tint/1064.wgsl:12:9 warning: use of deprecated language feature: `break` must not be used to exit from a continuing block. Use `break-if` instead.
break; break;
^^^^^ ^^^^^