[ASan] Un-break the Windows build

llvm-svn: 195624

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc

@@ -31,7 +31,7 @@
 
 #include <stdarg.h>
 
-#if SANITIZER_WINDOWS
+#if SANITIZER_WINDOWS && !defined(va_copy)
 #define va_copy(dst, src) ((dst) = (src))
 #endif // _WIN32
 

compiler-rt/lib/sanitizer_common/sanitizer_libc.cc

@@ -18,7 +18,12 @@ namespace __sanitizer {
 
 // Make the compiler think that something is going on there.
 static inline void break_optimization(void *arg) {
+#ifdef SANITIZER_WINDOWS
+  // FIXME: make sure this is actually enough.
+  __asm;
+#else
   __asm__ __volatile__("" : : "r" (arg) : "memory");
+#endif
 }
 
 s64 internal_atoll(const char *nptr) {