fix issue 18456 - crt_constructor/crt_destructor segfaults if -lib

delay objmod.setModuleCtorDtor until the function is actually generated don't make them extra object files in a library, they will never be linked
dlang · Dec 24, 2018 · 20afb43 · 20afb43
1 parent faca601
commit 20afb43
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 6 deletions.
diff --git a/src/dmd/declaration.h b/src/dmd/declaration.h
@@ -483,6 +483,8 @@ class FuncDeclaration : public Declaration
     bool naked;                         // true if naked
     bool generated;                     // true if function was generated by the compiler rather than
                                         // supplied by the user
+    unsigned char isCrtCtorDtor;        // has attribute pragma(crt_constructor(1)/crt_destructor(2))
+                                        // not set before the glue layer
     ILS inlineStatusStmt;
     ILS inlineStatusExp;
     PINLINE inlining;

diff --git a/src/dmd/func.d b/src/dmd/func.d
@@ -231,6 +231,9 @@ extern (C++) class FuncDeclaration : Declaration
     bool naked;                         /// true if naked
     bool generated;                     /// true if function was generated by the compiler rather than
                                         /// supplied by the user
+    ubyte isCrtCtorDtor;                /// has attribute pragma(crt_constructor(1)/crt_destructor(2))
+                                        /// not set before the glue layer
+
     ILS inlineStatusStmt = ILS.uninitialized;
     ILS inlineStatusExp = ILS.uninitialized;
     PINLINE inlining = PINLINE.default_;

diff --git a/src/dmd/glue.d b/src/dmd/glue.d
@@ -762,7 +762,7 @@ void FuncDeclaration_toObjFile(FuncDeclaration fd, bool multiobj)
     if (ud && !global.params.useUnitTests)
         return;
 
-    if (multiobj && !fd.isStaticDtorDeclaration() && !fd.isStaticCtorDeclaration())
+    if (multiobj && !fd.isStaticDtorDeclaration() && !fd.isStaticCtorDeclaration() && !fd.isCrtCtorDtor)
     {
         obj_append(fd);
         return;
@@ -1244,6 +1244,11 @@ void FuncDeclaration_toObjFile(FuncDeclaration fd, bool multiobj)
     if (fd.isExport())
         objmod.export_symbol(s, cast(uint)Para.offset);
 
+    if (fd.isCrtCtorDtor & 1)
+        objmod.setModuleCtorDtor(s, true);
+    if (fd.isCrtCtorDtor & 2)
+        objmod.setModuleCtorDtor(s, false);
+
     foreach (sd; *irs.deferToObj)
     {
         toObjFile(sd, false);

diff --git a/src/dmd/toobj.d b/src/dmd/toobj.d
@@ -784,10 +784,7 @@ void toObjFile(Dsymbol ds, bool multiobj)
 
                 obj_linkerdirective(directive);
             }
-
-            visit(cast(AttribDeclaration)pd);
-
-            if (pd.ident == Id.crt_constructor || pd.ident == Id.crt_destructor)
+            else if (pd.ident == Id.crt_constructor || pd.ident == Id.crt_destructor)
             {
                 immutable isCtor = pd.ident == Id.crt_constructor;
 
@@ -806,7 +803,7 @@ void toObjFile(Dsymbol ds, bool multiobj)
                     }
                     else if (auto f = s.isFuncDeclaration())
                     {
-                        objmod.setModuleCtorDtor(s.csym, isCtor);
+                        f.isCrtCtorDtor |= isCtor ? 1 : 2;
                         if (f.linkage != LINK.c)
                             f.error("must be `extern(C)` for `pragma(%s)`", isCtor ? "crt_constructor".ptr : "crt_destructor".ptr);
                         return 1;
@@ -819,6 +816,8 @@ void toObjFile(Dsymbol ds, bool multiobj)
                 if (recurse(pd, isCtor) > 1)
                     pd.error("can only apply to a single declaration");
             }
+
+            visit(cast(AttribDeclaration)pd);
         }
 
         override void visit(TemplateInstance ti)

diff --git a/test/runnable/extra-files/lib18456.d b/test/runnable/extra-files/lib18456.d
@@ -0,0 +1,8 @@
+
+__gshared int initVar;
+
+pragma(crt_constructor)
+extern(C) void mir_cpuid_crt_init()
+{
+    initVar = 42;
+}
diff --git a/test/runnable/extra-files/test18456.d b/test/runnable/extra-files/test18456.d
@@ -0,0 +1,6 @@
+import lib18456;
+
+void main()
+{
+    assert(initVar == 42);
+}
diff --git a/test/runnable/test18456.sh b/test/runnable/test18456.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+$DMD -m${MODEL} -I${EXTRA_FILES} -of${OUTPUT_BASE}${LIBEXT} -lib ${EXTRA_FILES}/lib18456.d
+$DMD -m${MODEL} -I${EXTRA_FILES} -of${OUTPUT_BASE}${EXE} ${EXTRA_FILES}/test18456.d ${OUTPUT_BASE}${LIBEXT}
+${OUTPUT_BASE}${EXE}
+
+rm ${OUTPUT_BASE}{${LIBEXT},${EXE}}