Skip to content

Commit 1005623

Browse files
committed
[ORC] Switch from initializer lists to named arguments to work around MSVC.
MSVC doesn't like some of the initializer list uses in 0e940d5. Switch to named arguments to work around this.
1 parent 12d1124 commit 1005623

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

llvm/lib/ExecutionEngine/Orc/TPCIndirectionUtils.cpp

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,10 @@ Error TPCTrampolinePool::grow() {
126126
static_cast<sys::Memory::ProtectionFlags>(sys::Memory::MF_READ |
127127
sys::Memory::MF_EXEC);
128128
auto PageSize = TPC.getPageSize();
129-
auto Alloc = TPC.getMemMgr().allocate(
130-
{{TrampolinePagePermissions,
131-
{PageSize, static_cast<size_t>(PageSize), 0}}});
129+
jitlink::JITLinkMemoryManager::SegmentsRequestMap Request;
130+
Request[TrampolinePagePermissions] = {PageSize, static_cast<size_t>(PageSize),
131+
0};
132+
auto Alloc = TPC.getMemMgr().allocate(Request);
132133

133134
if (!Alloc)
134135
return Alloc.takeError();
@@ -310,9 +311,10 @@ TPCIndirectionUtils::writeResolverBlock(JITTargetAddress ReentryFnAddr,
310311
sys::Memory::MF_EXEC);
311312
auto ResolverSize = ABI->getResolverCodeSize();
312313

313-
auto Alloc = TPC.getMemMgr().allocate(
314-
{{ResolverBlockPermissions,
315-
{TPC.getPageSize(), static_cast<size_t>(ResolverSize), 0}}});
314+
jitlink::JITLinkMemoryManager::SegmentsRequestMap Request;
315+
Request[ResolverBlockPermissions] = {TPC.getPageSize(),
316+
static_cast<size_t>(ResolverSize), 0};
317+
auto Alloc = TPC.getMemMgr().allocate(Request);
316318
if (!Alloc)
317319
return Alloc.takeError();
318320

@@ -379,10 +381,11 @@ TPCIndirectionUtils::getIndirectStubs(unsigned NumStubs) {
379381
static_cast<sys::Memory::ProtectionFlags>(sys::Memory::MF_READ |
380382
sys::Memory::MF_WRITE);
381383

382-
auto Alloc = TPC.getMemMgr().allocate(
383-
{{StubPagePermissions, {PageSize, static_cast<size_t>(StubBytes), 0}},
384-
{PointerPagePermissions, {PageSize, 0, PointerBytes}}});
385-
384+
jitlink::JITLinkMemoryManager::SegmentsRequestMap Request;
385+
Request[StubPagePermissions] = {PageSize, static_cast<size_t>(StubBytes),
386+
0};
387+
Request[PointerPagePermissions] = {PageSize, 0, PointerBytes};
388+
auto Alloc = TPC.getMemMgr().allocate(Request);
386389
if (!Alloc)
387390
return Alloc.takeError();
388391

0 commit comments

Comments
 (0)