Skip to content

Commit 731f991

Browse files
committed
[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
1 parent a162b67 commit 731f991

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

llvm/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,17 @@ class BasicLayout {
251251
friend class BasicLayout;
252252

253253
public:
254+
Segment()
255+
: ContentSize(0), ZeroFillSize(0), Addr(0), WorkingMem(nullptr),
256+
NextWorkingMemOffset(0) {}
254257
Align Alignment;
255-
size_t ContentSize = 0;
256-
uint64_t ZeroFillSize = 0;
257-
JITTargetAddress Addr = 0;
258-
char *WorkingMem;
258+
size_t ContentSize;
259+
uint64_t ZeroFillSize;
260+
JITTargetAddress Addr;
261+
char *WorkingMem = nullptr;
259262

260263
private:
261-
size_t NextWorkingMemOffset = 0;
264+
size_t NextWorkingMemOffset;
262265
std::vector<Block *> ContentBlocks, ZeroFillBlocks;
263266
};
264267

0 commit comments

Comments
 (0)