[libc++] Improve libc++ tests when using optimizations (#88897)

Stylie777 · web-flow · commit c3598b161a4d · 2024-04-29T12:33:25.000-06:00
Some tests were missing DoNotOptimize annotations.
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new.size_align.replace.indirect.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new.size_align.replace.indirect.pass.cpp
@@ -51,11 +51,12 @@ int main(int, char**) {
     // Test with an overaligned type
     {
         new_called = delete_called = 0;
-        OverAligned* x = DoNotOptimize(new OverAligned[3]);
+        OverAligned* dummy_data_block = new OverAligned[3];
+        OverAligned* x                = DoNotOptimize(dummy_data_block);
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(static_cast<void*>(x) == DummyData);
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(new_called == 1);
 
-        delete[] x;
+        delete[] dummy_data_block;
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(delete_called == 1);
     }
 
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new.size_align.replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new.size_align.replace.pass.cpp
@@ -48,11 +48,12 @@ int main(int, char**) {
     // Test with an overaligned type
     {
         new_called = delete_called = 0;
-        OverAligned* x = new OverAligned[3];
+        OverAligned* dummy_data_block = new OverAligned[3];
+        OverAligned* x                = DoNotOptimize(dummy_data_block);
         assert(static_cast<void*>(x) == DummyData);
         assert(new_called == 1);
 
-        delete[] x;
+        delete[] dummy_data_block;
         assert(delete_called == 1);
     }
 
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new.size_align_nothrow.replace.indirect.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new.size_align_nothrow.replace.indirect.pass.cpp
@@ -55,11 +55,12 @@ int main(int, char**) {
     // Test with an overaligned type
     {
         new_called = delete_called = 0;
-        OverAligned* x = DoNotOptimize(new (std::nothrow) OverAligned[3]);
+        OverAligned* dummy_data_block = new (std::nothrow) OverAligned[3];
+        OverAligned* x                = DoNotOptimize(dummy_data_block);
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(static_cast<void*>(x) == DummyData);
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(new_called == 1);
 
-        delete[] x;
+        delete[] dummy_data_block;
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(delete_called == 1);
     }
 
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.size_align.replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.size_align.replace.pass.cpp
@@ -48,11 +48,12 @@ int main(int, char**) {
     // Test with an overaligned type
     {
         new_called = delete_called = 0;
-        OverAligned* x = new OverAligned;
+        OverAligned* dummy_data_block = new OverAligned;
+        OverAligned* x                = DoNotOptimize(dummy_data_block);
         assert(static_cast<void*>(x) == DummyData);
         assert(new_called == 1);
 
-        delete x;
+        delete dummy_data_block;
         assert(delete_called == 1);
     }
 
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.size_align_nothrow.replace.indirect.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.size_align_nothrow.replace.indirect.pass.cpp
@@ -54,11 +54,12 @@ int main(int, char**) {
     // Test with an overaligned type
     {
         new_called = delete_called = 0;
-        OverAligned* x = DoNotOptimize(new (std::nothrow) OverAligned);
+        OverAligned* dummy_data_block = new (std::nothrow) OverAligned;
+        OverAligned* x                = DoNotOptimize(dummy_data_block);
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(static_cast<void*>(x) == DummyData);
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(new_called == 1);
 
-        delete x;
+        delete dummy_data_block;
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(delete_called == 1);
     }
 
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.size_align_nothrow.replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.size_align_nothrow.replace.pass.cpp
@@ -47,11 +47,12 @@ int main(int, char**) {
     // Test with an overaligned type
     {
         new_nothrow_called = delete_called = 0;
-        OverAligned* x = new (std::nothrow) OverAligned;
+        OverAligned* dummy_data_block      = new (std::nothrow) OverAligned;
+        OverAligned* x                     = DoNotOptimize(dummy_data_block);
         assert(static_cast<void*>(x) == DummyData);
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(new_nothrow_called == 1);
 
-        delete x;
+        delete dummy_data_block;
         ASSERT_WITH_OPERATOR_NEW_FALLBACKS(delete_called == 1);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,12 @@ int main(int, char**) {`
`51`	`51`	`// Test with an overaligned type`
`52`	`52`	`{`
`53`	`53`	`new_called = delete_called = 0;`
`54`		`- OverAligned* x = DoNotOptimize(new OverAligned[3]);`
	`54`	`+ OverAligned* dummy_data_block = new OverAligned[3];`
	`55`	`+ OverAligned* x = DoNotOptimize(dummy_data_block);`
`55`	`56`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(static_cast<void*>(x) == DummyData);`
`56`	`57`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(new_called == 1);`
`57`	`58`
`58`		`- delete[] x;`
	`59`	`+ delete[] dummy_data_block;`
`59`	`60`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(delete_called == 1);`
`60`	`61`	`}`
`61`	`62`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,12 @@ int main(int, char**) {`
`48`	`48`	`// Test with an overaligned type`
`49`	`49`	`{`
`50`	`50`	`new_called = delete_called = 0;`
`51`		`- OverAligned* x = new OverAligned[3];`
	`51`	`+ OverAligned* dummy_data_block = new OverAligned[3];`
	`52`	`+ OverAligned* x = DoNotOptimize(dummy_data_block);`
`52`	`53`	`assert(static_cast<void*>(x) == DummyData);`
`53`	`54`	`assert(new_called == 1);`
`54`	`55`
`55`		`- delete[] x;`
	`56`	`+ delete[] dummy_data_block;`
`56`	`57`	`assert(delete_called == 1);`
`57`	`58`	`}`
`58`	`59`
Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,12 @@ int main(int, char**) {`
`55`	`55`	`// Test with an overaligned type`
`56`	`56`	`{`
`57`	`57`	`new_called = delete_called = 0;`
`58`		`- OverAligned* x = DoNotOptimize(new (std::nothrow) OverAligned[3]);`
	`58`	`+ OverAligned* dummy_data_block = new (std::nothrow) OverAligned[3];`
	`59`	`+ OverAligned* x = DoNotOptimize(dummy_data_block);`
`59`	`60`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(static_cast<void*>(x) == DummyData);`
`60`	`61`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(new_called == 1);`
`61`	`62`
`62`		`- delete[] x;`
	`63`	`+ delete[] dummy_data_block;`
`63`	`64`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(delete_called == 1);`
`64`	`65`	`}`
`65`	`66`
Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,12 @@ int main(int, char**) {`
`54`	`54`	`// Test with an overaligned type`
`55`	`55`	`{`
`56`	`56`	`new_called = delete_called = 0;`
`57`		`- OverAligned* x = DoNotOptimize(new (std::nothrow) OverAligned);`
	`57`	`+ OverAligned* dummy_data_block = new (std::nothrow) OverAligned;`
	`58`	`+ OverAligned* x = DoNotOptimize(dummy_data_block);`
`58`	`59`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(static_cast<void*>(x) == DummyData);`
`59`	`60`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(new_called == 1);`
`60`	`61`
`61`		`- delete x;`
	`62`	`+ delete dummy_data_block;`
`62`	`63`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(delete_called == 1);`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,12 @@ int main(int, char**) {`
`47`	`47`	`// Test with an overaligned type`
`48`	`48`	`{`
`49`	`49`	`new_nothrow_called = delete_called = 0;`
`50`		`- OverAligned* x = new (std::nothrow) OverAligned;`
	`50`	`+ OverAligned* dummy_data_block = new (std::nothrow) OverAligned;`
	`51`	`+ OverAligned* x = DoNotOptimize(dummy_data_block);`
`51`	`52`	`assert(static_cast<void*>(x) == DummyData);`
`52`	`53`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(new_nothrow_called == 1);`
`53`	`54`
`54`		`- delete x;`
	`55`	`+ delete dummy_data_block;`
`55`	`56`	`ASSERT_WITH_OPERATOR_NEW_FALLBACKS(delete_called == 1);`
`56`	`57`	`}`
`57`	`58`