Title: [266774] trunk/Tools
Revision
266774
Author
[email protected]
Date
2020-09-08 21:37:26 -0700 (Tue, 08 Sep 2020)

Log Message

[WinCairo] TestWTF.WTF.UniqueRef is crashing in Debug builds
https://bugs.webkit.org/show_bug.cgi?id=216303

Reviewed by Ryosuke Niwa.

The class A of UniqueRef.cpp and CompactUniquePtrTuple.cpp are
conflicting. CRT heap threw an exception due to allocator
mismatching while deleting class A object.

* TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: Added a new namespace CompactUniquePtrTupleTest.
* TestWebKitAPI/Tests/WTF/UniqueRef.cpp: Added a new namespace UniqueRefTest.
(TestWebKitAPI::function): Deleted an unused function.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (266773 => 266774)


--- trunk/Tools/ChangeLog	2020-09-09 04:32:31 UTC (rev 266773)
+++ trunk/Tools/ChangeLog	2020-09-09 04:37:26 UTC (rev 266774)
@@ -1,3 +1,18 @@
+2020-09-08  Fujii Hironori  <[email protected]>
+
+        [WinCairo] TestWTF.WTF.UniqueRef is crashing in Debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=216303
+
+        Reviewed by Ryosuke Niwa.
+
+        The class A of UniqueRef.cpp and CompactUniquePtrTuple.cpp are
+        conflicting. CRT heap threw an exception due to allocator
+        mismatching while deleting class A object.
+
+        * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: Added a new namespace CompactUniquePtrTupleTest.
+        * TestWebKitAPI/Tests/WTF/UniqueRef.cpp: Added a new namespace UniqueRefTest.
+        (TestWebKitAPI::function): Deleted an unused function.
+
 2020-09-08  Jonathan Bedard  <[email protected]>
 
         [webkitcorepy] Register another package in the WebKit repository (Follow-up fix)

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp (266773 => 266774)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp	2020-09-09 04:32:31 UTC (rev 266773)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp	2020-09-09 04:37:26 UTC (rev 266774)
@@ -33,6 +33,8 @@
 
 namespace TestWebKitAPI {
 
+namespace CompactUniquePtrTupleTest {
+
 class A {
     WTF_MAKE_FAST_ALLOCATED;
 
@@ -47,6 +49,10 @@
 unsigned A::s_constructorCallCount = 0;
 unsigned A::s_destructorCallCount = 0;
 
+} // namespace CompactUniquePtrTupleTest
+
+using namespace CompactUniquePtrTupleTest;
+
 TEST(WTF_CompactUniquePtrTuple, Basic)
 {
     A::s_constructorCallCount = 0;

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/UniqueRef.cpp (266773 => 266774)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/UniqueRef.cpp	2020-09-09 04:32:31 UTC (rev 266773)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/UniqueRef.cpp	2020-09-09 04:37:26 UTC (rev 266774)
@@ -29,7 +29,9 @@
 #include <wtf/Vector.h>
 
 namespace TestWebKitAPI {
-    
+
+namespace UniqueRefTest {
+
 class A {
     WTF_MAKE_FAST_ALLOCATED;
 };
@@ -55,14 +57,10 @@
 };
 class D : public A { };
 
-void function(const UniqueRef<A> a)
-{
-    const A& b = a.get();
-    const A* c = &a;
-    UNUSED_PARAM(b);
-    UNUSED_PARAM(c);
-}
+} // namespace UniqueRefTest
 
+using namespace UniqueRefTest;
+
 TEST(WTF, UniqueRef)
 {
     UniqueRef<A> a = makeUniqueRef<A>();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to