diff options
| author | leng@chromium.org <leng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 14:13:43 +0000 |
|---|---|---|
| committer | leng@chromium.org <leng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 14:13:43 +0000 |
| commit | e22cb252381dc82d95e02b4f2d214ec5e79b0ec7 (patch) | |
| tree | e5be2b93075a1e6f29851d3a4f473d37030944ff /base/memory | |
| parent | 2f707777d92a81cc7c7c2a16b8e88bfc09d5aa20 (diff) | |
| download | chromium_src-e22cb252381dc82d95e02b4f2d214ec5e79b0ec7.zip chromium_src-e22cb252381dc82d95e02b4f2d214ec5e79b0ec7.tar.gz chromium_src-e22cb252381dc82d95e02b4f2d214ec5e79b0ec7.tar.bz2 | |
Enable aligned_memory_unittest.cc on iOS.
One case of the StackAlignment test is #defined out for iOS on ARM (not simulator), due to a clang armv7 codegen bug. A crbug has been created to re-enable these cases when the clang bug is fixed.
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10785019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/memory')
| -rw-r--r-- | base/memory/aligned_memory_unittest.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/base/memory/aligned_memory_unittest.cc b/base/memory/aligned_memory_unittest.cc index 065e952..8c1eb61 100644 --- a/base/memory/aligned_memory_unittest.cc +++ b/base/memory/aligned_memory_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -34,17 +34,21 @@ TEST(AlignedMemoryTest, StackAlignment) { AlignedMemory<8, 8> raw8; AlignedMemory<8, 16> raw16; AlignedMemory<8, 256> raw256; - AlignedMemory<8, 4096> raw4096; EXPECT_EQ(8u, ALIGNOF(raw8)); EXPECT_EQ(16u, ALIGNOF(raw16)); EXPECT_EQ(256u, ALIGNOF(raw256)); - EXPECT_EQ(4096u, ALIGNOF(raw4096)); EXPECT_ALIGNED(raw8.void_data(), 8); EXPECT_ALIGNED(raw16.void_data(), 16); EXPECT_ALIGNED(raw256.void_data(), 256); + + // TODO(ios): This test hits an armv7 bug in clang. crbug.com/138066 +#if !(defined(OS_IOS) && defined(ARCH_CPU_ARM_FAMILY)) + AlignedMemory<8, 4096> raw4096; + EXPECT_EQ(4096u, ALIGNOF(raw4096)); EXPECT_ALIGNED(raw4096.void_data(), 4096); +#endif // !(defined(OS_IOS) && defined(ARCH_CPU_ARM_FAMILY)) } } // namespace |