summaryrefslogtreecommitdiffstats
path: root/llvm/tools
diff options
context:
space:
mode:
authorClement Courbet <courbet@google.com>2019-10-09 09:07:21 +0000
committerClement Courbet <courbet@google.com>2019-10-09 09:07:21 +0000
commit66f05d738994412004b7df5f7966c5ddae3156c1 (patch)
tree23fc7907aec812fd62716357ebd0099461fd0284 /llvm/tools
parent1e1e3ba2526ecab1ad3c18c97abef36df00b3813 (diff)
downloadbcm5719-llvm-66f05d738994412004b7df5f7966c5ddae3156c1.tar.gz
bcm5719-llvm-66f05d738994412004b7df5f7966c5ddae3156c1.zip
[llvm-exegesis] Add missing std::move in rL374146.
This was breaking some bots: /home/buildbots/ppc64le-clang-lnt-test/clang-ppc64le-lnt/llvm/include/llvm/Support/Error.h:483:5: required from ‘llvm::Expected<T>::Expected(OtherT&&, typename std::enable_if<std::is_convertible<_Rep2, _Rep>::value>::type*) [with OtherT = std::vector<llvm::exegesis::CodeTemplate>&; T = std::vector<llvm::exegesis::CodeTemplate>; typename std::enable_if<std::is_convertible<_Rep2, _Rep>::value>::type = void]’ /home/buildbots/ppc64le-clang-lnt-test/clang-ppc64le-lnt/llvm/tools/llvm-exegesis/lib/X86/Target.cpp:238:20: required from here /usr/include/c++/6/bits/stl_construct.h:75:7: error: use of deleted function ‘llvm::exegesis::CodeTemplate::CodeTemplate(const llvm::exegesis::CodeTemplate&)’ { ::new(static_cast<void*>(__p)) _T1(std::forward<_Args>(__args)...); } ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ llvm-svn: 374149
Diffstat (limited to 'llvm/tools')
-rw-r--r--llvm/tools/llvm-exegesis/lib/X86/Target.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/tools/llvm-exegesis/lib/X86/Target.cpp b/llvm/tools/llvm-exegesis/lib/X86/Target.cpp
index b8c6bae45f8..dd07af45b42 100644
--- a/llvm/tools/llvm-exegesis/lib/X86/Target.cpp
+++ b/llvm/tools/llvm-exegesis/lib/X86/Target.cpp
@@ -235,13 +235,13 @@ static llvm::Expected<std::vector<CodeTemplate>> generateLEATemplatesCommon(
.str();
Result.push_back(std::move(CT));
if (Result.size() >= Opts.MaxConfigsPerOpcode)
- return Result;
+ return std::move(Result);
}
}
}
}
- return Result;
+ return std::move(Result);
}
namespace {
OpenPOWER on IntegriCloud