encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tint: Fix clang chromium-style warnings treated as errors 

When importing Dawn into Tint:

error: [chromium-style] auto variable type must not deduce to a raw pointer type.
Change-Id: I6ff4451a5519c38b18eb8d96f6bc82b8090077f8
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/90500
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ben Clayton 2022-05-16 12:04:01 +00:00 committed by Dawn LUCI CQ
parent e6b6777c8e
commit 9ff8abf347
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tint/resolver/uniformity.cc
View File

@ -566,14 +566,14 @@ class UniformityGraph {
[&](const ast::ForLoopStatement* f) { [&](const ast::ForLoopStatement* f) {
auto* sem_loop = sem_.Get(f); auto* sem_loop = sem_.Get(f);
auto cfx = CreateNode("loop_start"); auto* cfx = CreateNode("loop_start");
// Insert the initializer before the loop. // Insert the initializer before the loop.
auto cf_init = cf; auto* cf_init = cf;
if (f->initializer) { if (f->initializer) {
cf_init = ProcessStatement(cf, f->initializer); cf_init = ProcessStatement(cf, f->initializer);
} }
auto cf_start = cf_init; auto* cf_start = cf_init;
auto& info = current_function_->loop_switch_infos[sem_loop]; auto& info = current_function_->loop_switch_infos[sem_loop];
info.type = "forloop"; info.type = "forloop";
@ -604,11 +604,11 @@ class UniformityGraph {
exit_node->AddEdge(current_function_->variables.Get(var)); exit_node->AddEdge(current_function_->variables.Get(var));
} }
} }
auto cf1 = ProcessStatement(cf_start, f->body); auto* cf1 = ProcessStatement(cf_start, f->body);
// Insert the continuing statement at the end of the loop body. // Insert the continuing statement at the end of the loop body.
if (f->continuing) { if (f->continuing) {
auto cf2 = ProcessStatement(cf1, f->continuing); auto* cf2 = ProcessStatement(cf1, f->continuing);
cfx->AddEdge(cf2); cfx->AddEdge(cf2);
} else { } else {
cfx->AddEdge(cf1); cfx->AddEdge(cf1);
@ -660,7 +660,7 @@ class UniformityGraph {
current_function_->variables.Push(); current_function_->variables.Push();
// Process the statement. // Process the statement.
auto cf_out = ProcessStatement(cf_in, s); auto* cf_out = ProcessStatement(cf_in, s);
assigned_vars = current_function_->variables.Top(); assigned_vars = current_function_->variables.Top();
@ -669,7 +669,7 @@ class UniformityGraph {
return cf_out; return cf_out;
}; };
auto cf1 = process_in_scope(v, i->body, true_vars); auto* cf1 = process_in_scope(v, i->body, true_vars);
bool true_has_next = sem_.Get(i->body)->Behaviors().Contains(sem::Behavior::kNext); bool true_has_next = sem_.Get(i->body)->Behaviors().Contains(sem::Behavior::kNext);
bool false_has_next = true; bool false_has_next = true;
@ -683,7 +683,7 @@ class UniformityGraph {
} }
// Update values for any variables assigned in the if or else blocks. // Update values for any variables assigned in the if or else blocks.
for (auto var : current_function_->local_var_decls) { for (auto* var : current_function_->local_var_decls) {
// Skip variables not assigned in either block. // Skip variables not assigned in either block.
if (true_vars.count(var) == 0 && false_vars.count(var) == 0) { if (true_vars.count(var) == 0 && false_vars.count(var) == 0) {
continue; continue;
@ -738,7 +738,7 @@ class UniformityGraph {
[&](const ast::LoopStatement* l) { [&](const ast::LoopStatement* l) {
auto* sem_loop = sem_.Get(l); auto* sem_loop = sem_.Get(l);
auto cfx = CreateNode("loop_start"); auto* cfx = CreateNode("loop_start");
auto& info = current_function_->loop_switch_infos[sem_loop]; auto& info = current_function_->loop_switch_infos[sem_loop];
info.type = "loop"; info.type = "loop";
@ -752,9 +752,9 @@ class UniformityGraph {
current_function_->variables.Set(v, in_node); current_function_->variables.Set(v, in_node);
} }
auto cf1 = ProcessStatement(cfx, l->body); auto* cf1 = ProcessStatement(cfx, l->body);
if (l->continuing) { if (l->continuing) {
auto cf2 = ProcessStatement(cf1, l->continuing); auto* cf2 = ProcessStatement(cf1, l->continuing);
cfx->AddEdge(cf2); cfx->AddEdge(cf2);
} else { } else {
cfx->AddEdge(cf1); cfx->AddEdge(cf1);
@ -823,7 +823,7 @@ class UniformityGraph {
auto& info = current_function_->loop_switch_infos[sem_switch]; auto& info = current_function_->loop_switch_infos[sem_switch];
info.type = "switch"; info.type = "switch";
auto cf_n = v; auto* cf_n = v;
bool previous_case_has_fallthrough = false; bool previous_case_has_fallthrough = false;
for (auto* c : s->body) { for (auto* c : s->body) {
auto* sem_case = sem_.Get(c); auto* sem_case = sem_.Get(c);