Title: [246128] trunk/Source/WebCore
- Revision
- 246128
- Author
- [email protected]
- Date
- 2019-06-05 14:28:01 -0700 (Wed, 05 Jun 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (246127 => 246128)
--- trunk/Source/WebCore/ChangeLog 2019-06-05 21:24:45 UTC (rev 246127)
+++ trunk/Source/WebCore/ChangeLog 2019-06-05 21:28:01 UTC (rev 246128)
@@ -1,3 +1,13 @@
+2019-06-05 Saam Barati <[email protected]>
+
+ 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 <[email protected]>
Progress towards resurrecting Mac CMake build
Modified: trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLCheckDuplicateFunctions.cpp (246127 => 246128)
--- trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLCheckDuplicateFunctions.cpp 2019-06-05 21:24:45 UTC (rev 246127)
+++ trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLCheckDuplicateFunctions.cpp 2019-06-05 21:28:01 UTC (rev 246128)
@@ -160,13 +160,15 @@
}
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()));
}
return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
