diff options
| author | David L. Jones <dlj@google.com> | 2017-11-15 01:40:05 +0000 |
|---|---|---|
| committer | David L. Jones <dlj@google.com> | 2017-11-15 01:40:05 +0000 |
| commit | fdfce82b87b73e18577d493e84bdabe2585b95d0 (patch) | |
| tree | e8d9290e273dba03920bf15a8c7742fcf5ed0b87 /lib/Sema/SemaInit.cpp | |
| parent | 41af1698c520ea38edf83e7c91f1e519d34f20c1 (diff) | |
| parent | a7540887e8b5cb34ee28c12bef863bad85c65b6f (diff) | |
Creating branches/google/testing and tags/google/testing/2017-11-14 from r317716upstream/google/testing
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/google/testing@318248 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index dc7fe1d92b..5ece958ee6 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -6422,6 +6422,10 @@ static void CheckMoveOnConstruction(Sema &S, const Expr *InitExpr, if (!VD || !VD->hasLocalStorage()) return; + // __block variables are not moved implicitly. + if (VD->hasAttr<BlocksAttr>()) + return; + QualType SourceType = VD->getType(); if (!SourceType->isRecordType()) return; |