From owner-svn-src-all@freebsd.org Sat Dec 1 15:42:01 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 79CD6131AB65; Sat, 1 Dec 2018 15:42:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 142D286F0D; Sat, 1 Dec 2018 15:42:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 44D1019C0E; Sat, 1 Dec 2018 15:42:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB1Fg0MX012509; Sat, 1 Dec 2018 15:42:00 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB1Fg06D012507; Sat, 1 Dec 2018 15:42:00 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201812011542.wB1Fg06D012507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 1 Dec 2018 15:42:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r341372 - vendor/lldb/dist-release_70/source/Plugins/SymbolFile/DWARF X-SVN-Group: vendor X-SVN-Commit-Author: dim X-SVN-Commit-Paths: vendor/lldb/dist-release_70/source/Plugins/SymbolFile/DWARF X-SVN-Commit-Revision: 341372 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 142D286F0D X-Spamd-Result: default: False [-0.04 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.45)[-0.445,0]; NEURAL_SPAM_LONG(0.31)[0.307,0]; NEURAL_SPAM_MEDIUM(0.10)[0.096,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2018 15:42:01 -0000 Author: dim Date: Sat Dec 1 15:41:59 2018 New Revision: 341372 URL: https://svnweb.freebsd.org/changeset/base/341372 Log: Vendor import of lldb release_70 branch r348011: https://llvm.org/svn/llvm-project/lldb/branches/release_70@348011 Modified: vendor/lldb/dist-release_70/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp Modified: vendor/lldb/dist-release_70/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp ============================================================================== --- vendor/lldb/dist-release_70/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp Sat Dec 1 15:41:57 2018 (r341371) +++ vendor/lldb/dist-release_70/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp Sat Dec 1 15:41:59 2018 (r341372) @@ -261,7 +261,11 @@ void DWARFUnit::ExtractDIEsRWLocked() { } if (!m_die_array.empty()) { - lldbassert(!m_first_die || m_first_die == m_die_array.front()); + if (m_first_die) { + // Only needed for the assertion. + m_first_die.SetEmptyChildren(m_die_array.front().GetEmptyChildren()); + lldbassert(m_first_die == m_die_array.front()); + } m_first_die = m_die_array.front(); }