[committed] d: Fix regression caused by recent refactoring (PR95573)

Iain Buclaw ibuclaw@gdcproject.org
Mon Jun 8 20:16:48 GMT 2020


Hi,

This parch merges the D front-end implementation with upstream dmd
5041e56f1.  Fixing a small regression made by one of the refactorings.

Bootstrapped and regression tested on x86_64-linux-gnu, and committed to
mainline.

Regards
Iain.


gcc/d/ChangeLog:

	PR d/95573
	* dmd/MERGE: Merge upstream dmd 5041e56f1.
---
 gcc/d/dmd/MERGE   | 2 +-
 gcc/d/dmd/mtype.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE
index e2ebd27b19b..163a70ddb26 100644
--- a/gcc/d/dmd/MERGE
+++ b/gcc/d/dmd/MERGE
@@ -1,4 +1,4 @@
-955b8b36f8bbacc59745b44cdf48ef1ddeb01bcd
+5041e56f12806f13a8fa5e98a6c98279636a8d2a
 
 The first line of this file holds the git revision number of the last
 merge done from the dlang/dmd repository.
diff --git a/gcc/d/dmd/mtype.c b/gcc/d/dmd/mtype.c
index 7684516da99..011aff7ec93 100644
--- a/gcc/d/dmd/mtype.c
+++ b/gcc/d/dmd/mtype.c
@@ -9384,7 +9384,7 @@ Type *Parameter::isLazyArray()
             TypeDelegate *td = (TypeDelegate *)tel;
             TypeFunction *tf = td->next->toTypeFunction();
 
-            if (!tf->parameterList.varargs == VARARGnone && tf->parameterList.length() == 0)
+            if (tf->parameterList.varargs == VARARGnone && tf->parameterList.length() == 0)
             {
                 return tf->next;    // return type of delegate
             }
-- 
2.20.1



More information about the Gcc-patches mailing list