druntime: Refactor common isDcloseNoop logic in 'shared' integration tests

Author: kinke

runtime/druntime/test/shared/src/finalize.d

@@ -33,7 +33,7 @@ extern (C) alias SetFinalizeCounter = void function(shared(size_t*));
 
 void main(string[] args)
 {
-    import utils : dllExt, loadSym;
+    import utils : dllExt, isDlcloseNoop, loadSym;
 
     auto name = args[0] ~ '\0';
     const pathlen = strrchr(name.ptr, '/') - name.ptr + 1;
@@ -45,7 +45,7 @@ void main(string[] args)
     auto nf1 = new NoFinalize;
     auto nf2 = new NoFinalizeBig;
 
-    shared static size_t finalizeCounter;
+    static shared size_t finalizeCounter;
     SetFinalizeCounter setFinalizeCounter;
     loadSym(h, setFinalizeCounter, "setFinalizeCounter");
     setFinalizeCounter(&finalizeCounter);
@@ -58,16 +58,7 @@ void main(string[] args)
     auto r = Runtime.unloadLibrary(h);
     if (!r)
         assert(0);
-    version (darwin)
-    {
-        // Fails starting with macOS 10.13, as .dylibs with TLS can't be
-        // unloaded anymore (https://github.com/ldc-developers/ldc/issues/3002).
-    }
-    else version (CRuntime_Musl)
-    {
-        // On Musl, dlclose is a no-op
-    }
-    else
+    static if (!isDlcloseNoop)
     {
         if (finalizeCounter != 4)
             assert(0);

runtime/druntime/test/shared/src/load.d

@@ -127,27 +127,16 @@ void runTests(string libName)
     assert(findModuleInfo("lib") is null);
 }
 
-version (LDC)
-{
-    version (CRuntime_Musl) enum unloadIsNoop = true;
-    else version (darwin)   enum unloadIsNoop = true;
-    else                    enum unloadIsNoop = false;
-}
-
 void main(string[] args)
 {
     auto name = args[0] ~ '\0';
     const pathlen = strrchr(name.ptr, '/') - name.ptr + 1;
-    import utils : dllExt;
+    import utils : dllExt, isDlcloseNoop;
     name = name[0 .. pathlen] ~ "lib." ~ dllExt;
 
     runTests(name);
 
-    static if (unloadIsNoop)
-    {
-        // https://github.com/ldc-developers/ldc/issues/3002
-    }
-    else
+    static if (!isDlcloseNoop)
     {
         // lib is no longer resident
         name ~= '\0';

runtime/druntime/test/shared/src/load_13414.d

@@ -6,14 +6,12 @@ shared uint tlsDtor, dtor;
 void staticDtorHook() { atomicOp!"+="(tlsDtor, 1); }
 void sharedStaticDtorHook() { atomicOp!"+="(dtor, 1); }
 
-version (LDC) version (darwin) version = LDC_darwin;
-
 void runTest(string name)
 {
     auto h = Runtime.loadLibrary(name);
     assert(h !is null);
 
-    import utils : loadSym;
+    import utils : isDlcloseNoop, loadSym;
     void function()* pLibStaticDtorHook, pLibSharedStaticDtorHook;
     loadSym(h, pLibStaticDtorHook, "_D9lib_1341414staticDtorHookOPFZv");
     loadSym(h, pLibSharedStaticDtorHook, "_D9lib_1341420sharedStaticDtorHookOPFZv");
@@ -24,16 +22,8 @@ void runTest(string name)
     const unloaded = Runtime.unloadLibrary(h);
     assert(unloaded);
     assert(tlsDtor == 1);
-    version (LDC_darwin)
-    {
-        // Since 10.13: https://github.com/ldc-developers/ldc/issues/3002
-        assert(dtor == 0);
-    }
-    else version (CRuntime_Musl)
-    {
-        // On Musl, dlclose is a no-op
+    static if (isDlcloseNoop)
         assert(dtor == 0);
-    }
     else
         assert(dtor == 1);
 }

runtime/druntime/test/shared/src/utils.di

@@ -1,12 +1,29 @@
 module utils;
 
+version (OSX)
+    version = Darwin;
+else version (iOS)
+    version = Darwin;
+else version (TVOS)
+    version = Darwin;
+else version (WatchOS)
+    version = Darwin;
+
 version (Windows)
     enum dllExt = "dll";
-else version (darwin)
+else version (Darwin)
     enum dllExt = "dylib";
 else
     enum dllExt = "so";
 
+// on some platforms, dlclose() is a no-op
+version (Darwin)
+    enum isDlcloseNoop = true; // since macOS ~10.12.6 if shared lib uses TLS: https://github.com/rust-lang/rust/issues/28794#issuecomment-368693049
+else version (CRuntime_Musl)
+    enum isDlcloseNoop = true; // https://wiki.musl-libc.org/functional-differences-from-glibc.html
+else
+    enum isDlcloseNoop = false;
+
 void loadSym(T)(void* handle, ref T val, const char* mangle)
 {
     version (Windows)