Title: [196938] trunk/Source/bmalloc
Revision
196938
Author
[email protected]
Date
2016-02-22 09:34:37 -0800 (Mon, 22 Feb 2016)

Log Message

Fixed compilation of bmalloc with GCC 4.8 after r196873.
https://bugs.webkit.org/show_bug.cgi?id=154534

Patch by Konstantin Tokarev <[email protected]> on 2016-02-22
Reviewed by Mark Lam.

See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55382.

* bmalloc/LargeChunk.h:
* bmalloc/SmallChunk.h:

Modified Paths

Diff

Modified: trunk/Source/bmalloc/ChangeLog (196937 => 196938)


--- trunk/Source/bmalloc/ChangeLog	2016-02-22 17:03:59 UTC (rev 196937)
+++ trunk/Source/bmalloc/ChangeLog	2016-02-22 17:34:37 UTC (rev 196938)
@@ -1,3 +1,15 @@
+2016-02-22  Konstantin Tokarev  <[email protected]>
+
+        Fixed compilation of bmalloc with GCC 4.8 after r196873.
+        https://bugs.webkit.org/show_bug.cgi?id=154534
+
+        Reviewed by Mark Lam.
+
+        See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55382.
+
+        * bmalloc/LargeChunk.h:
+        * bmalloc/SmallChunk.h:
+
 2016-02-21  Geoffrey Garen  <[email protected]>
 
         bmalloc: Don't use a whole page for metadata

Modified: trunk/Source/bmalloc/bmalloc/LargeChunk.h (196937 => 196938)


--- trunk/Source/bmalloc/bmalloc/LargeChunk.h	2016-02-22 17:03:59 UTC (rev 196937)
+++ trunk/Source/bmalloc/bmalloc/LargeChunk.h	2016-02-22 17:34:37 UTC (rev 196938)
@@ -65,7 +65,7 @@
     // We use the X's for boundary tags and the O's for edge sentinels.
 
     std::array<BoundaryTag, boundaryTagCount> m_boundaryTags;
-    char m_memory[] __attribute__((aligned(largeAlignment)));
+    char m_memory[] __attribute__((aligned(largeAlignment+0)));
 };
 
 static_assert(largeChunkMetadataSize == sizeof(LargeChunk), "Our largeChunkMetadataSize math in Sizes.h is wrong");

Modified: trunk/Source/bmalloc/bmalloc/SmallChunk.h (196937 => 196938)


--- trunk/Source/bmalloc/bmalloc/SmallChunk.h	2016-02-22 17:03:59 UTC (rev 196937)
+++ trunk/Source/bmalloc/bmalloc/SmallChunk.h	2016-02-22 17:34:37 UTC (rev 196938)
@@ -48,7 +48,7 @@
 private:
     std::array<SmallLine, smallChunkSize / smallLineSize> m_lines;
     std::array<SmallPage, smallChunkSize / vmPageSize> m_pages;
-    char m_memory[] __attribute__((aligned(smallLineSize)));
+    char m_memory[] __attribute__((aligned(smallLineSize+0)));
 };
 
 static_assert(!(vmPageSize % smallLineSize), "vmPageSize must be an even multiple of line size");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to