[PATCH] D33933: [sanitizer] Fix sanitizer_common compile errors on gcc trunk

[Vitaly Buka via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL317608: [sanitizer] Fix sanitizer_common compile errors on gcc trunk (authored by vitalybuka).

Changed prior to commit:
  https://reviews.llvm.org/D33933?vs=101541&id=121955#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D33933

Files:
  compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
  compiler-rt/trunk/lib/sanitizer_common/sanitizer_win_weak_interception.cc


Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
@@ -95,7 +95,8 @@
     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;
     }
Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_win_weak_interception.cc
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_win_weak_interception.cc
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_win_weak_interception.cc
@@ -12,7 +12,7 @@
 // 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"


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D33933.121955.patch
Type: text/x-patch
Size: 1368 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171107/4a954e04/attachment.bin>