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

common/windows/pdb_source_line_writer.cc

 // Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 259 matching lines @@
 
   // If the decorated name didn't give the parameter size, try to
   // calculate it.
   if (stack_param_size < 0) {
     stack_param_size = GetFunctionStackParamSize(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;
   if (FAILED(session_->findLinesByRVA(rva, DWORD(length), &lines))) {
     return false;
   }
 
   if (!PrintLines(lines)) {
     return false;
   }
@@ skipping 328 matching lines @@
                            prolog_ranges[i].length,
                            prolog_ranges[i].length };
           frame_infos.push_back(fi);
         }
         for (size_t i = 0; i < code_ranges.size(); ++i) {
           FrameInfo fi = { code_ranges[i].rva, code_ranges[i].length, 0 };
           frame_infos.push_back(fi);
         }
       }
 
-      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 ",
                 type, fi.rva, fi.code_size, fi.prolog_size,
                 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);
         }
       }
 
       last_type = type;
       last_rva = rva;
       last_code_size = code_size;
       last_prolog_size = prolog_size;
     }
@@ skipping 163 matching lines @@
 
   CComBSTR name;
   int stack_param_size;
   if (!GetSymbolFunctionName(symbol, &name, &stack_param_size)) {
     return false;
   }
 
   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;
 }
 
 bool PDBSourceLineWriter::PrintPDBInfo() {
   PDBModuleInfo info;
   if (!GetModuleInfo(&info)) {
     return false;
   }
 
@@ skipping 482 matching lines @@
   // an old-style CodeView record if a real 128-bit GUID has its first 32
   // bits set the same as the module's signature (timestamp) and the rest of
   // the GUID is set to 0.  This is highly unlikely.
 
   GUID signature_guid = {signature};  // 0-initializes other members
   *uses_guid = !IsEqualGUID(guid, signature_guid);
   return true;
 }
 
 }  // namespace google_breakpad