Changeset 246128 in webkit

Timestamp:

Jun 5, 2019, 2:28:01 PM (7 years ago)

Author:

sbarati@apple.com

Message:

Unreviewed. Follow up fix after r246115.
I changed the code to assert that we don't have duplicate native
functions. It turns out we do. I will fix that here, then add
back the assert. ​https://bugs.webkit.org/show_bug.cgi?id=198580

• Modules/webgpu/WHLSL/WHLSLCheckDuplicateFunctions.cpp:

(WebCore::WHLSL::checkDuplicateFunctions):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webgpu/WHLSL/WHLSLCheckDuplicateFunctions.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-05  Saam Barati  <sbarati@apple.com>
+
+        Unreviewed. Follow up fix after r246115.
+        I changed the code to assert that we don't have duplicate native
+        functions. It turns out we do. I will fix that here, then add
+        back the assert. https://bugs.webkit.org/show_bug.cgi?id=198580
+
+        * Modules/webgpu/WHLSL/WHLSLCheckDuplicateFunctions.cpp:
+        (WebCore::WHLSL::checkDuplicateFunctions):
+
 2019-06-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLCheckDuplicateFunctions.cpp

@@ -161 +161 @@
 
     for (auto& nativeFunctionDeclaration : program.nativeFunctionDeclarations()) {
-        // Native function declarations are never equal to each other. So we don't need
-        // to add them to the set, because they can't collide with each other. Instead, we
-        // just check that no user-defined function is a duplicate.
+        // We generate duplicate native function declarations in synthesize constructors.
+        // FIXME: is this right?
+        // https://bugs.webkit.org/show_bug.cgi?id=198580
+        //
+        // Since we do that, we just need to make sure no native function is a duplicate
+        // of a user-defined function.
         ASSERT(passesStaticChecks(nativeFunctionDeclaration.get()));
         if (functions.contains(DuplicateFunctionKey { nativeFunctionDeclaration.get() }))
             return false;
-        ASSERT(add(nativeFunctionDeclaration.get()));
     }