* issue #300: storage class adornments not updated after edits

  * dmdserver: fixed a couple of assertions causing the server to restart
  * dmdserver: replaced new location storage to avoid leaking memory

Author: rainers

CHANGES

@@ -1414,3 +1414,10 @@ Version history
   * mago: fixed display of AA key in expanded view
   * issue #291: allow overriding the default compiler executable path in the VC project settings
   * issue #296: VC project integration: added support to build for ARM64 with LDC
+
+2025-05-01 version 1.4.1-beta2
+  * issue #300: storage class adornments not updated after edits
+  * issue #301: mago: strip modifier from type before detecting arrays
+  * mago: improved stability when displaying arrays from invalid memory address
+  * dmdserver: fixed a couple of assertions causing the server to restart
+  * dmdserver: replaced new location storage to avoid leaking memory

VERSION

@@ -2,4 +2,4 @@
 #define VERSION_MINOR      4
 #define VERSION_REVISION   1
 #define VERSION_BETA       -beta
-#define VERSION_BUILD      1
+#define VERSION_BUILD      2

vdc/dmdserver/dmd

@@ -23,11 +23,13 @@ import dmd.dmodule;
 import dmd.dstruct;
 import dmd.dsymbol;
 import dmd.dtemplate;
+import dmd.escape;
 import dmd.expression;
 import dmd.func;
 import dmd.globals;
 import dmd.id;
 import dmd.identifier;
+import dmd.location;
 import dmd.mtype;
 import dmd.objc;
 import dmd.rootobject;
@@ -42,6 +44,8 @@ import core.stdc.string;
 ////////////////////////////////////////////////////////////////
 alias countersType = uint[uint]; // actually uint[Key]
 alias EscapeInfer = RootObject[int];
+enum uint_1 : uint { initValue = 1 }
+
 
 enum string[2][] dmdStatics =
 [
@@ -108,6 +112,7 @@ enum string[2][] dmdStatics =
 	["_D3dmd7arrayop7arrayOpFCQw10expression6BinExpPSQBt6dscope5ScopeZQByCQCo9dtemplate19TemplateDeclaration", "TemplateDeclaration"],
 	["_D3dmd6errors18colorHighlightCodeFNbKSQBk6common9outbuffer9OutBufferZ6nestedi", "int"],
 	["_D3dmd7dmodule6Module18loadCoreStdcConfigFZ16core_stdc_configCQCiQChQCc", "Module"],
+	// EscapeState.reset not accessible in package dmd
 	["_D3dmd6escape11EscapeState17scopeInferFailureHiCQBu10rootobject10RootObject", "EscapeInfer" ],
 ];
 
@@ -135,7 +140,7 @@ string genInitDmdStatics()
 {
 	string s;
 	foreach (decl; dmdStatics)
-		s ~= cmangled(decl[0]) ~ " = " ~ decl[1] ~ ".init;\n";
+		s ~= cmangled(decl[0]) ~ " = (" ~ decl[1] ~ ").init;\n";
 	return s;
 }
 
@@ -197,6 +202,7 @@ void dmdInit()
 	//Token._init();
 	Id.initialize();
 	Expression._init();
+	location_init();
 
 	target._init(global.params); // needed by Type._init
 	Type._init();

vdc/dmdserver/dmdinit.d

@@ -840,7 +840,7 @@ class DMDServer : ComObject, IVDServer
 			*types = allocBSTR("__pending__");
 			return S_OK;
 		}
-		version(DebugServer) if(dbgfh) dbglog("GetIdentifierTypesResult: " ~ firstLine(mLastReferences) ~ "...");
+		version(DebugServer) if(dbgfh) dbglog("GetIdentifierTypesResult: " ~ firstLine(mLastIdentifierTypes) ~ "...");
 		*types = allocBSTR(mLastIdentifierTypes);
 		return S_OK;
 	}
@@ -855,14 +855,20 @@ class DMDServer : ComObject, IVDServer
 		{
 			md = findModule(fname, false);
 			if (!md || !md.analyzedModule)
+			{
+				version(DebugServer) if(dbgfh) dbglog("GetParameterStorageLocs: " ~ fname ~ " not found");
 				return S_FALSE;
+			}
 		}
 
 		auto stcLoc = findParameterStorageClass(md.analyzedModule);
 
 		SAFEARRAY *sa = SafeArrayCreateVector(VT_INT, 0, 3 * cast(ULONG) stcLoc.length);
 		if(!sa)
