averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix horrible sneaky use-of-temporary-after-destruction in SWIFT_DEFER. (#7851)

Browse Source 
Caught by ASan's new use-after-scope checking!
This commit is contained in:
Jordan Rose
2017-03-01 16:19:11 -08:00
committed by GitHub
parent babf6ffaad
commit b20882b07d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/swift/Basic/Defer.h
View File

@@ -23,10 +23,10 @@
namespace swift {
template <typename F>
class DoAtScopeExit {
F &Fn;
F Fn;
void operator=(DoAtScopeExit&) = delete;
public:
DoAtScopeExit(F &Fn) : Fn(Fn){}
DoAtScopeExit(F &&Fn) : Fn(std::move(Fn)) {}
~DoAtScopeExit() {
Fn();
}
@@ -36,7 +36,7 @@ namespace swift {
struct DeferTask {};
template<typename F>
DoAtScopeExit<typename std::decay<F>::type> operator+(DeferTask, F&& fn) {
return DoAtScopeExit<typename std::decay<F>::type>(fn);
return DoAtScopeExit<typename std::decay<F>::type>(std::move(fn));
}
}
} // end namespace swift