commit b053acf796c27eb4738c966db4a52c8d14bffdad
author Ben Clayton <bclayton@google.com> Mon Nov 16 16:31:07 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Mon Nov 16 16:31:07 2020 +0000
tree c45aed9806e7afd09ee55ad03757e4276849051c
parent 0613890eedd7e0226d917e8e5a2a660cd36de0ec

Replace use of std::unique_ptr<T> with T* for AST nodes

This is a minimal effort to fix up the code. There's substantial code
cleanup which can now be done, which is done in the next change.

Bug: tint:322
Change-Id: Iafcf5e814837d9534889e8c21333de4931a19cfa
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/32864
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Reviewed-by: dan sinclair <dsinclair@chromium.org>

src/writer/spirv/builder_function_decoration_test.cc

diff --git a/src/writer/spirv/builder_function_decoration_test.cc b/src/writer/spirv/builder_function_decoration_test.cc
index 740c5d7..716e620 100644
--- a/src/writer/spirv/builder_function_decoration_test.cc
+++ b/src/writer/spirv/builder_function_decoration_test.cc
@@ -95,15 +95,15 @@
   ast::Function func("main", {}, &void_type, create<ast::BlockStatement>());
   func.add_decoration(
       create<ast::StageDecoration>(ast::PipelineStage::kVertex, Source{}));
-  auto v_in = create<ast::Variable>("my_in", ast::StorageClass::kInput, &f32);
-  auto v_out =
+  auto* v_in = create<ast::Variable>("my_in", ast::StorageClass::kInput, &f32);
+  auto* v_out =
       create<ast::Variable>("my_out", ast::StorageClass::kOutput, &f32);
-  auto v_wg =
+  auto* v_wg =
       create<ast::Variable>("my_wg", ast::StorageClass::kWorkgroup, &f32);
 
-  EXPECT_TRUE(b.GenerateGlobalVariable(v_in.get())) << b.error();
-  EXPECT_TRUE(b.GenerateGlobalVariable(v_out.get())) << b.error();
-  EXPECT_TRUE(b.GenerateGlobalVariable(v_wg.get())) << b.error();
+  EXPECT_TRUE(b.GenerateGlobalVariable(v_in)) << b.error();
+  EXPECT_TRUE(b.GenerateGlobalVariable(v_out)) << b.error();
+  EXPECT_TRUE(b.GenerateGlobalVariable(v_wg)) << b.error();
 
   mod.AddGlobalVariable(std::move(v_in));
   mod.AddGlobalVariable(std::move(v_out));
@@ -139,7 +139,7 @@
   func.add_decoration(
       create<ast::StageDecoration>(ast::PipelineStage::kVertex, Source{}));
 
-  auto body = create<ast::BlockStatement>();
+  auto* body = create<ast::BlockStatement>();
   body->append(create<ast::AssignmentStatement>(
       create<ast::IdentifierExpression>("my_out"),
       create<ast::IdentifierExpression>("my_in")));
@@ -152,21 +152,21 @@
       create<ast::IdentifierExpression>("my_in")));
   func.set_body(std::move(body));
 
-  auto v_in = create<ast::Variable>("my_in", ast::StorageClass::kInput, &f32);
-  auto v_out =
+  auto* v_in = create<ast::Variable>("my_in", ast::StorageClass::kInput, &f32);
+  auto* v_out =
       create<ast::Variable>("my_out", ast::StorageClass::kOutput, &f32);
-  auto v_wg =
+  auto* v_wg =
       create<ast::Variable>("my_wg", ast::StorageClass::kWorkgroup, &f32);
 
-  td.RegisterVariableForTesting(v_in.get());
-  td.RegisterVariableForTesting(v_out.get());
-  td.RegisterVariableForTesting(v_wg.get());
+  td.RegisterVariableForTesting(v_in);
+  td.RegisterVariableForTesting(v_out);
+  td.RegisterVariableForTesting(v_wg);
 
   ASSERT_TRUE(td.DetermineFunction(&func)) << td.error();
 
-  EXPECT_TRUE(b.GenerateGlobalVariable(v_in.get())) << b.error();
-  EXPECT_TRUE(b.GenerateGlobalVariable(v_out.get())) << b.error();
-  EXPECT_TRUE(b.GenerateGlobalVariable(v_wg.get())) << b.error();
+  EXPECT_TRUE(b.GenerateGlobalVariable(v_in)) << b.error();
+  EXPECT_TRUE(b.GenerateGlobalVariable(v_out)) << b.error();
+  EXPECT_TRUE(b.GenerateGlobalVariable(v_wg)) << b.error();
 
   mod.AddGlobalVariable(std::move(v_in));
   mod.AddGlobalVariable(std::move(v_out));