[PATCH] D63627: [asan] Avoid two compiler-synthesized calls to memset & memcpy
Reid Kleckner via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Jun 20 15:14:11 PDT 2019
rnk created this revision.
rnk added a reviewer: vitalybuka.
Herald added subscribers: Sanitizers, fedor.sergeev, kubamracek.
Herald added projects: Sanitizers, LLVM.
Otherwise the tests hang on Windows attempting to report nested errors.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D63627
Files:
compiler-rt/lib/asan/asan_globals.cc
compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cc
Index: compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cc
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cc
+++ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cc
@@ -35,6 +35,9 @@
class WinSymbolizerTool : public SymbolizerTool {
public:
+ WinSymbolizerTool(bool avoid_memset) {
+ (void)avoid_memset; // Avoids a compiler-synthesized call to memset.
+ }
bool SymbolizePC(uptr addr, SymbolizedStack *stack) override;
bool SymbolizeData(uptr addr, DataInfo *info) override {
return false;
@@ -295,7 +298,7 @@
}
// Add the dbghelp based symbolizer.
- list->push_back(new(*allocator) WinSymbolizerTool());
+ list->push_back(new(*allocator) WinSymbolizerTool(/*avoid_memset=*/true));
}
Symbolizer *Symbolizer::PlatformInit() {
Index: compiler-rt/lib/asan/asan_globals.cc
===================================================================
--- compiler-rt/lib/asan/asan_globals.cc
+++ compiler-rt/lib/asan/asan_globals.cc
@@ -115,15 +115,12 @@
if (flags()->report_globals >= 2)
ReportGlobal(g, "Search");
if (IsAddressNearGlobal(addr, g)) {
-#if defined(__GNUC__) && defined(__sparc__)
internal_memcpy(&globals[res], &g, sizeof(g));
-#else
- globals[res] = g;
-#endif
if (reg_sites)
reg_sites[res] = FindRegistrationSite(&g);
res++;
- if (res == max_globals) break;
+ if (res == max_globals)
+ break;
}
}
return res;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D63627.205913.patch
Type: text/x-patch
Size: 1531 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190620/22f8fc4f/attachment.bin>
More information about the llvm-commits
mailing list