generic-library/breakpad
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix regression on x86 for "Fix compile error with Windows clang"

Browse Source 
R=thakis@chromium.org

Review URL: https://codereview.chromium.org/1318013002 .
This commit is contained in:
Will Harris 2015-09-03 16:38:57 -07:00
parent 2ad6028981
commit 5f520807ca
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/windows/pdb_source_line_writer.cc
View File

@ -277,10 +277,10 @@ bool PDBSourceLineWriter::PrintFunction(IDiaSymbol *function,
AddressRangeVector ranges; AddressRangeVector ranges;
MapAddressRange(image_map_, AddressRange(rva, static_cast<DWORD>(length)), MapAddressRange(image_map_, AddressRange(rva, static_cast<DWORD>(length)),
&ranges); &ranges);
wstring wname(name);
for (size_t i = 0; i < ranges.size(); ++i) { for (size_t i = 0; i < ranges.size(); ++i) {
fprintf(output_, "FUNC %x %x %x %ws\n", fprintf(output_, "FUNC %x %x %x %ws\n",
ranges[i].rva, ranges[i].length, stack_param_size, wname.c_str()); ranges[i].rva, ranges[i].length, stack_param_size,
name.m_str);
} }
CComPtr<IDiaEnumLineNumbers> lines; CComPtr<IDiaEnumLineNumbers> lines;
@ -629,7 +629,6 @@ bool PDBSourceLineWriter::PrintFrameDataUsingPDB() {
} }
} }
wstring wprogram_string(program_string);
for (size_t i = 0; i < frame_infos.size(); ++i) { for (size_t i = 0; i < frame_infos.size(); ++i) {
const FrameInfo& fi(frame_infos[i]); const FrameInfo& fi(frame_infos[i]);
fprintf(output_, "STACK WIN %x %x %x %x %x %x %x %x %x %d ", fprintf(output_, "STACK WIN %x %x %x %x %x %x %x %x %x %d ",
@ -637,7 +636,7 @@ bool PDBSourceLineWriter::PrintFrameDataUsingPDB() {
0 /* epilog_size */, parameter_size, saved_register_size, 0 /* epilog_size */, parameter_size, saved_register_size,
local_size, max_stack_size, program_string_result == S_OK); local_size, max_stack_size, program_string_result == S_OK);
if (program_string_result == S_OK) { if (program_string_result == S_OK) {
fprintf(output_, "%ws\n", wprogram_string.c_str()); fprintf(output_, "%ws\n", program_string.m_str);
} else { } else {
fprintf(output_, "%d\n", allocates_base_pointer); fprintf(output_, "%d\n", allocates_base_pointer);
} }
@ -821,9 +820,9 @@ bool PDBSourceLineWriter::PrintCodePublicSymbol(IDiaSymbol *symbol) {
AddressRangeVector ranges; AddressRangeVector ranges;
MapAddressRange(image_map_, AddressRange(rva, 1), &ranges); MapAddressRange(image_map_, AddressRange(rva, 1), &ranges);
for (size_t i = 0; i < ranges.size(); ++i) { for (size_t i = 0; i < ranges.size(); ++i) {
wstring wname(name);
fprintf(output_, "PUBLIC %x %x %ws\n", ranges[i].rva, fprintf(output_, "PUBLIC %x %x %ws\n", ranges[i].rva,
stack_param_size > 0 ? stack_param_size : 0, wname.c_str()); stack_param_size > 0 ? stack_param_size : 0,
name.m_str);
} }
return true; return true;
} }