From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <iains@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1698)
 id AE4C63857C75; Mon, 11 Oct 2021 20:34:54 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE4C63857C75
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Iain D Sandoe <iains@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/users/iains/heads/d-for-darwin)] d: Don't emit normal
 functions and declarations when compiling with -fbuilding-libphobos-tests
X-Act-Checkin: gcc
X-Git-Author: Iain Buclaw <ibuclaw@gdcproject.org>
X-Git-Refname: refs/users/iains/heads/d-for-darwin
X-Git-Oldrev: 574382c95af44ae8a5d2228f3139de00ca5f3fb0
X-Git-Newrev: f7074e857b103a6d6b5c8951d3fd4870ff33affc
Message-Id: <20211011203454.AE4C63857C75@sourceware.org>
Date: Mon, 11 Oct 2021 20:34:54 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Oct 2021 20:34:54 -0000

https://gcc.gnu.org/g:f7074e857b103a6d6b5c8951d3fd4870ff33affc

commit f7074e857b103a6d6b5c8951d3fd4870ff33affc
Author: Iain Buclaw <ibuclaw@gdcproject.org>
Date:   Thu Dec 3 23:56:16 2020 +0100

    d: Don't emit normal functions and declarations when compiling with -fbuilding-libphobos-tests

Diff:
---
 gcc/d/decl.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gcc/d/decl.cc b/gcc/d/decl.cc
index 0d46ee180e7..8ee674c426c 100644
--- a/gcc/d/decl.cc
+++ b/gcc/d/decl.cc
@@ -116,6 +116,27 @@ gcc_attribute_p (Dsymbol *decl)
   return false;
 }
 
+/* Returns true if DECL is either lexically nested inside a unittest function,
+   or a `version(unittest)' condition.  */
+
+static bool
+in_unittest_p (Declaration *decl)
+{
+  for (Dsymbol *p = decl->parent; p != NULL; p = p->parent)
+    {
+      if (p->isUnitTestDeclaration ())
+	return true;
+      if (FuncDeclaration *fd = p->isFuncDeclaration ())
+	{
+	  tree t = get_symbol_decl (fd);
+	  if (DECL_IN_UNITTEST_CONDITION_P (t))
+	    return true;
+	}
+    }
+
+  return false;
+}
+
 /* Implements the visitor interface to lower all Declaration AST classes
    emitted from the D Front-end to GCC trees.
    All visit methods accept one parameter D, which holds the frontend AST
@@ -655,6 +676,16 @@ public:
       }
     else if (d->isDataseg () && !(d->storage_class & STCextern))
       {
+	/* For libphobos-internal use only.  When compiling unittests, only
+	   generate code for unittest or instantiated variables.  */
+	if (flag_building_libphobos_tests)
+	  {
+	    if (!this->in_version_unittest_
+		&& !in_unittest_p (d)
+		&& !d->isInstantiated ())
+	      return;
+	  }
+
 	tree decl = get_symbol_decl (d);
 
 	/* Duplicated VarDeclarations map to the same symbol.  Check if this
@@ -767,6 +798,20 @@ public:
     if (!global.params.useUnitTests && d->isUnitTestDeclaration ())
       return;
 
+    /* For libphobos-internal use only.  When compiling unittests, only
+       generate code for unittest or instantiated functions.  */
+    if (flag_building_libphobos_tests)
+      {
+	if (!d->isUnitTestDeclaration ()
+	    && !this->in_version_unittest_
+	    && !in_unittest_p (d)
+	    && !d->isArrayOp
+	    && !d->isInstantiated ()
+	    && !d->isMain ()
+	    && !d->isCMain ())
+	  return;
+      }
+
     /* Check if any errors occurred when running semantic.  */
     if (TypeFunction *tf = d->type->isTypeFunction ())
       {