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

common/windows/pdb_source_line_writer.cc

Index: common/windows/pdb_source_line_writer.cc
diff --git a/common/windows/pdb_source_line_writer.cc b/common/windows/pdb_source_line_writer.cc
index 62285ff5f92a69a7893caa3eb48ac5a2b8f355bc..745631629c2bf44ea59edf775cefca809ae8e310 100644
--- a/common/windows/pdb_source_line_writer.cc
+++ b/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<DWORD>(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,
+            static_cast<wchar_t*>(name));

[Nico, 2015/08/27 04:34:27]

Does just saying name.m_bstr work here? It looks like that should be a WCHAR*
already, after looking at CComBSTR

[Yoshisato Yanagisawa, 2015/08/27 05:55:57]

thanks let me know it.
It seems work.  I thought it BSTR type, but with your comement I noticed BSTR
type is typedef of WCHAR*.

   }
 
   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) {
         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", static_cast<wchar_t *>(program_string));
         } 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,
+            static_cast<wchar_t *>(name));
   }
   return true;
 }