From 5f520807ca93f0d95a1e72864f574f4ec19f6188 Mon Sep 17 00:00:00 2001 From: Will Harris Date: Thu, 3 Sep 2015 16:38:57 -0700 Subject: [PATCH] Fix regression on x86 for "Fix compile error with Windows clang" R=thakis@chromium.org Review URL: https://codereview.chromium.org/1318013002 . --- src/common/windows/pdb_source_line_writer.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/common/windows/pdb_source_line_writer.cc b/src/common/windows/pdb_source_line_writer.cc index 62285ff5..3c3401d2 100644 --- a/src/common/windows/pdb_source_line_writer.cc +++ b/src/common/windows/pdb_source_line_writer.cc @@ -277,10 +277,10 @@ bool PDBSourceLineWriter::PrintFunction(IDiaSymbol *function, AddressRangeVector ranges; MapAddressRange(image_map_, AddressRange(rva, static_cast(length)), &ranges); - wstring wname(name); for (size_t i = 0; i < ranges.size(); ++i) { 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 lines; @@ -629,7 +629,6 @@ bool PDBSourceLineWriter::PrintFrameDataUsingPDB() { } } - wstring wprogram_string(program_string); for (size_t i = 0; i < frame_infos.size(); ++i) { const FrameInfo& fi(frame_infos[i]); 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, local_size, max_stack_size, 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 { fprintf(output_, "%d\n", allocates_base_pointer); } @@ -821,9 +820,9 @@ bool PDBSourceLineWriter::PrintCodePublicSymbol(IDiaSymbol *symbol) { AddressRangeVector ranges; MapAddressRange(image_map_, AddressRange(rva, 1), &ranges); for (size_t i = 0; i < ranges.size(); ++i) { - wstring wname(name); 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; }