Changeset 256491 in webkit

Timestamp:

Feb 12, 2020 4:31:41 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Multiple GCC 10 build failures in ANGLE
​https://bugs.webkit.org/show_bug.cgi?id=207365

Patch by Michael Catanzaro <Michael Catanzaro> on 2020-02-12
Reviewed by Carlos Alberto Lopez Perez.

• changes.diff: Updated.
• include/platform/Platform.h: Add missing #include to get size_t.
• src/common/PackedEnums.h: Remove problematic const_casts.

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• changes.diff (modified) (1 diff)
• include/platform/Platform.h (modified) (1 diff)
• src/common/PackedEnums.h (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2020-02-12  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        Multiple GCC 10 build failures in ANGLE
+        https://bugs.webkit.org/show_bug.cgi?id=207365
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * changes.diff: Updated.
+        * include/platform/Platform.h: Add missing #include to get size_t.
+        * src/common/PackedEnums.h: Remove problematic const_casts.
+
 2020-02-12  Dean Jackson  <dino@apple.com>
 

trunk/Source/ThirdParty/ANGLE/changes.diff

@@ -9909 +9909 @@
 -212a9ef90e21a98ff57ca301a60c84cbeca7be28
 \ No newline at end of file
+diff --git a/include/platform/Platform.h b/include/platform/Platform.h
+index b603ff9bad2..f4ec4f8837c 100644
+--- a/include/platform/Platform.h
++++ b/include/platform/Platform.h
+@@ -9,6 +9,7 @@
+ #ifndef ANGLE_PLATFORM_H
+ #define ANGLE_PLATFORM_H
+ 
++#include <stdlib.h>
+ #include <stdint.h>
+ #include <array>
+ 
+diff --git a/src/common/PackedEnums.h b/src/common/PackedEnums.h
+index bd5fc340dcc..63368e25dfe 100644
+--- a/src/common/PackedEnums.h
++++ b/src/common/PackedEnums.h
+@@ -83,10 +83,7 @@ class PackedEnumMap
+         // We use a for loop instead of range-for to work around a limitation in MSVC.
+         for (const InitPair *it = init.begin(); it != init.end(); ++it)
+         {
+-            // This horrible const_cast pattern is necessary to work around a constexpr limitation.
+-            // See https://stackoverflow.com/q/34199774/ . Note that it should be fixed with C++17.
+-            const_cast<T &>(const_cast<const Storage &>(
+-                mPrivateData)[static_cast<UnderlyingType>(it->first)]) = it->second;
++            mPrivateData[static_cast<UnderlyingType>(it->first)] = it->second;
+         }
+     }
+ 

trunk/Source/ThirdParty/ANGLE/include/platform/Platform.h

@@ -10 +10 @@
 #define ANGLE_PLATFORM_H
 
+#include <stdlib.h>
 #include <stdint.h>
 #include <array>

trunk/Source/ThirdParty/ANGLE/src/common/PackedEnums.h

@@ -84 +84 @@
         for (const InitPair *it = init.begin(); it != init.end(); ++it)
         {
-            // This horrible const_cast pattern is necessary to work around a constexpr limitation.
-            // See https://stackoverflow.com/q/34199774/ . Note that it should be fixed with C++17.
-            const_cast<T &>(const_cast<const Storage &>(
-                mPrivateData)[static_cast<UnderlyingType>(it->first)]) = it->second;
+            mPrivateData[static_cast<UnderlyingType>(it->first)] = it->second;
         }
     }