From 9ef678502793efcd593119a3996829a97bd3c616 Mon Sep 17 00:00:00 2001 From: pbos Date: Thu, 30 Jun 2016 02:32:32 -0700 Subject: [PATCH] Revert of Workaround for clang bug http://llvm.org/PR28348. (patchset #1 id:1 of https://codereview.webrtc.org/2110043003/ ) Reason for revert: Not needed since https://codereview.chromium.org/2110873002/. Original issue's description: > Workaround for clang bug http://llvm.org/PR28348. > > Permits rolling chromium further. > > BUG= > TBR=tommi@webrtc.org > > Committed: https://chromium.googlesource.com/external/webrtc/+/f516585e10b8a20f16c26b6e593745d0bb04a6cc TBR=tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review-Url: https://codereview.webrtc.org/2106383002 Cr-Commit-Position: refs/heads/master@{#13344} --- webrtc/media/base/videoframe_unittest.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/webrtc/media/base/videoframe_unittest.h b/webrtc/media/base/videoframe_unittest.h index 06afd0eb4c..f19d0325d6 100644 --- a/webrtc/media/base/videoframe_unittest.h +++ b/webrtc/media/base/videoframe_unittest.h @@ -1216,10 +1216,7 @@ class VideoFrameTest : public testing::Test { EXPECT_FALSE(expected_result); // NULL is okay if failure was expected. return; } - // 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(data_size)) & kPad); + data_ptr += kPadToHeapSized + (-(static_cast(data_size)) & 4095); 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,