From 731f991cdc4f6683b0ca9a5d6184d9e4e84f63e4 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Mon, 11 Oct 2021 22:19:46 -0700 Subject: [PATCH] [ORC] Attempt to work around compile failure on some bots. See e.g. https://lab.llvm.org/buildbot/#/builders/193/builds/98. I think this failure is related to a C++ standard defect, 1397 --"Class completeness in non-static data member initializers" [1]. If so, moving to C++98 initialization should work around the issue. [1] http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1397 --- .../llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h b/llvm/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h index 2cb6762..554012a 100644 --- a/llvm/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h +++ b/llvm/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h @@ -251,14 +251,17 @@ public: friend class BasicLayout; public: + Segment() + : ContentSize(0), ZeroFillSize(0), Addr(0), WorkingMem(nullptr), + NextWorkingMemOffset(0) {} Align Alignment; - size_t ContentSize = 0; - uint64_t ZeroFillSize = 0; - JITTargetAddress Addr = 0; - char *WorkingMem; + size_t ContentSize; + uint64_t ZeroFillSize; + JITTargetAddress Addr; + char *WorkingMem = nullptr; private: - size_t NextWorkingMemOffset = 0; + size_t NextWorkingMemOffset; std::vector ContentBlocks, ZeroFillBlocks; }; -- 2.7.4