summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2014-02-18 19:46:45 +0000
committeremaste <emaste@FreeBSD.org>2014-02-18 19:46:45 +0000
commitf1336624c434968f5f93cb2042487772b46fdab7 (patch)
tree8bc291239b6770b2484b2b13e84eb21686dbc39f
parentdc56a06bc6654ce03ea11356a755fbdcae2b7608 (diff)
downloadFreeBSD-src-f1336624c434968f5f93cb2042487772b46fdab7.zip
FreeBSD-src-f1336624c434968f5f93cb2042487772b46fdab7.tar.gz
Fix mismerge in r262121
A break statement was lost in the merge. The error had no functional impact, but restore it to reduce the diff against upstream.
-rw-r--r--contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp b/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
index 140f125..0dfabcc 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
@@ -1915,6 +1915,7 @@ ClangASTType::GetEncoding (uint64_t &count) const
case clang::Type::Decltype:
case clang::Type::TemplateSpecialization:
case clang::Type::Atomic:
+ break;
// pointer type decayed from an array or function type.
case clang::Type::Decayed:
OpenPOWER on IntegriCloud