Fix 24051 - Safety attrib inference of enum/immut/const decls (#15434)

* Fix 24051 - Safety attrib inference of enum/immut/const decls * Make `INVALID_HANDLE_VALUE` @trusted * Push and pop scopes
dlang · Jul 27, 2023 · fd14379 · fd14379
1 parent 081af53
commit fd14379
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/compiler/src/dmd/dsymbolsem.d b/compiler/src/dmd/dsymbolsem.d
@@ -1219,8 +1219,11 @@ private extern(C++) final class DsymbolSemanticVisitor : Visitor
                             bool needctfe = dsym.isDataseg() || (dsym.storage_class & STC.manifest);
                             if (needctfe)
                                 sc = sc.startCTFE();
+                            sc = sc.push();
+                            sc.varDecl = dsym; // https://issues.dlang.org/show_bug.cgi?id=24051
                             exp = exp.expressionSemantic(sc);
                             exp = resolveProperties(sc, exp);
+                            sc = sc.pop();
                             if (needctfe)
                                 sc = sc.endCTFE();
                             ei.exp = exp;

diff --git a/compiler/src/dmd/func.d b/compiler/src/dmd/func.d
@@ -4558,7 +4558,7 @@ bool setUnsafe(Scope* sc,
                 .error(loc, fmt, arg0 ? arg0.toChars() : "", arg1 ? arg1.toChars() : "", arg2 ? arg2.toChars() : "");
                 return true;
             }
-            else if (!(sc.varDecl.storage_class & STC.system))
+            else if (!(sc.varDecl.storage_class & STC.trusted))
             {
                 sc.varDecl.storage_class |= STC.system;
             }

diff --git a/compiler/src/dmd/semantic2.d b/compiler/src/dmd/semantic2.d
@@ -245,8 +245,9 @@ private extern(C++) final class Semantic2Visitor : Visitor
             return;
 
         //printf("VarDeclaration::semantic2('%s')\n", toChars());
+        sc = sc.push();
         sc.varDecl = vd;
-        scope(exit) sc.varDecl = null;
+        scope(exit) sc = sc.pop();
 
         if (vd.aliasTuple)        // if it's a tuple
         {

diff --git a/compiler/test/fail_compilation/systemvariables_var_init.d b/compiler/test/fail_compilation/systemvariables_var_init.d
@@ -0,0 +1,26 @@
+/*
+REQUIRED_ARGS: -preview=systemVariables
+TEST_OUTPUT:
+---
+fail_compilation/systemvariables_var_init.d(21): Error: cannot access `@system` variable `ptrEnum` in @safe code
+fail_compilation/systemvariables_var_init.d(22): Error: cannot access `@system` variable `ptrConst` in @safe code
+fail_compilation/systemvariables_var_init.d(24): Error: cannot access `@system` variable `ptrVar` in @safe code
+---
+*/
+
+// https://issues.dlang.org/show_bug.cgi?id=24051
+
+enum uint* ptrEnum = cast(uint*) 0xC00000;
+const uint* ptrConst = cast(uint*) 0xC00000;
+uint* ptrVarSafe = null;
+uint* ptrVar = cast(uint*) 0xC00000;
+@trusted uint* ptrTrusted = cast(uint*) 0xC00000;
+
+void varInitializers() @safe
+{
+    *ptrEnum = 0;
+    *ptrConst = 0;
+    *ptrVarSafe = 0;
+    *ptrVar = 0;
+    *ptrTrusted = 0;
+}
diff --git a/druntime/src/core/sys/windows/winbase.d b/druntime/src/core/sys/windows/winbase.d
@@ -408,7 +408,7 @@ enum : DWORD {
     STD_ERROR_HANDLE  = 0xFFFFFFF4
 }
 
-enum HANDLE INVALID_HANDLE_VALUE = cast(HANDLE) (-1);
+@trusted enum HANDLE INVALID_HANDLE_VALUE = cast(HANDLE) (-1);
 
 enum : DWORD {
     GET_TAPE_MEDIA_INFORMATION = 0,