Date: Tue, 18 Feb 2014 19:46:46 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r262186 - head/contrib/llvm/tools/lldb/source/Symbol Message-ID: <201402181946.s1IJkkwf015719@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Tue Feb 18 19:46:45 2014 New Revision: 262186 URL: http://svnweb.freebsd.org/changeset/base/262186 Log: 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. Modified: head/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Modified: head/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp ============================================================================== --- head/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Tue Feb 18 19:11:24 2014 (r262185) +++ head/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Tue Feb 18 19:46:45 2014 (r262186) @@ -1915,6 +1915,7 @@ ClangASTType::GetEncoding (uint64_t &cou 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402181946.s1IJkkwf015719>