diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2017-06-03 18:18:34 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2017-06-03 18:18:34 +0000 |
commit | 6d97bb297c123377182a5d78b412be5c1d723e08 (patch) | |
tree | 5e57003ce58361eb4909e2a22461b096529d726f /contrib/llvm/tools/clang/lib/ARCMigrate | |
parent | 4224465e820a1a7232255d980e692720169776af (diff) | |
parent | d288ef4c1788d3a951a7558c68312c2d320612b1 (diff) | |
download | src-6d97bb297c123377182a5d78b412be5c1d723e08.tar.gz src-6d97bb297c123377182a5d78b412be5c1d723e08.zip |
Merge llvm, clang, lld, lldb, compiler-rt and libc++ r304659, and update
build glue.
Notes
Notes:
svn path=/projects/clang500-import/; revision=319547
Diffstat (limited to 'contrib/llvm/tools/clang/lib/ARCMigrate')
-rw-r--r-- | contrib/llvm/tools/clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp | 1 | ||||
-rw-r--r-- | contrib/llvm/tools/clang/lib/ARCMigrate/TransformActions.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/contrib/llvm/tools/clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp b/contrib/llvm/tools/clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp index f81133f3aad3..389f3655aa52 100644 --- a/contrib/llvm/tools/clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp +++ b/contrib/llvm/tools/clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp @@ -78,6 +78,7 @@ public: } } // Pass through. + LLVM_FALLTHROUGH; case OMF_retain: case OMF_release: if (E->getReceiverKind() == ObjCMessageExpr::Instance) diff --git a/contrib/llvm/tools/clang/lib/ARCMigrate/TransformActions.cpp b/contrib/llvm/tools/clang/lib/ARCMigrate/TransformActions.cpp index c628b54ed414..4f3fb5845925 100644 --- a/contrib/llvm/tools/clang/lib/ARCMigrate/TransformActions.cpp +++ b/contrib/llvm/tools/clang/lib/ARCMigrate/TransformActions.cpp @@ -539,6 +539,7 @@ void TransformActionsImpl::addRemoval(CharSourceRange range) { return; case Range_Contains: RI->End = newRange.End; + LLVM_FALLTHROUGH; case Range_ExtendsBegin: newRange.End = RI->End; Removals.erase(RI); |