Suppress reporting dead fields/methods if name ends in _

titzer · Jul 25, 2024 · afefccb · afefccb
1 parent e415d02
commit afefccb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/aeneas/src/ir/Reachability.v3 b/aeneas/src/ir/Reachability.v3
@@ -887,7 +887,7 @@ class DeadCodeAnalyzer(ra: ReachabilityAnalyzer) {
 			// report dead fields if any
 			for (f in ic.fields) {
 				if (ic.inherits(f)) continue;
-				if (!f.facts.X_LIVE) {
+				if (reportDead(f)) {
 					if (buf.length == 0) addLine("within ", ic);
 					buf.puts("  dead field: ");
 					f.render(buf.red());
@@ -899,7 +899,7 @@ class DeadCodeAnalyzer(ra: ReachabilityAnalyzer) {
 				if (m == null) continue;
 				if (ic.inherits(m)) continue;
 				if (m.facts.M_EMPTY) continue;
-				if (!m.facts.X_LIVE) {
+				if (reportDead(m)) {
 					if (buf.length == 0) addLine("within ", ic);
 					buf.puts("  dead method: ");
 					m.render(buf.red());
@@ -909,6 +909,15 @@ class DeadCodeAnalyzer(ra: ReachabilityAnalyzer) {
 		}
 		buf.outt();
 	}
+	def reportDead(m: IrMember) -> bool {
+		if (m.facts.X_LIVE) return false;
+		// Don't report dead fields or methods whose names end with "_".
+		match (m) {
+			x: IrField => return x.source != null && !Strings.endsWith(x.source.name(), "_");
+			x: IrMethod => return x.source != null && !Strings.endsWith(x.source.name(), "_");
+		}
+		return true;
+	}
 	def addLine(p: string, ic: IrClass) {
 		buf.puts(p);
 		if (V3.isVariant(ic.ctype)) buf.puts("variant ");

diff --git a/aeneas/src/main/Version.v3 b/aeneas/src/main/Version.v3
@@ -3,6 +3,6 @@
 
 // Updated by VCS scripts. DO NOT EDIT.
 component Version {
-	def version: string = "III-7.1748";
+	def version: string = "III-7.1749";
 	var buildData: string;
 }