From owner-svn-src-projects@freebsd.org Tue Jan 22 18:02:41 2019 Return-Path: Delivered-To: svn-src-projects@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 1580D14AA24B for ; Tue, 22 Jan 2019 18:02:41 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B166C968A0; Tue, 22 Jan 2019 18:02:40 +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 A7093503B; Tue, 22 Jan 2019 18:02:40 +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 x0MI2eBY062651; Tue, 22 Jan 2019 18:02:40 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0MI2erj062650; Tue, 22 Jan 2019 18:02:40 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201901221802.x0MI2erj062650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 22 Jan 2019 18:02:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r343306 - projects/clang800-import/contrib/llvm/tools/lldb/source/Symbol X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: projects/clang800-import/contrib/llvm/tools/lldb/source/Symbol X-SVN-Commit-Revision: 343306 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B166C968A0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2019 18:02:41 -0000 Author: dim Date: Tue Jan 22 18:02:40 2019 New Revision: 343306 URL: https://svnweb.freebsd.org/changeset/base/343306 Log: Add #ifdef LLDB_ENABLE_ALL guards to prevent accessing the PDB AST parser, which we have disabled in our lldb. Modified: projects/clang800-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Modified: projects/clang800-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp ============================================================================== --- projects/clang800-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Tue Jan 22 17:39:26 2019 (r343305) +++ projects/clang800-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Tue Jan 22 18:02:40 2019 (r343306) @@ -9901,8 +9901,10 @@ bool ClangASTContext::LayoutRecordType( lldb_private::ClangASTImporter *importer = nullptr; if (ast->m_dwarf_ast_parser_ap) importer = &ast->m_dwarf_ast_parser_ap->GetClangASTImporter(); +#ifdef LLDB_ENABLE_ALL if (!importer && ast->m_pdb_ast_parser_ap) importer = &ast->m_pdb_ast_parser_ap->GetClangASTImporter(); +#endif // LLDB_ENABLE_ALL if (!importer) return false;