Merge v2.088.0

ldc-developers · Sep 3, 2019 · 3e82f74 · 3e82f74
1 parent c5dc020
commit 3e82f74
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/dmd/expressionsem.d b/dmd/expressionsem.d
@@ -6087,7 +6087,7 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
             }
 
             if (v && (v.isDataseg() || // fix https://issues.dlang.org/show_bug.cgi?id=8238
-                      !v.needThis()))  // fix https://issues.dlang.org/show_bug.cgi?id=17258
+                      (!v.needThis() && v.semanticRun > PASS.init)))  // fix https://issues.dlang.org/show_bug.cgi?id=17258
             {
                 // (e1, v)
                 checkAccess(exp.loc, sc, exp.e1, v);

diff --git a/dmd/staticcond.d b/dmd/staticcond.d
@@ -96,6 +96,7 @@ bool evalStaticCondition(Scope* sc, Expression original, Expression e, out bool
 
         e = e.expressionSemantic(sc);
         e = resolveProperties(sc, e);
+        e = e.toBoolean(sc);
 
         sc = sc.endCTFE();
         e = e.optimize(WANTvalue);

diff --git a/runtime/druntime b/runtime/druntime
diff --git a/tests/d2/dmd-testsuite b/tests/d2/dmd-testsuite