+		{
+			version(DebugServer) if(dbgfh) dbglog("GetParameterStorageLocs: " ~ fname ~ " out of memory (" ~ to!string(stcLoc.length) ~ " entries)");
 			return E_OUTOFMEMORY;
+		}
 
 		for(LONG index = 0; index < stcLoc.length; index++)
 		{
@@ -877,6 +883,7 @@ class DMDServer : ComObject, IVDServer
 			SafeArrayPutElement(sa, &idx, &value);
 		}
 
+		version(DebugServer) if(dbgfh) dbglog("GetParameterStorageLocs: " ~ fname ~ " OK (" ~ to!string(stcLoc.length) ~ " entries)");
 		locs.vt = VT_ARRAY | VT_INT;
 		locs.parray = sa;
 		return S_OK;

vdc/dmdserver/dmdserver.d

@@ -2406,7 +2406,7 @@
    <File path="dmd\compiler\src\dmd\libmscoff.d" tool="None" />
    <File path="dmd\compiler\src\dmd\libomf.d" tool="None" />
    <File path="dmd\compiler\src\dmd\link.d" tool="None" />
-   <File path="dmd\compiler\src\dmd\location.d" />
+   <File path="dmd\compiler\src\dmd\location.d" tool="None" />
    <File path="dmd\compiler\src\dmd\mars.d" tool="None" />
    <File path="dmd\compiler\src\dmd\mtype.d" />
    <File path="dmd\compiler\src\dmd\mustuse.d" />
@@ -2455,6 +2455,7 @@
   <File path="dmderrors.d" />
   <File path="dmdinit.d" />
   <File path="dmdlib.d" />
+  <File path="dmdlocation.d" />
   <File path="dmdrmem.d" />
   <File path="dmdserver.d" />
   <File customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;

vdc/dmdserver/dmdserver.visualdproj

@@ -16,6 +16,7 @@ import vdc.ivdserver;
 import dmd.arraytypes;
 import dmd.cond;
 import dmd.dmodule;
+import dmd.dsymbol;
 import dmd.dsymbolsem;
 import dmd.errors;
 import dmd.globals;
@@ -225,6 +226,14 @@ Module analyzeModule(Module parsedModule, const ref Options opts)
 	return Module.rootModule;
 }
 
+debug
+{
+    auto __debugOverview(Identifier id) => id ? id.toString : null;
+    auto __debugOverview(Dsymbol s) => s && s.ident ? s.ident.toString : null;
+    auto __debugOverview(ref const Loc loc) => loc.toChars();
+    auto __debugExpanded(ref const Loc loc) => loc.toChars();
+}
+
 ////////////////////////////////////////////////////////////////
 version (traceGC) import tracegc;
 
@@ -1944,6 +1953,19 @@ void do_unittests()
 	assert_equal(stcpos[1], ParameterStorageClassPos(1, 12, 11));
 	assert_equal(stcpos[2], ParameterStorageClassPos(2, 13, 12));
 	assert_equal(stcpos[3], ParameterStorageClassPos(0, 14, 11));
+
+	// extracted from regex.d, caused an assertion in dinterpret.d
+	//  because the type must not be saved to TemplateValueParameter.specValue
+	source = q{
+		enum IR { End }
+		static op(int code:IR.End)() {}
+
+		void foo() 
+		{
+			op!(0);
+		}
+	};
+	m = checkErrors(source, "");
 }
 
 unittest
@@ -2176,6 +2198,19 @@ void test_ana_dmd()
 			writeln(GC.stats);
 	}
 	test_leaks();
+
+	void test_std()
+	{
+		bool dump = false;
+		string source = q{
+			import std;
+			void main() {
+				auto re = regex(`([0-9]+)\.([0-9]+)(\.([0-9]+))?([-\.]?([abr])?[a-z]*[-\.]?([0-9]*))?`);
+			}
+		};
+		Module m = checkErrors(source, "");
+	}
+	test_std();
 }
 
 unittest

vdc/dmdserver/semanalysis.d

