From owner-svn-src-all@FreeBSD.ORG  Tue Feb 18 19:46:46 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6575524B;
 Tue, 18 Feb 2014 19:46:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 502331C6E;
 Tue, 18 Feb 2014 19:46:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1IJkkFb015720;
 Tue, 18 Feb 2014 19:46:46 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1IJkkwf015719;
 Tue, 18 Feb 2014 19:46:46 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201402181946.s1IJkkwf015719@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 18 Feb 2014 19:46:46 +0000 (UTC)
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
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Feb 2014 19:46:46 -0000

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: