Merge pull request #2674 from ShigekiKarita/patch-1

dlang-bot · web-flow · commit bb0bce70f58d · 2019-07-14T14:28:46.000+02:00
Fix issue 20049 - object.destroy doesn't propagate attributes 
merged-on-behalf-of: Nicholas Wilson &lt;thewilsonator@users.noreply.github.com&gt;
diff --git a/src/object.d b/src/object.d
@@ -882,6 +882,21 @@ nothrow @safe @nogc unittest
     }
 }
 
+nothrow unittest
+{
+    // Bugzilla 20049: Test to ensure proper behavior of `nothrow` destructors
+    class C
+    {
+        static int dtorCount = 0;
+        this() nothrow {}
+        ~this() nothrow { dtorCount++; }
+    }
+
+    auto c = new C;
+    destroy(c);
+    assert(C.dtorCount == 1);
+}
+
 /// ditto
 void destroy(bool initialize = true, T : U[n], U, size_t n)(ref T obj) if (!is(T == struct))
 {
@@ -988,7 +1003,7 @@ template _isStaticArray(T)
 private
 {
     extern (C) Object _d_newclass(const TypeInfo_Class ci);
-    extern (C) void rt_finalize(void *data, bool det=true);
+    extern (C) void rt_finalize(void *data, bool det=true) nothrow;
 }
 
 public @trusted @nogc nothrow pure extern (C) void _d_delThrowable(scope Throwable);

Original file line number	Diff line number	Diff line change
`@@ -882,6 +882,21 @@ nothrow @safe @nogc unittest`
`882`	`882`	`}`
`883`	`883`	`}`
`884`	`884`
	`885`	`+nothrow unittest`
	`886`	`+{`
	`887`	+ // Bugzilla 20049: Test to ensure proper behavior of `nothrow` destructors
	`888`	`+ class C`
	`889`	`+ {`
	`890`	`+ static int dtorCount = 0;`
	`891`	`+ this() nothrow {}`
	`892`	`+ ~this() nothrow { dtorCount++; }`
	`893`	`+ }`
	`894`	`+`
	`895`	`+ auto c = new C;`
	`896`	`+ destroy(c);`
	`897`	`+ assert(C.dtorCount == 1);`
	`898`	`+}`
	`899`	`+`
`885`	`900`	`/// ditto`
`886`	`901`	`void destroy(bool initialize = true, T : U[n], U, size_t n)(ref T obj) if (!is(T == struct))`
`887`	`902`	`{`
`@@ -988,7 +1003,7 @@ template _isStaticArray(T)`
`988`	`1003`	`private`
`989`	`1004`	`{`
`990`	`1005`	`extern (C) Object _d_newclass(const TypeInfo_Class ci);`
`991`		`- extern (C) void rt_finalize(void *data, bool det=true);`
	`1006`	`+ extern (C) void rt_finalize(void *data, bool det=true) nothrow;`
`992`	`1007`	`}`
`993`	`1008`
`994`	`1009`	`public @trusted @nogc nothrow pure extern (C) void _d_delThrowable(scope Throwable);`