fix issue 4071: improve support for shared runtime #15974
Conversation
|
Thanks for your pull request, @rainers! Bugzilla references
Testing this PR locallyIf you don't have a local development environment setup, you can use Digger to test this PR: dub run digger -- build "master + dmd#15974" |
| void finiTLSRanges(void** teb) nothrow @nogc | ||
| { | ||
| } | ||
| void scanTLSRanges(void** teb, scope void delegate(void* pbeg, void* pend) nothrow dg) nothrow |
There was a problem hiding this comment.
Now added scanning of TLS of multiple DLLs.
The static version of this section could be replaced with the generic one used for version (Shared) at the cost of a couple of indirections. That would allow removing bracketing symbols generated here: https://github.com/dlang/dmd/blob/master/compiler/src/dmd/backend/mscoffobj.d#L1201
rainers
force-pushed
the
rainer_dll2
branch
2 times, most recently
from
6d63698
to
f44d51f
Compare
- register module info of clients and run module ctors/dtors - register .data section of clients with the GC
- run checks in release builds, too - side effects in assert() never executed in release builds - respect different termination order on windows
|
@kinke I could avoid adding a |
|
I probably wouldn't adopt it; I'm using https://github.com/ldc-developers/ldc/blob/master/runtime/druntime/src/rt/dso.d now, and that seems to work fine, no need for any dllmain etc. |
|
That said, the whole There were some more druntime adaptations for druntime DLL support on Windows that could be upstreamed now that DMD is apparently getting there too. Edit: I think the main ones were ldc-developers/druntime#197 and ldc-developers/druntime#198. |
|
Actually, my first attempt was starting from LDCs section_elf_shared.d, but that got even messier. Then I realized that only rather small parts need to be added on the Windows side, so opted for this way.
I guess it needs a bit more compiler magic to link to an extra static library that include dso.d. I'll version the hooks on DigitalMars. |
Yeah, some tiny magic to include that object file (must be linked in!) when linking a shared library, and bundling that prebuilt object file with the install packages. But it replaced all the previous compiler magic in every object file, so made things much simpler in that regard. |
add missing runtime termination of exe image
|
Basic exception support added now, good enough to make the tests in lib/link work. Some of the tests in test/exceptions still fail, though. assert_fail.d exhibits linker issues with symbols exported by the DLL, but also defined by the executable. The statically linked library does the same, but both definitions being COMDATs it doesn't bother the linker. |
|
@schveiguy Do you think you can review this? I know that you are well versed with the innards of druntime. |
RazvanN7
added
the
Merge:72h no objection -> merge
|
@RazvanN7 gotta be honest, I don't understand much about windows and dlls. Sorry. |
| { | ||
| if (!cond) assert(false); | ||
| } | ||
|
|
There was a problem hiding this comment.
I'm wondering whether we shouldn't just remove the -release in
Line 36 in 3173112
For LDC, I've similarly added -check=assert=on in https://github.com/ldc-developers/ldc/blob/1d4c2cfc5e17e6cfcf7cd154d5e66394162fa981/runtime/druntime/test/profile/Makefile#L26.
There was a problem hiding this comment.
Maybe it would be ok, but omitting -release also keeps other stuff and makes optimizations the only difference to the debug build.
thewilsonator
added
Merge:auto-merge
and removed
Merge:72h no objection -> merge
The link/lib test case for shared runtime works now but for exceptions on Win64, although support for proper scanning of TLS is still missing.