Fix using final for bitfield accessors in classes

tim-dlang · tim-dlang · commit f350c03731c7 · 2025-01-19T15:45:10.000+01:00
Accessors for private bitfields were already implicitly
final.
diff --git a/src/cppconv/dwriter.d b/src/cppconv/dwriter.d
@@ -6393,7 +6393,7 @@ void declarationToDCode(ref CodeWriter code, DWriterData data, Declaration d, im
             if (d.name.length)
             {
                 if (data.currentClassDeclaration !is null
-                        && !isClass(data.currentClassDeclaration.tree, data))
+                        && isClass(data.currentClassDeclaration.tree, data))
                     code.write("final ");
                 code.writeln(typeCode, " ", replaceKeywords(d.name), "() const");
                 code.writeln("{").incIndent;
@@ -6402,7 +6402,7 @@ void declarationToDCode(ref CodeWriter code, DWriterData data, Declaration d, im
                         toChars!16((ulong(1) << e.data.length) - 1), ";");
                 code.decIndent.writeln("}");
                 if (data.currentClassDeclaration !is null
-                        && !isClass(data.currentClassDeclaration.tree, data))
+                        && isClass(data.currentClassDeclaration.tree, data))
                     code.write("final ");
                 code.writeln(typeCode, " ", replaceKeywords(d.name), "(", typeCode, " value)");
                 code.writeln("{").incIndent;
