This is an archive of the discontinued LLVM Phabricator instance.

Differential D150555

[lli] Export the MinGW chkstk function from the lli executable
ClosedPublic

Authored by mstorsjo on May 15 2023, 3:22 AM.

Details

Reviewers
lhames
Commits
rGcbc2a0623a39: [lli] Export the MinGW chkstk function from the lli executable
Summary

This allows all ExecutionEngine tests pass in MinGW build configurations.

Diff Detail

Event Timeline

mstorsjo created this revision.May 15 2023, 3:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 15 2023, 3:22 AM
mstorsjo requested review of this revision.May 15 2023, 3:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 15 2023, 3:22 AM
Harbormaster completed remote builds in B231947: Diff 522107.May 15 2023, 3:53 AM
lhames accepted this revision.May 22 2023, 11:21 AM

LGTM, but could you add a TODO to move this into libORC in the future and reference https://github.com/llvm/llvm-project/issues/56603 ?

This revision is now accepted and ready to land.May 22 2023, 11:21 AM
This revision was landed with ongoing or failed builds.May 23 2023, 4:39 AM
Closed by commit rGcbc2a0623a39: [lli] Export the MinGW chkstk function from the lli executable (authored by mstorsjo). · Explain Why
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rGcbc2a0623a39: [lli] Export the MinGW chkstk function from the lli executable.

Revision Contents

PathSize
llvm/
tools/
lli/
38 lines

Diff 524651

llvm/tools/lli/lli.cpp

Show First 20 Lines • Show All 1,172 Lines • ▼ Show 20 Lines#else
close(PipeFD[1][1]); close(PipeFD[1][1]);
// Return a SimpleRemoteEPC instance connected to our end of the pipes. // Return a SimpleRemoteEPC instance connected to our end of the pipes.
return orc::SimpleRemoteEPC::Create<orc::FDSimpleRemoteEPCTransport>( return orc::SimpleRemoteEPC::Create<orc::FDSimpleRemoteEPCTransport>(
std::make_unique<llvm::orc::InPlaceTaskDispatcher>(), std::make_unique<llvm::orc::InPlaceTaskDispatcher>(),
llvm::orc::SimpleRemoteEPC::Setup(), PipeFD[1][0], PipeFD[0][1]); llvm::orc::SimpleRemoteEPC::Setup(), PipeFD[1][0], PipeFD[0][1]);
#endif #endif
} }
// For MinGW environments, manually export the __chkstk function from the lli
// executable.
//
// Normally, this function is provided by compiler-rt builtins or libgcc.
// It is named "_alloca" on i386, "___chkstk_ms" on x86_64, and "__chkstk" on
// arm/aarch64. In MSVC configurations, it's named "__chkstk" in all
// configurations.
//
// When Orc tries to resolve symbols at runtime, this succeeds in MSVC
// configurations, somewhat by accident/luck; kernelbase.dll does export a
// symbol named "__chkstk" which gets found by Orc, even if regular applications
// never link against that function from that DLL (it's linked in statically
// from a compiler support library).
//
// The MinGW specific symbol names aren't available in that DLL though.
// Therefore, manually export the relevant symbol from lli, to let it be
// found at runtime during tests.
//
// For real JIT uses, the real compiler support libraries should be linked
// in, somehow; this is a workaround to let tests pass.
//
// TODO: Move this into libORC at some point, see
// https://github.com/llvm/llvm-project/issues/56603.
#ifdef __MINGW32__
// This is a MinGW version of #pragma comment(linker, "...") that doesn't
// require compiling with -fms-extensions.
#if defined(__i386__)
static __attribute__((section(".drectve"), used)) const char export_chkstk[] =
"-export:_alloca";
#elif defined(__x86_64__)
static __attribute__((section(".drectve"), used)) const char export_chkstk[] =
"-export:___chkstk_ms";
#else
static __attribute__((section(".drectve"), used)) const char export_chkstk[] =
"-export:__chkstk";
#endif
#endif