base/profiler/stack_sampling_profiler_unittest.cc - Issue 1325653003: Type change in StackSamplingProfiler from void* to uintptr_t.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/profiler/stack_sampling_profiler_unittest.cc

Issue 1325653003: Type change in StackSamplingProfiler from void* to uintptr_t. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@UMA2_refactor

Patch Set: Nits and compiles. Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« base/profiler/stack_sampling_profiler.cc ('K') | « base/profiler/stack_sampling_profiler.cc ('k') | components/metrics/call_stack_profile_metrics_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/profiler/stack_sampling_profiler_unittest.cc

diff --git a/base/profiler/stack_sampling_profiler_unittest.cc b/base/profiler/stack_sampling_profiler_unittest.cc

index d57a151f5e990e6cd94f319a57f1acc91b9b26f8..ad0212c6fa7e4df6ecd2fc2731ec6e08cfd2695a 100644

--- a/base/profiler/stack_sampling_profiler_unittest.cc

+++ b/base/profiler/stack_sampling_profiler_unittest.cc

@@ -183,8 +183,9 @@ Sample::const_iterator FindFirstFrameWithinFunction(

int function_size) {

function_address = MaybeFixupFunctionAddressForILT(function_address);

for (auto it = sample.begin(); it != sample.end(); ++it) {

- if ((it->instruction_pointer >= function_address) &&

- (it->instruction_pointer <

+ if ((reinterpret_cast<const void*>(it->instruction_pointer) >=

+ function_address) &&

+ (reinterpret_cast<const void*>(it->instruction_pointer) <

(static_cast<const unsigned char*>(function_address) + function_size)))

return it;

}

@@ -198,7 +199,7 @@ std::string FormatSampleForDiagnosticOutput(

std::string output;

for (const Frame& frame: sample) {

output += StringPrintf(

- "0x%p %s\n", frame.instruction_pointer,

+ "0x%p %s\n", reinterpret_cast<const void*>(frame.instruction_pointer),

modules[frame.module_index].filename.AsUTF8Unsafe().c_str());

}

return output;