Focus -Wno-over-aligned to just 32-bit x86 Android. (2)

I've even found the code that's making this happen, just don't know why.
I've added a test to assert that it's safe to assume malloc() is 8-byte aligned.

Test should compile this time.

CQ_INCLUDE_TRYBOTS=master.client.skia.android:Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android-Trybot

Change-Id: I48714b99670c20704adf4f7f216da0d60d7d9bcd
Reviewed-on: https://skia-review.googlesource.com/2662
Reviewed-on: https://skia-review.googlesource.com/2703
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Mike Klein 2016-09-27 07:41:45 -04:00 committed by Skia Commit-Bot
parent 75d6ffbc74
commit 7bfc08b9fb
2 changed files with 27 additions and 2 deletions

View File

@ -83,8 +83,11 @@ config("default") {
"-Wno-unknown-warning-option", # Let older Clangs ignore newer Clangs' warnings.
]
# High priority to fix!
cflags += [ "-Wno-over-aligned" ]
if (is_android && target_cpu == "x86") {
# Clang seems to think new/malloc will only be 4-byte aligned on x86 Android.
# We're pretty sure it's actually 8-byte alignment.
cflags += [ "-Wno-over-aligned" ]
}
cflags += [
"-Wno-cast-align",

22
tests/OverAlignedTest.cpp Normal file
View File

@ -0,0 +1,22 @@
/*
* Copyright 2016 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "Test.h"
#include "SkRandom.h"
// Clang seems to think only 32-bit alignment is guaranteed on 32-bit x86 Android.
// See https://reviews.llvm.org/D8357
// This is why we have disabled -Wover-aligned there (we allocate 8-byte aligned structs in Ganesh).
DEF_TEST(OverAligned, r) {
SkRandom rand;
// Let's test that assertion. We think it really should be providing 8-byte alignment.
for (int i = 0; i < 1000; i++) {
void* p = malloc(rand.nextRangeU(0,100));
REPORTER_ASSERT(r, SkIsAlign8((uintptr_t)p));
free(p);
}
}