[sanitizer] Fix sanitizer_common compile errors on gcc trunk

[ro]

Summary

When testing a merge of compiler-rt r304709 into gcc trunk on x86-64-pc-linux-gnu,
I ran into two compile errors:

/vol/gcc/src/hg/trunk/solaris-asan/libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc: In member function 'sanitizer::AddressInfo* sanitizer::{anonymous}::SymbolizeCodeCallbackArg::get_new_frame(uintptr_t)':
/vol/gcc/src/hg/trunk/solaris-asan/libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc:96:73: error: no matching function for call to 'sanitizer::AddressInfo::FillModuleInfo(char*&, sanitizer::uptr&)'

info->FillModuleInfo(first->info.module, first->info.module_offset);
                                                                  ^

In file included from /vol/gcc/src/hg/trunk/solaris-asan/libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc:16:0:
/vol/gcc/src/hg/trunk/solaris-asan/libsanitizer/sanitizer_common/sanitizer_symbolizer.h:45:8: note: candidate: 'void sanitizer::AddressInfo::FillModuleInfo(const char*, sanitizer::uptr, __sanitizer::ModuleArch)'

void FillModuleInfo(const char *mod_name, uptr mod_offset, ModuleArch arch);
     ^~~~~~~~~~~~~~

/vol/gcc/src/hg/trunk/solaris-asan/libsanitizer/sanitizer_common/sanitizer_symbolizer.h:45:8: note: candidate expects 3 arguments, 2 provided

The call to FileModuleInfo hasn't been updated to the new 3-arg form since
sanitizer_symbolizer_libbacktrace.cc is only used inside gcc since
SANITIZER_LIBBACKTRACE is 0 otherwise.

/vol/gcc/src/hg/trunk/solaris-asan/libsanitizer/sanitizer_common/sanitizer_win_weak_interception.cc:13:10: fatal error: sanitizer_common/sanitizer_platform.h: No such file or directory
#include "sanitizer_common/sanitizer_platform.h"

^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

All other files in sanitizer_common (with the exception of sanitizer_malloc_mac.inc
which is special) include sanitizer_platform.h without directory name.

[ro]

ping?

[kcc]

LGTM

[ro]

Thanks. Could someone commit this for me? I don't have commit rights.

[kcc]

Vitaly, please commit (I won't have a chance today)

compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc

struct SymbolizeCodeCallbackArg {
   SymbolizedStack *last;
   uptr frames_symbolized;
 
   AddressInfo *get_new_frame(uintptr_t addr) {
     CHECK(last);
     if (frames_symbolized > 0) {
       SymbolizedStack *cur = SymbolizedStack::New(addr);
       AddressInfo *info = &cur->info;
-      info->FillModuleInfo(first->info.module, first->info.module_offset);
+      info->FillModuleInfo(first->info.module, first->info.module_offset,
+                           first->info.module_arch);
       last->next = cur;
       last = cur;
     }
     CHECK_EQ(addr, first->info.address);
     CHECK_EQ(addr, last->info.address);
     return &last->info;
   }
 };

compiler-rt/trunk/lib/sanitizer_common/sanitizer_win_weak_interception.cc

 //===-- sanitizer_win_weak_interception.cc --------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 // This module should be included in the sanitizer when it is implemented as a
 // shared library on Windows (dll), in order to delegate the calls of weak
 // functions to the implementation in the main executable when a strong
 // definition is provided.
 //===----------------------------------------------------------------------===//
 
-#include "sanitizer_common/sanitizer_platform.h"
+#include "sanitizer_platform.h"
 #if SANITIZER_WINDOWS && SANITIZER_DYNAMIC
 #include "sanitizer_win_weak_interception.h"
 #include "sanitizer_allocator_interface.h"
 #include "sanitizer_interface_internal.h"
 #include "sanitizer_win_defs.h"
 #include "interception/interception.h"
 
 extern "C" {