extern(D) for scanWindowsOnly

denizzzka · denizzzka · commit a76d0bdd77d7 · 2020-06-16T13:27:07.000+07:00
diff --git a/src/core/thread/osthread.d b/src/core/thread/osthread.d
@@ -1401,7 +1401,7 @@ version (Solaris)
 
 
 version (Windows)
-private extern (C) void scanWindowsOnly(scope ScanAllThreadsTypeFn scan, ThreadBase _t) nothrow
+private extern (D) void scanWindowsOnly(scope ScanAllThreadsTypeFn scan, ThreadBase _t) nothrow
 {
     auto t = _t.toThread;
 
diff --git a/src/core/thread/threadbase.d b/src/core/thread/threadbase.d
@@ -1106,7 +1106,13 @@ private void scanAllTypeImpl(scope ScanAllThreadsTypeFn scan, void* curStackTop)
     }
 }
 
-private extern (C) void scanWindowsOnly(scope ScanAllThreadsTypeFn scan, ThreadBase) nothrow;
+version (Windows)
+{
+    // Currently scanWindowsOnly can't be handled properly by externDFunc
+    // https://github.com/dlang/druntime/pull/3135#issuecomment-643673218
+    pragma(mangle, "_D4core6thread8osthread15scanWindowsOnlyFNbMDFNbEQBvQBt10threadbase8ScanTypePvQcZvCQDdQDbQBi10ThreadBaseZv")
+    private extern (D) void scanWindowsOnly(scope ScanAllThreadsTypeFn scan, ThreadBase) nothrow;
+}
 
 /**
  * The main entry point for garbage collection.  The supplied delegate

Original file line number	Diff line number	Diff line change
`@@ -1401,7 +1401,7 @@ version (Solaris)`
`1401`	`1401`
`1402`	`1402`
`1403`	`1403`	`version (Windows)`
`1404`		`-private extern (C) void scanWindowsOnly(scope ScanAllThreadsTypeFn scan, ThreadBase _t) nothrow`
	`1404`	`+private extern (D) void scanWindowsOnly(scope ScanAllThreadsTypeFn scan, ThreadBase _t) nothrow`
`1405`	`1405`	`{`
`1406`	`1406`	`auto t = _t.toThread;`
`1407`	`1407`
Original file line number	Diff line number	Diff line change
`@@ -1106,7 +1106,13 @@ private void scanAllTypeImpl(scope ScanAllThreadsTypeFn scan, void* curStackTop)`
`1106`	`1106`	`}`
`1107`	`1107`	`}`
`1108`	`1108`
`1109`		`-private extern (C) void scanWindowsOnly(scope ScanAllThreadsTypeFn scan, ThreadBase) nothrow;`
	`1109`	`+version (Windows)`
	`1110`	`+{`
	`1111`	`+ // Currently scanWindowsOnly can't be handled properly by externDFunc`
	`1112`	`+ // https://github.com/dlang/druntime/pull/3135#issuecomment-643673218`
	`1113`	`+ pragma(mangle, "_D4core6thread8osthread15scanWindowsOnlyFNbMDFNbEQBvQBt10threadbase8ScanTypePvQcZvCQDdQDbQBi10ThreadBaseZv")`
	`1114`	`+ private extern (D) void scanWindowsOnly(scope ScanAllThreadsTypeFn scan, ThreadBase) nothrow;`
	`1115`	`+}`
`1110`	`1116`
`1111`	`1117`	`/**`
`1112`	`1118`	`* The main entry point for garbage collection. The supplied delegate`