[compiler-rt] r307321 - [asan] Fix -Winvalid-paste error with clang-cl

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Thu Jul 6 14:51:32 PDT 2017


Author: rnk
Date: Thu Jul  6 14:51:32 2017
New Revision: 307321

URL: http://llvm.org/viewvc/llvm-project?rev=307321&view=rev
Log:
[asan] Fix -Winvalid-paste error with clang-cl

We don't need to paste tokens here. String literal concatenation works
just fine here with MSVC and Clang.

Modified:
    compiler-rt/trunk/lib/asan/asan_new_delete.cc

Modified: compiler-rt/trunk/lib/asan/asan_new_delete.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_new_delete.cc?rev=307321&r1=307320&r2=307321&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_new_delete.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_new_delete.cc Thu Jul  6 14:51:32 2017
@@ -26,7 +26,7 @@
 // VS2015 dynamic CRT (MD) work.
 #if SANITIZER_WINDOWS
 #define CXX_OPERATOR_ATTRIBUTE
-#define COMMENT_EXPORT(sym) __pragma(comment(linker, "/export:"##sym))
+#define COMMENT_EXPORT(sym) __pragma(comment(linker, "/export:" sym))
 #ifdef _WIN64
 COMMENT_EXPORT("??2 at YAPEAX_K@Z")                     // operator new
 COMMENT_EXPORT("??2 at YAPEAX_KAEBUnothrow_t@std@@@Z")  // operator new nothrow




More information about the llvm-commits mailing list