Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Dec 2021 10:05:29 GMT
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 598207e3fa27 - stable/12 - Reapply r311165:
Message-ID:  <202112221005.1BMA5T1o091421@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=598207e3fa27fcab41c3613ba27fca078c238be8

commit 598207e3fa27fcab41c3613ba27fca078c238be8
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2020-08-02 18:18:16 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2021-12-22 09:58:12 +0000

    Reapply r311165:
    
    Disable PDB support in LLVMSymbolizer for now, to avoid llvm-objdump
    pulling in all the PDB handling code.
    
    (cherry picked from commit cfe333b850cee184f0658cdf4e3001b537d8f120)
---
 contrib/llvm-project/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/llvm-project/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/contrib/llvm-project/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
index 1d767a2b0d88..051195934aaf 100644
--- a/contrib/llvm-project/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
+++ b/contrib/llvm-project/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
@@ -553,6 +553,7 @@ LLVMSymbolizer::getOrCreateModuleInfo(const std::string &ModuleName) {
     StringRef PDBFileName;
     auto EC = CoffObject->getDebugPDBInfo(DebugInfo, PDBFileName);
     if (!EC && DebugInfo != nullptr && !PDBFileName.empty()) {
+#if 0
       using namespace pdb;
       std::unique_ptr<IPDBSession> Session;
       PDB_ReaderType ReaderType = Opts.UseNativePDBReader
@@ -565,6 +566,11 @@ LLVMSymbolizer::getOrCreateModuleInfo(const std::string &ModuleName) {
         return createFileError(PDBFileName, std::move(Err));
       }
       Context.reset(new PDBContext(*CoffObject, std::move(Session)));
+#else
+      return make_error<StringError>(
+          "PDB support not compiled in",
+          std::make_error_code(std::errc::not_supported));
+#endif
     }
   }
   if (!Context)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112221005.1BMA5T1o091421>