@@ -1091,7 +1091,7 @@ RootObject _findAST(Dsymbol sym, const(char*) filename, int startLine, int start
 
 RootObject findAST(Module mod, int startLine, int startIndex, int endLine, int endIndex)
 {
-	auto filename = mod.srcfile.toChars();
+	auto filename = mod.srcfile.toString().toLocFilename.ptr;
 	return _findAST(mod, filename, startLine, startIndex, endLine, endIndex);
 }
 
@@ -1524,7 +1524,7 @@ string findTip(Module mod, int startLine, int startIndex, int endLine, int endIn
 	showSizeAndAlignment = addsize;
 	scope(exit) showSizeAndAlignment = false; // tips also used by findExpansions
 
-	auto filename = mod.srcfile.toChars();
+	auto filename = mod.srcfile.toString().toLocFilename.ptr;
 	scope FindTipVisitor ftv = new FindTipVisitor(filename, startLine, startIndex, endLine, endIndex);
 	mod.accept(ftv);
 
@@ -1606,7 +1606,7 @@ extern(C++) class FindDefinitionVisitor : FindASTVisitor
 
 string findDefinition(Module mod, ref int line, ref int index)
 {
-	auto filename = mod.srcfile.toChars();
+	auto filename = mod.srcfile.toString().toLocFilename.ptr;
 	scope FindDefinitionVisitor fdv = new FindDefinitionVisitor(filename, line, index, line, index + 1);
 	mod.accept(fdv);
 
@@ -1647,7 +1647,7 @@ Loc[] findBinaryIsInLocations(Module mod)
 	}
 
 	scope BinaryIsInVisitor biiv = new BinaryIsInVisitor;
-	biiv.filename = mod.srcfile.toChars();
+	biiv.filename = mod.srcfile.toString().toLocFilename.ptr;
 	biiv.unconditional = true;
 	mod.accept(biiv);
 
@@ -1676,6 +1676,8 @@ FindIdentifierTypesResult findIdentifierTypes(Module mod)
 		extern(D)
 		final void addTypePos(const(char)[] ident, int type, int line, int col)
 		{
+			if (line <= 0)
+				return; // not visible
 			if (auto pid = ident in idTypes)
 			{
 				// merge sorted
@@ -2003,7 +2005,7 @@ FindIdentifierTypesResult findIdentifierTypes(Module mod)
 	}
 
 	scope IdentifierTypesVisitor itv = new IdentifierTypesVisitor;
-	itv.filename = mod.srcfile.toChars();
+	itv.filename = mod.srcfile.toString().toLocFilename.ptr;
 	mod.accept(itv);
 
 	return itv.idTypes;
@@ -2085,7 +2087,7 @@ ParameterStorageClassPos[] findParameterStorageClass(Module mod)
 	}
 
 	scope psv = new ParameterStorageClassVisitor;
-	psv.filename = mod.srcfile.toChars();
+	psv.filename = mod.srcfile.toString().toLocFilename.ptr;
 	mod.accept(psv);
 
 	return psv.stcPos;
@@ -2100,7 +2102,7 @@ struct Reference
 
 Reference[] findReferencesInModule(Module mod, int line, int index)
 {
-	auto filename = mod.srcfile.toChars();
+	auto filename = mod.srcfile.toString().toLocFilename.ptr;
 	scope FindDefinitionVisitor fdv = new FindDefinitionVisitor(filename, line, index, line, index + 1);
 	mod.accept(fdv);
 
@@ -2118,7 +2120,7 @@ Reference[] findReferencesInModule(Module mod, int line, int index)
 		extern(D)
 		void addReference(ref const Loc loc, Identifier ident)
 		{
-			if (loc.filename is filename && ident)
+			if (loc.filename is filename && ident && loc.linnum > 0)
 				if (!references.contains(Reference(loc, ident)))
 					references ~= Reference(loc, ident);
 		}
@@ -2510,15 +2512,8 @@ extern(C++) class FindExpansionsVisitor : FindASTVisitor
 	override void visit(DotIdExp de)
 	{
 		if (!found && de.ident)
-		{
 			if (matchDotIdentifier(de.dotloc, de.identloc, de.ident))
-			{
-				if (!de.type && de.resolvedTo && !de.resolvedTo.isErrorExp())
-					foundResolved(de.resolvedTo);
-				else
-					foundNode(de);
-			}
-		}
+				foundNode(de);
 	}
 
 	override void checkScope(ScopeDsymbol sc)
@@ -2542,7 +2537,7 @@ extern(C++) class FindExpansionsVisitor : FindASTVisitor
 
 string[] findExpansions(Module mod, int line, int index, string tok)
 {
-	auto filename = mod.srcfile.toChars();
+	auto filename = mod.srcfile.toString().toLocFilename.ptr;
 	scope FindExpansionsVisitor fdv = new FindExpansionsVisitor(filename, line, index, line, index + 1);
 	mod.accept(fdv);
 
@@ -2584,6 +2579,13 @@ string[] findExpansions(Module mod, int line, int index, string tok)
 		if (auto t = getType(e, false))
 			type = t;
 	}
+	if (!type)
+		if (auto sym = fdv.found ? fdv.found.isDsymbol() : null)
+			if (auto em = sym.isEnumMember())
+				type = em.ed.type;
+
+	if (type && type.isTypeEnum())
+		flags |= SearchOpt.localsOnly;
 
 	auto sds = fdv.foundScope;
 	if (type)