Merge pull request #8594 from rainers/fix_debug_build

Fix debug build and remove debug messages merged-on-behalf-of: Razvan Nitu <RazvanN7@users.noreply.github.com>
dlang · Sep 5, 2018 · 8bdf59d · 8bdf59d
2 parents 12890cb + 2ecbc0c
commit 8bdf59d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/dmd/backend/go.d b/src/dmd/backend/go.d
@@ -119,8 +119,11 @@ debug
 debug (DEBUG_TREES)
     void dbg_optprint(const(char) *);
 else
-                        // to print progress message, undo comment
-    void dbg_optprint(const(char) *c) { printf(c); }
+    void dbg_optprint(const(char) *c)
+    {
+        // to print progress message, undo comment
+        // printf(c);
+    }
 }
 else
 {

diff --git a/src/dmd/backend/nteh.d b/src/dmd/backend/nteh.d
@@ -622,11 +622,8 @@ void cdsetjmp(ref CodeBuilder cdb, elem *e,regm_t *pretregs)
 
     stackpushsave = stackpush;
 version (SCPP)
-    enum SCPP = true;
-else
-    enum SCPP = false;
-
-    if (SCPP && CPP && (funcsym_p.Sfunc.Fflags3 & Fcppeh || usednteh & NTEHcpp))
+{
+    if (CPP && (funcsym_p.Sfunc.Fflags3 & Fcppeh || usednteh & NTEHcpp))
     {
         /*  If in C++ try block
             If the frame that is calling setjmp has a try,catch block then
@@ -666,8 +663,9 @@ else
         cdb.genadjesp(4);
 
         flag = 3;
+        goto L2;
     }
-    else
+}
     if (funcsym_p.Sfunc.Fflags3 & Fnteh)
     {
         /*  If in NT SEH try block
@@ -716,7 +714,7 @@ else
     L1:
         flag = 0;
     }
-
+L2:
     cs.Iop = 0x68;
     cs.Iflags = 0;
     cs.Irex = 0;