Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive

fix issue 13821 - fiber + exception + win server 2012 failures #2801

Merged
dlang-bot merged 1 commit into from
Sep 17, 2019
Merged

fix issue 13821 - fiber + exception + win server 2012 failures #2801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/core/thread.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4786,13 +4786,14 @@ private:
pstack -= reserve;
*(cast(EXCEPTION_REGISTRATION*)pstack) =
EXCEPTION_REGISTRATION( sehChainEnd, finalHandler );
auto pChainEnd = pstack;
Copy link
Member

@Geod24 Geod24 Sep 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const ?

Copy link
Member Author

@rainers rainers Sep 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really the style of this file.

Copy link
Contributor

@thewilsonator thewilsonator Sep 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Normally I'd disagree that that is a good reason not to do it, but the whole file is about to get a re-architect anyway, so it doesn't really matter.

Copy link
Member

@Geod24 Geod24 Sep 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough


push( cast(size_t) &fiber_entryPoint ); // EIP
push( cast(size_t) m_ctxt.bstack - reserve ); // EBP
push( 0x00000000 ); // EDI
push( 0x00000000 ); // ESI
push( 0x00000000 ); // EBX
push( cast(size_t) m_ctxt.bstack - reserve ); // FS:[0]
push( cast(size_t) pChainEnd ); // FS:[0]
push( cast(size_t) m_ctxt.bstack ); // FS:[4]
push( cast(size_t) m_ctxt.bstack - m_size ); // FS:[8]
push( 0x00000000 ); // EAX
Expand Down Expand Up @@ -5289,9 +5290,7 @@ unittest


// Test exception handling inside fibers.
version (Win32) {
// broken on win32 under windows server 2012: bug 13821
} else unittest {
unittest {
enum MSG = "Test message.";
string caughtMsg;
(new Fiber({
Expand Down Expand Up @@ -5329,9 +5328,7 @@ unittest
new Fiber({}).call(Fiber.Rethrow.no);
}

version (Win32) {
// broken on win32 under windows server 2012: bug 13821
} else unittest {
unittest {
enum MSG = "Test message.";

try
Expand Down