Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed compilation of bmalloc with GCC 4.8 after r196873.
https://bugs.webkit.org/show_bug.cgi?id=154534

Patch by Konstantin Tokarev <annulen@yandex.ru> 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:

Canonical link: https://commits.webkit.org/172645@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196938 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
annulen authored and webkit-commit-queue committed Feb 22, 2016
1 parent cac4f55 commit 76ef29e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
12 changes: 12 additions & 0 deletions Source/bmalloc/ChangeLog
@@ -1,3 +1,15 @@
2016-02-22 Konstantin Tokarev <annulen@yandex.ru>

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 <ggaren@apple.com>

bmalloc: Don't use a whole page for metadata
Expand Down
2 changes: 1 addition & 1 deletion Source/bmalloc/bmalloc/LargeChunk.h
Expand Up @@ -65,7 +65,7 @@ class LargeChunk {
// 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");
Expand Down
2 changes: 1 addition & 1 deletion Source/bmalloc/bmalloc/SmallChunk.h
Expand Up @@ -48,7 +48,7 @@ class SmallChunk {
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");
Expand Down

0 comments on commit 76ef29e

Please sign in to comment.