3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use recently imported MSVC warning macros

Browse Source 
The PUSH/POP are less noisy for sure. SUPPRESS is a little more
subtle -- it's correctly documented as "for this line and the next"
but that doesn't work well with our coding style.

R=mark@chromium.org
BUG=crashpad:1

Review URL: https://codereview.chromium.org/898133002
This commit is contained in:
Scott Graham 2015-02-05 11:30:29 -08:00
parent 878400947f
commit 22c82f0c6c
4 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
minidump/minidump_context_writer.cc
View File

@ -16,6 +16,7 @@
#include <string.h>
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "snapshot/cpu_context.h"
#include "util/file/file_writer.h"
@ -39,16 +40,10 @@ scoped_ptr<MinidumpContextWriter> MinidumpContextWriter::CreateFromSnapshot(
}
case kCPUArchitectureX86_64: {
#if defined(COMPILER_MSVC) && defined(ARCH_CPU_X86)
#pragma warning(push)
#pragma warning(disable: 4316) // Object allocated on the heap may not be 16
// byte aligned.
#endif
MSVC_PUSH_DISABLE_WARNING(4316); // Object on heap may not be aligned.
MinidumpContextAMD64Writer* context_amd64 =
new MinidumpContextAMD64Writer();
#if defined(COMPILER_MSVC) && defined(ARCH_CPU_X86)
#pragma warning(pop)
#endif
MSVC_POP_WARNING(); // C4316
context.reset(context_amd64);
context_amd64->InitializeFromSnapshot(context_snapshot->x86_64);
break;

9
minidump/minidump_extensions.h
View File

@ -24,15 +24,12 @@
#include "build/build_config.h"
#include "util/misc/uuid.h"
#if defined(COMPILER_MSVC)
// C4200 is "nonstandard extension used : zero-sized array in struct/union".
// We would like to globally disable this warning, but unfortunately, the
// compiler is buggy and only supports disabling it with a pragma, so we can't
// disable it with other silly warnings in build/common.gypi. See:
// https://connect.microsoft.com/VisualStudio/feedback/details/1114440
#pragma warning(push)
#pragma warning(disable: 4200)
#endif // COMPILER_MSVC
MSVC_PUSH_DISABLE_WARNING(4200);
#if defined(COMPILER_MSVC)
#define PACKED
@ -470,9 +467,7 @@ struct ALIGNAS(4) PACKED MinidumpCrashpadInfo {
#endif // COMPILER_MSVC
#undef PACKED
#if defined(COMPILER_MSVC)
#pragma warning(pop) // C4200
#endif // COMPILER_MSVC
MSVC_POP_WARNING(); // C4200
} // namespace crashpad

9
minidump/minidump_file_writer_test.cc
View File

@ -20,6 +20,7 @@
#include <string>
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "gtest/gtest.h"
#include "minidump/minidump_stream_writer.h"
#include "minidump/minidump_writable.h"
@ -287,15 +288,9 @@ TEST(MinidumpFileWriter, InitializeFromSnapshot_Basic) {
TEST(MinidumpFileWriter, InitializeFromSnapshot_Exception) {
// In a 32-bit environment, this will give a “timestamp out of range” warning,
// but the test should complete without failure.
#if defined(OS_WIN) && defined(ARCH_CPU_X86)
#pragma warning(push)
#pragma warning(disable: 4309) // Truncation of constant value.
#endif // OS_WIN && ARCH_CPU_X86
const uint32_t kSnapshotTime = 0xfd469ab8;
MSVC_SUPPRESS_WARNING(4309); // Truncation of constant value.
const timeval kSnapshotTimeval = { static_cast<time_t>(kSnapshotTime), 0 };
#if defined(OS_WIN) && defined(ARCH_CPU_X86)
#pragma warning(pop)
#endif // OS_WIN && ARCH_CPU_X86
TestProcessSnapshot process_snapshot;
process_snapshot.SetSnapshotTime(kSnapshotTimeval);

3
minidump/minidump_thread_writer_test.cc
View File

@ -18,6 +18,7 @@
#include <dbghelp.h>
#include <sys/types.h>
#include "base/compiler_specific.h"
#include "base/strings/stringprintf.h"
#include "gtest/gtest.h"
#include "minidump/minidump_context_writer.h"
@ -219,7 +220,7 @@ TEST(MinidumpThreadWriter, OneThread_AMD64_Stack) {
new TestMinidumpMemoryWriter(kMemoryBase, kMemorySize, kMemoryValue));
thread_writer->SetStack(memory_writer.Pass());
MSVC_SUPPRESS_WARNING(4316) // Object allocated on heap may not be aligned.
MSVC_SUPPRESS_WARNING(4316); // Object allocated on heap may not be aligned.
auto context_amd64_writer = make_scoped_ptr(new MinidumpContextAMD64Writer());
InitializeMinidumpContextAMD64(context_amd64_writer->context(), kSeed);
thread_writer->SetContext(context_amd64_writer.Pass());