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

crashpad_util_test warning fixes for clang-cl, 64-bit edition.

Browse Source 
This upstreams https://chromium-review.googlesource.com/c/chromium/src/+/738402

Bug: chromium:777924
Change-Id: Ib3c8f4f77631da45a2911029e8925c1afad1c244
Reviewed-on: https://chromium-review.googlesource.com/738553
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Nico Weber 2017-10-25 16:29:38 -04:00 committed by Commit Bot
parent 52d766400d
commit 9bc5989125
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
util/win/capture_context_test.cc
View File

@ -44,8 +44,8 @@ void SanityCheckContext(const CONTEXT& context) {
ASSERT_EQ(context.ContextFlags & ~(must_have | may_have), 0u);
#elif defined(ARCH_CPU_X86_64)
ASSERT_EQ(context.ContextFlags,
CONTEXT_AMD64 | CONTEXT_CONTROL | CONTEXT_INTEGER |
CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT);
static_cast<DWORD>(CONTEXT_AMD64 | CONTEXT_CONTROL |
CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT));
#endif
#if defined(ARCH_CPU_X86_FAMILY)
@ -87,23 +87,23 @@ void SanityCheckContext(const CONTEXT& context) {
}
// CaptureContext() doesn’t use these fields.
EXPECT_EQ(context.P1Home, 0);
EXPECT_EQ(context.P2Home, 0);
EXPECT_EQ(context.P3Home, 0);
EXPECT_EQ(context.P4Home, 0);
EXPECT_EQ(context.P5Home, 0);
EXPECT_EQ(context.P6Home, 0);
EXPECT_EQ(context.P1Home, 0u);
EXPECT_EQ(context.P2Home, 0u);
EXPECT_EQ(context.P3Home, 0u);
EXPECT_EQ(context.P4Home, 0u);
EXPECT_EQ(context.P5Home, 0u);
EXPECT_EQ(context.P6Home, 0u);
for (size_t i = 0; i < arraysize(context.VectorRegister); ++i) {
SCOPED_TRACE(i);
EXPECT_EQ(context.VectorRegister[i].Low, 0);
EXPECT_EQ(context.VectorRegister[i].High, 0);
EXPECT_EQ(context.VectorRegister[i].Low, 0u);
EXPECT_EQ(context.VectorRegister[i].High, 0u);
}
EXPECT_EQ(context.VectorControl, 0);
EXPECT_EQ(context.DebugControl, 0);
EXPECT_EQ(context.LastBranchToRip, 0);
EXPECT_EQ(context.LastBranchFromRip, 0);
EXPECT_EQ(context.LastExceptionToRip, 0);
EXPECT_EQ(context.LastExceptionFromRip, 0);
EXPECT_EQ(context.VectorControl, 0u);
EXPECT_EQ(context.DebugControl, 0u);
EXPECT_EQ(context.LastBranchToRip, 0u);
EXPECT_EQ(context.LastBranchFromRip, 0u);
EXPECT_EQ(context.LastExceptionToRip, 0u);
EXPECT_EQ(context.LastExceptionFromRip, 0u);
#endif
}

2
util/win/process_info_test.cc
View File

@ -44,6 +44,7 @@ namespace {
constexpr wchar_t kNtdllName[] = L"\\ntdll.dll";
#if !defined(ARCH_CPU_64_BITS)
bool IsProcessWow64(HANDLE process_handle) {
static const auto is_wow64_process =
GET_FUNCTION(L"kernel32.dll", ::IsWow64Process);
@ -56,6 +57,7 @@ bool IsProcessWow64(HANDLE process_handle) {
}
return !!is_wow64;
}
#endif
void VerifyAddressInInCodePage(const ProcessInfo& process_info,
WinVMAddress code_address) {