Workaround for clang bug http://llvm.org/PR28348.
Permits rolling chromium further.
BUG=
TBR=tommi@webrtc.org
Review URL: https://codereview.webrtc.org/2110043003 .
Cr-Original-Commit-Position: refs/heads/master@{#13330}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: f516585e10b8a20f16c26b6e593745d0bb04a6cc
diff --git a/media/base/videoframe_unittest.h b/media/base/videoframe_unittest.h
index f19d032..06afd0e 100644
--- a/media/base/videoframe_unittest.h
+++ b/media/base/videoframe_unittest.h
@@ -1216,7 +1216,10 @@
EXPECT_FALSE(expected_result); // NULL is okay if failure was expected.
return;
}
- data_ptr += kPadToHeapSized + (-(static_cast<int>(data_size)) & 4095);
+ // TODO(pbos): Remove kPad once http://llvm.org/PR28348 is fixed and the fix
+ // is rolled in.
+ volatile const int kPad = 4095;
+ data_ptr += kPadToHeapSized + (-(static_cast<int>(data_size)) & kPad);
memcpy(data_ptr, sample, std::min(data_size, sample_size));
for (int i = 0; i < repeat_; ++i) {
EXPECT_EQ(expected_result, frame.Validate(fourcc, kWidth, kHeight,