diff --git a/tests/single/test120.d b/tests/single/test120.d
@@ -9,38 +9,38 @@ struct git_revwalk {
 			did_hide: 1,
 			did_push: 1; +/
 	ubyte bitfieldData_walking;
-	final uint walking() const
+	uint walking() const
 	{
     	return (bitfieldData_walking >> 0) & 0x1;
 	}
-	final uint walking(uint value)
+	uint walking(uint value)
 	{
     	bitfieldData_walking = (bitfieldData_walking & ~0x1) | ((value & 0x1) << 0);
     	return value;
 	}
-final uint first_parent() const
+uint first_parent() const
 {
     return (bitfieldData_walking >> 1) & 0x1;
 }
-final uint first_parent(uint value)
+uint first_parent(uint value)
 {
     bitfieldData_walking = (bitfieldData_walking & ~0x2) | ((value & 0x1) << 1);
     return value;
 }
-final uint did_hide() const
+uint did_hide() const
 {
     return (bitfieldData_walking >> 2) & 0x1;
 }
-final uint did_hide(uint value)
+uint did_hide(uint value)
 {
     bitfieldData_walking = (bitfieldData_walking & ~0x4) | ((value & 0x1) << 2);
     return value;
 }
-final uint did_push() const
+uint did_push() const
 {
     return (bitfieldData_walking >> 3) & 0x1;
 }
-final uint did_push(uint value)
+uint did_push(uint value)
 {
     bitfieldData_walking = (bitfieldData_walking & ~0x8) | ((value & 0x1) << 3);
     return value;
diff --git a/tests/single/test218.d b/tests/single/test218.d
@@ -9,21 +9,21 @@ struct QArrayData
     int size;
     /+ unsigned int alloc : 31; +/
     uint bitfieldData_alloc;
-    final uint alloc() const
+    uint alloc() const
     {
         return (bitfieldData_alloc >> 0) & 0x7fffffff;
     }
-    final uint alloc(uint value)
+    uint alloc(uint value)
     {
         bitfieldData_alloc = (bitfieldData_alloc & ~0x7fffffff) | ((value & 0x7fffffff) << 0);
         return value;
     }
     /+ unsigned int capacityReserved : 1; +/
-    final uint capacityReserved() const
+    uint capacityReserved() const
     {
         return (bitfieldData_alloc >> 31) & 0x1;
     }
-    final uint capacityReserved(uint value)
+    uint capacityReserved(uint value)
     {
         bitfieldData_alloc = (bitfieldData_alloc & ~0x80000000) | ((value & 0x1) << 31);
         return value;
diff --git a/tests/single/test374.cpp b/tests/single/test374.cpp
@@ -0,0 +1,7 @@
+class C
+{
+    virtual ~C();
+
+    int i1 : 2;
+    int i2 : 6;
+};
diff --git a/tests/single/test374.d b/tests/single/test374.d
@@ -0,0 +1,33 @@
+module test374;
+
+import config;
+import cppconvhelpers;
+
+class C
+{
+private:
+    /+ virtual +/~this();
+
+    /+ int i1 : 2; +/
+    ubyte bitfieldData_i1;
+    final int i1() const
+    {
+        return (bitfieldData_i1 >> 0) & 0x3;
+    }
+    final int i1(int value)
+    {
+        bitfieldData_i1 = (bitfieldData_i1 & ~0x3) | ((value & 0x3) << 0);
+        return value;
+    }
+    /+ int i2 : 6; +/
+    final int i2() const
+    {
+        return (bitfieldData_i1 >> 2) & 0x3f;
+    }
+    final int i2(int value)
+    {
+        bitfieldData_i1 = (bitfieldData_i1 & ~0xfc) | ((value & 0x3f) << 2);
+        return value;
+    }
+}
+
diff --git a/tests/single/test86.d b/tests/single/test86.d
@@ -13,11 +13,11 @@ struct S
 	static if (defined!"DEF")
 	{
 	ubyte bitfieldData_test2;
-	final uint test2() const
+	uint test2() const
 	{
     	return (bitfieldData_test2 >> 0) & 0x1;
 	}
-	final uint test2(uint value)
+	uint test2(uint value)
 	{
     	bitfieldData_test2 = (bitfieldData_test2 & ~0x1) | ((value & 0x1) << 0);
     	return value;
@@ -26,11 +26,11 @@ struct S
 	static if (!defined!"DEF")
 	{
 	ubyte bitfieldData_test2;
-	final uint test2() const
+	uint test2() const
 	{
     	return (bitfieldData_test2 >> 0) & 0x1;
 	}
-	final uint test2(uint value)
+	uint test2(uint value)
 	{
     	bitfieldData_test2 = (bitfieldData_test2 & ~0x1) | ((value & 0x1) << 0);
     	return value;
@@ -39,23 +39,23 @@ struct S
 	/+ unsigned test3: 2; +/
 	static if (defined!"DEF")
 	{
-	final uint test3() const
+	uint test3() const
 	{
     	return (bitfieldData_test2 >> 1) & 0x3;
 	}
-	final uint test3(uint value)
+	uint test3(uint value)
 	{
     	bitfieldData_test2 = (bitfieldData_test2 & ~0x6) | ((value & 0x3) << 1);
     	return value;
 	}
 	}
 	static if (!defined!"DEF")
 	{
-	final uint test3() const
+	uint test3() const
 	{
     	return (bitfieldData_test2 >> 1) & 0x3;
 	}
-	final uint test3(uint value)
+	uint test3(uint value)
 	{
     	bitfieldData_test2 = (bitfieldData_test2 & ~0x6) | ((value & 0x3) << 1);
     	return value;
@@ -68,11 +68,11 @@ struct S
 	/+ unsigned test5: 1; +/
 	static if (defined!"DEF")
 	{
-	final uint test5() const
+	uint test5() const
 	{
     	return (bitfieldData_test2 >> 3) & 0x1;
 	}
-	final uint test5(uint value)
+	uint test5(uint value)
 	{
     	bitfieldData_test2 = (bitfieldData_test2 & ~0x8) | ((value & 0x1) << 3);
     	return value;
@@ -81,11 +81,11 @@ struct S
 	static if (!defined!"DEF")
 	{
 	ubyte bitfieldData_test5;
-	final uint test5() const
+	uint test5() const
 	{
     	return (bitfieldData_test5 >> 0) & 0x1;
 	}
-	final uint test5(uint value)
+	uint test5(uint value)
 	{
     	bitfieldData_test5 = (bitfieldData_test5 & ~0x1) | ((value & 0x1) << 0);
     	return value;

Original file line number	Diff line number	Diff line change
`@@ -9,38 +9,38 @@ struct git_revwalk {`
`9`	`9`	`did_hide: 1,`
`10`	`10`	`did_push: 1; +/`
`11`	`11`	`ubyte bitfieldData_walking;`
`12`		`- final uint walking() const`
	`12`	`+ uint walking() const`
`13`	`13`	`{`
`14`	`14`	`return (bitfieldData_walking >> 0) & 0x1;`
`15`	`15`	`}`
`16`		`- final uint walking(uint value)`
	`16`	`+ uint walking(uint value)`
`17`	`17`	`{`
`18`	`18`	`bitfieldData_walking = (bitfieldData_walking & ~0x1) \| ((value & 0x1) << 0);`
`19`	`19`	`return value;`
`20`	`20`	`}`
`21`		`-final uint first_parent() const`
	`21`	`+uint first_parent() const`
`22`	`22`	`{`
`23`	`23`	`return (bitfieldData_walking >> 1) & 0x1;`
`24`	`24`	`}`
`25`		`-final uint first_parent(uint value)`
	`25`	`+uint first_parent(uint value)`
`26`	`26`	`{`
`27`	`27`	`bitfieldData_walking = (bitfieldData_walking & ~0x2) \| ((value & 0x1) << 1);`
`28`	`28`	`return value;`
`29`	`29`	`}`
`30`		`-final uint did_hide() const`
	`30`	`+uint did_hide() const`
`31`	`31`	`{`
`32`	`32`	`return (bitfieldData_walking >> 2) & 0x1;`
`33`	`33`	`}`
`34`		`-final uint did_hide(uint value)`
	`34`	`+uint did_hide(uint value)`
`35`	`35`	`{`
`36`	`36`	`bitfieldData_walking = (bitfieldData_walking & ~0x4) \| ((value & 0x1) << 2);`
`37`	`37`	`return value;`
`38`	`38`	`}`
`39`		`-final uint did_push() const`
	`39`	`+uint did_push() const`
`40`	`40`	`{`
`41`	`41`	`return (bitfieldData_walking >> 3) & 0x1;`
`42`	`42`	`}`
`43`		`-final uint did_push(uint value)`
	`43`	`+uint did_push(uint value)`
`44`	`44`	`{`
`45`	`45`	`bitfieldData_walking = (bitfieldData_walking & ~0x8) \| ((value & 0x1) << 3);`
`46`	`46`	`return value;`
Original file line number	Diff line number	Diff line change
`@@ -9,21 +9,21 @@ struct QArrayData`
`9`	`9`	`int size;`
`10`	`10`	`/+ unsigned int alloc : 31; +/`
`11`	`11`	`uint bitfieldData_alloc;`
`12`		`- final uint alloc() const`
	`12`	`+ uint alloc() const`
`13`	`13`	`{`
`14`	`14`	`return (bitfieldData_alloc >> 0) & 0x7fffffff;`
`15`	`15`	`}`
`16`		`- final uint alloc(uint value)`
	`16`	`+ uint alloc(uint value)`
`17`	`17`	`{`
`18`	`18`	`bitfieldData_alloc = (bitfieldData_alloc & ~0x7fffffff) \| ((value & 0x7fffffff) << 0);`
`19`	`19`	`return value;`
`20`	`20`	`}`
`21`	`21`	`/+ unsigned int capacityReserved : 1; +/`
`22`		`- final uint capacityReserved() const`
	`22`	`+ uint capacityReserved() const`
`23`	`23`	`{`
`24`	`24`	`return (bitfieldData_alloc >> 31) & 0x1;`
`25`	`25`	`}`
`26`		`- final uint capacityReserved(uint value)`
	`26`	`+ uint capacityReserved(uint value)`
`27`	`27`	`{`
`28`	`28`	`bitfieldData_alloc = (bitfieldData_alloc & ~0x80000000) \| ((value & 0x1) << 31);`
`29`	`29`	`return value;`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ struct S`
`13`	`13`	`static if (defined!"DEF")`
`14`	`14`	`{`
`15`	`15`	`ubyte bitfieldData_test2;`
`16`		`- final uint test2() const`
	`16`	`+ uint test2() const`
`17`	`17`	`{`
`18`	`18`	`return (bitfieldData_test2 >> 0) & 0x1;`
`19`	`19`	`}`
`20`		`- final uint test2(uint value)`
	`20`	`+ uint test2(uint value)`
`21`	`21`	`{`
`22`	`22`	`bitfieldData_test2 = (bitfieldData_test2 & ~0x1) \| ((value & 0x1) << 0);`
`23`	`23`	`return value;`
`@@ -26,11 +26,11 @@ struct S`
`26`	`26`	`static if (!defined!"DEF")`
`27`	`27`	`{`
`28`	`28`	`ubyte bitfieldData_test2;`
`29`		`- final uint test2() const`
	`29`	`+ uint test2() const`
`30`	`30`	`{`
`31`	`31`	`return (bitfieldData_test2 >> 0) & 0x1;`
`32`	`32`	`}`
`33`		`- final uint test2(uint value)`
	`33`	`+ uint test2(uint value)`
`34`	`34`	`{`
`35`	`35`	`bitfieldData_test2 = (bitfieldData_test2 & ~0x1) \| ((value & 0x1) << 0);`
`36`	`36`	`return value;`
`@@ -39,23 +39,23 @@ struct S`
`39`	`39`	`/+ unsigned test3: 2; +/`
`40`	`40`	`static if (defined!"DEF")`
`41`	`41`	`{`
`42`		`- final uint test3() const`
	`42`	`+ uint test3() const`
`43`	`43`	`{`
`44`	`44`	`return (bitfieldData_test2 >> 1) & 0x3;`
`45`	`45`	`}`
`46`		`- final uint test3(uint value)`
	`46`	`+ uint test3(uint value)`
`47`	`47`	`{`
`48`	`48`	`bitfieldData_test2 = (bitfieldData_test2 & ~0x6) \| ((value & 0x3) << 1);`
`49`	`49`	`return value;`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`static if (!defined!"DEF")`
`53`	`53`	`{`
`54`		`- final uint test3() const`
	`54`	`+ uint test3() const`
`55`	`55`	`{`
`56`	`56`	`return (bitfieldData_test2 >> 1) & 0x3;`
`57`	`57`	`}`
`58`		`- final uint test3(uint value)`
	`58`	`+ uint test3(uint value)`
`59`	`59`	`{`
`60`	`60`	`bitfieldData_test2 = (bitfieldData_test2 & ~0x6) \| ((value & 0x3) << 1);`
`61`	`61`	`return value;`
`@@ -68,11 +68,11 @@ struct S`
`68`	`68`	`/+ unsigned test5: 1; +/`
`69`	`69`	`static if (defined!"DEF")`
`70`	`70`	`{`
`71`		`- final uint test5() const`
	`71`	`+ uint test5() const`
`72`	`72`	`{`
`73`	`73`	`return (bitfieldData_test2 >> 3) & 0x1;`
`74`	`74`	`}`
`75`		`- final uint test5(uint value)`
	`75`	`+ uint test5(uint value)`
`76`	`76`	`{`
`77`	`77`	`bitfieldData_test2 = (bitfieldData_test2 & ~0x8) \| ((value & 0x1) << 3);`
`78`	`78`	`return value;`
`@@ -81,11 +81,11 @@ struct S`
`81`	`81`	`static if (!defined!"DEF")`
`82`	`82`	`{`
`83`	`83`	`ubyte bitfieldData_test5;`
`84`		`- final uint test5() const`
	`84`	`+ uint test5() const`
`85`	`85`	`{`
`86`	`86`	`return (bitfieldData_test5 >> 0) & 0x1;`
`87`	`87`	`}`
`88`		`- final uint test5(uint value)`
	`88`	`+ uint test5(uint value)`
`89`	`89`	`{`
`90`	`90`	`bitfieldData_test5 = (bitfieldData_test5 & ~0x1) \| ((value & 0x1) << 0);`
`91`	`91`	`return value;`