v1.1.1: adapt to build with 2.096

dlang · Apr 28, 2021 · 3b4bc43 · 3b4bc43
1 parent f592159
commit 3b4bc43
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1296,3 +1296,12 @@ Version history
     - added support for -preview=in and -preview=inclusiveincontracts
     - visualdproj: added macros FULLOUTDIR, FULLINTDIR, INPUTFULLPATH, INPUTFULLDIR, TARGETFULLPATH
       and TARGETFULLDIR for guaranteed absolute paths
+
+2021-04-28 version 1.1.1
+  * dmdserver:
+    - updated to frontend of DMD 2.096.1
+  * debugger:
+    - bugzilla 21734: stack overflow when displaying recursive structure with array
+  * installer:
+    - full installer now bundled with DMD 2.096.1 and LDC 1.25.1
+
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      1
 #define VERSION_MINOR      1
-#define VERSION_REVISION   0
+#define VERSION_REVISION   1
 #define VERSION_BETA       
 #define VERSION_BUILD      0
diff --git a/doc/StartPage.dd b/doc/StartPage.dd
@@ -84,6 +84,12 @@ $(H2 News)
 $(P $(LINK2 VersionHistory.html, Full version history and complete details...)
 )
 
+2021-04-28 Version 1.1.1
+ $(UL
+  $(LI semantic engine updated to frontend of DMD 2.096.1)
+  $(LI full installer now bundled with DMD 2.096.1 and LDC 1.25.1)
+ )
+
 2021-03-02 Version 1.1.0
  $(UL
   $(LI semantic engine updated to frontend of DMD 2.095.1)

diff --git a/doc/VersionHistory.dd b/doc/VersionHistory.dd
@@ -1,5 +1,21 @@
 Ddoc
 
+$(H2 2021-04-28 Version 1.1.1)
+ $(UL
+  $(LI dmdserver:
+   $(UL
+    $(LI updated to frontend of DMD 2.096.1)
+  ))
+  $(LI debugger:
+   $(UL
+    $(LI bugzilla 21734: stack overflow when displaying recursive structure with array)
+  ))
+  $(LI installer:
+   $(UL
+    $(LI full installer now bundled with DMD 2.096.1 and LDC 1.25.1)
+  ))
+ )
+
 $(H2 2021-02-02 Version 1.1.0)
  $(UL
   $(LI dmdserver:

diff --git a/doc/visuald.ddoc b/doc/visuald.ddoc
@@ -1,6 +1,6 @@
-VERSION = 1.1.0
-DMD_VERSION = 2.095.1
-LDC_VERSION = 1.25.0
+VERSION = 1.1.1
+DMD_VERSION = 2.096.1
+LDC_VERSION = 1.25.1
 ROOT_DIR = https://www.dlang.org/
 ROOT = https://www.dlang.org
 BODYCLASS = visuald

diff --git a/nsis/visuald.nsi b/nsis/visuald.nsi
@@ -29,12 +29,12 @@
 
 ; define DMD source path to include dmd installation
 ; !define DMD 
-!define DMD_VERSION "2.095.1"
+!define DMD_VERSION "2.096.1"
 !define DMD_SRC c:\d\dmd-${DMD_VERSION}
 
 ; define LDC to include ldc installation
 ; !define LDC
-!define LDC_VERSION "1.25.0"
+!define LDC_VERSION "1.25.1"
 !define LDC_SRC c:\d\ldc2-${LDC_VERSION}-windows-multilib
 
 ; define VS2019 to include VS2019 support

diff --git a/vdc/dmdserver/dmdinit.d b/vdc/dmdserver/dmdinit.d
@@ -100,7 +100,12 @@ string genInitDmdStatics()
 
 mixin(genDeclDmdStatics);
 
-pragma(mangle, "_D3dmd12statementsem24StatementSemanticVisitor5visitMRCQCb9statement16ForeachStatementZ5__S17fdapplyPCQDw4func15FuncDeclaration")
+static if (__VERSION__ < 2096)
+	enum fdapply_mangling = "_D3dmd12statementsem24StatementSemanticVisitor5visitMRCQCb9statement16ForeachStatementZ7fdapplyPCQDr4func15FuncDeclaration";
+else // !!! broken in 2.096.0 ("5__S1" instead of "4__S1")
+	enum fdapply_mangling = "_D3dmd12statementsem24StatementSemanticVisitor5visitMRCQCb9statement16ForeachStatementZ4__S17fdapplyPCQDw4func15FuncDeclaration";
+
+pragma(mangle, fdapply_mangling)
 extern __gshared FuncDeclaration* statementsem_fdapply;
 pragma(mangle, "_D3dmd12statementsem24StatementSemanticVisitor5visitMRCQCb9statement16ForeachStatementZ6fldeTyPCQDq5mtype12TypeDelegate")
 extern __gshared TypeDelegate* statementsem_fldeTy;