1*4882a593SmuzhiyunFrom 4fffcd275b50d08b54b0411679ead98970651bad Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: David Neto <dneto@google.com> 3*4882a593SmuzhiyunDate: Fri, 27 Dec 2019 12:05:58 -0500 4*4882a593SmuzhiyunSubject: [PATCH] Avoid pessimizing std::move (#3124) 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunShould fix a warning 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunUpstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Tools/commit/8aa423930db37e37086665efcc55944d577c06e5] 9*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun test/opt/pass_fixture.h | 9 +++------ 12*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 6 deletions(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/test/opt/pass_fixture.h b/test/opt/pass_fixture.h 15*4882a593Smuzhiyunindex 53fb206f..64c089d8 100644 16*4882a593Smuzhiyun--- a/test/opt/pass_fixture.h 17*4882a593Smuzhiyun+++ b/test/opt/pass_fixture.h 18*4882a593Smuzhiyun@@ -60,8 +60,7 @@ class PassTest : public TestT { 19*4882a593Smuzhiyun // from pass Process() function. 20*4882a593Smuzhiyun std::tuple<std::vector<uint32_t>, Pass::Status> OptimizeToBinary( 21*4882a593Smuzhiyun Pass* pass, const std::string& original, bool skip_nop) { 22*4882a593Smuzhiyun- context_ = 23*4882a593Smuzhiyun- std::move(BuildModule(env_, consumer_, original, assemble_options_)); 24*4882a593Smuzhiyun+ context_ = BuildModule(env_, consumer_, original, assemble_options_); 25*4882a593Smuzhiyun EXPECT_NE(nullptr, context()) << "Assembling failed for shader:\n" 26*4882a593Smuzhiyun << original << std::endl; 27*4882a593Smuzhiyun if (!context()) { 28*4882a593Smuzhiyun@@ -197,8 +196,7 @@ class PassTest : public TestT { 29*4882a593Smuzhiyun // messages. 30*4882a593Smuzhiyun template <typename PassT, typename... Args> 31*4882a593Smuzhiyun void SinglePassRunAndFail(const std::string& original, Args&&... args) { 32*4882a593Smuzhiyun- context_ = 33*4882a593Smuzhiyun- std::move(BuildModule(env_, consumer_, original, assemble_options_)); 34*4882a593Smuzhiyun+ context_ = BuildModule(env_, consumer_, original, assemble_options_); 35*4882a593Smuzhiyun EXPECT_NE(nullptr, context()) << "Assembling failed for shader:\n" 36*4882a593Smuzhiyun << original << std::endl; 37*4882a593Smuzhiyun std::ostringstream errs; 38*4882a593Smuzhiyun@@ -235,8 +233,7 @@ class PassTest : public TestT { 39*4882a593Smuzhiyun void RunAndCheck(const std::string& original, const std::string& expected) { 40*4882a593Smuzhiyun assert(manager_->NumPasses()); 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun- context_ = 43*4882a593Smuzhiyun- std::move(BuildModule(env_, nullptr, original, assemble_options_)); 44*4882a593Smuzhiyun+ context_ = BuildModule(env_, nullptr, original, assemble_options_); 45*4882a593Smuzhiyun ASSERT_NE(nullptr, context()); 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun context()->set_preserve_bindings(OptimizerOptions()->preserve_bindings_); 48*4882a593Smuzhiyun-- 49*4882a593Smuzhiyun2.24.1 50*4882a593Smuzhiyun 51