Add ALIGNAS and ALIGNOF macros to ensure proper alignment of StaticMemorySingletonTraits

base/memory/aligned_memory_unittest.cc

Index: base/memory/aligned_memory_unittest.cc
diff --git a/base/memory/aligned_memory_unittest.cc b/base/memory/aligned_memory_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..130afe5be2f5bd98b305e38303ba80bbd90d37db
--- /dev/null
+++ b/base/memory/aligned_memory_unittest.cc
@@ -0,0 +1,51 @@
+// Copyright (c) 2011 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.
+
+#include "base/memory/aligned_memory.h"
+#include "base/memory/scoped_ptr.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+#define EXPECT_ALIGNED(ptr, align) \
+    EXPECT_EQ(0u, reinterpret_cast<uintptr_t>(ptr) & (align - 1))
+
+namespace {
+
+using base::RawAlignedMemory;
+using base::AlignedMemory;
+
+TEST(AlignedMemoryTest, StaticAlignment) {
+  static RawAlignedMemory<8, 8> raw8;
+  static RawAlignedMemory<8, 16> raw16;
+  static RawAlignedMemory<8, 256> raw256;
+  static RawAlignedMemory<8, 4096> raw4096;
+
+  EXPECT_EQ(ALIGNOF(raw8), 8u);

[willchan no longer on Chromium, 2012/02/23 01:18:41]

You've got the expectations reversed. It should be expected, actual. Please
reverse the arguments everywhere here.

[jbates, 2012/02/23 02:23:53]

Done.

+  EXPECT_EQ(ALIGNOF(raw16), 16u);
+  EXPECT_EQ(ALIGNOF(raw256), 256u);
+  EXPECT_EQ(ALIGNOF(raw4096), 4096u);
+
+  EXPECT_ALIGNED(raw8.void_data(), 8);
+  EXPECT_ALIGNED(raw16.void_data(), 16);
+  EXPECT_ALIGNED(raw256.void_data(), 256);
+  EXPECT_ALIGNED(raw4096.void_data(), 4096);
+}
+
+TEST(AlignedMemoryTest, StackAlignment) {
+  RawAlignedMemory<8, 8> raw8;
+  RawAlignedMemory<8, 16> raw16;
+  RawAlignedMemory<8, 256> raw256;
+  RawAlignedMemory<8, 4096> raw4096;
+
+  EXPECT_EQ(ALIGNOF(raw8), 8u);
+  EXPECT_EQ(ALIGNOF(raw16), 16u);
+  EXPECT_EQ(ALIGNOF(raw256), 256u);
+  EXPECT_EQ(ALIGNOF(raw4096), 4096u);
+
+  EXPECT_ALIGNED(raw8.void_data(), 8);
+  EXPECT_ALIGNED(raw16.void_data(), 16);
+  EXPECT_ALIGNED(raw256.void_data(), 256);
+  EXPECT_ALIGNED(raw4096.void_data(), 4096);
+}
+
+}  // namespace