Merge pull request #829 from 9rnsr/fix7754

Issue 7754 - static this() in template is stripped during header gen
dlang · Mar 27, 2012 · 311d170 · 311d170
2 parents 58f284e + 5321035
commit 311d170
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 1 deletion.
diff --git a/src/func.c b/src/func.c
@@ -3640,7 +3640,7 @@ int StaticCtorDeclaration::addPostInvariant()
 
 void StaticCtorDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
 {
-    if (hgs->hdrgen)
+    if (hgs->hdrgen && !hgs->tpltMember)
     {   buf->writestring("static this();");
         buf->writenl();
         return;

diff --git a/test/compilable/extra-files/test7754-postscript.sh b/test/compilable/extra-files/test7754-postscript.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+grep -v "D import file generated from" ${RESULTS_DIR}/compilable/test7754.di > ${RESULTS_DIR}/compilable/test7754.di.2
+diff --strip-trailing-cr compilable/extra-files/test7754.di ${RESULTS_DIR}/compilable/test7754.di.2
+if [ $? -ne 0 ]; then
+    exit 1;
+fi
+
+rm ${RESULTS_DIR}/compilable/test7754.di{,.2}
+
diff --git a/test/compilable/extra-files/test7754.di b/test/compilable/extra-files/test7754.di
@@ -0,0 +1,12 @@
+template Foo(T)
+{
+struct Foo
+{
+    shared static this()
+{
+}
+    static this()
+{
+}
+}
+}
diff --git a/test/compilable/test7754.d b/test/compilable/test7754.d
@@ -0,0 +1,15 @@
+// PERMUTE_ARGS:
+// REQUIRED_ARGS: -H -Hdtest_results/compilable
+// POST_SCRIPT: compilable/extra-files/test7754-postscript.sh
+// REQUIRED_ARGS: -d
+
+struct Foo(T)
+{
+   shared static this()
+   {
+   }
+
+   static this()
+   {
+   }
+}