[ASan] Don't hardcode ASan runtime version in ASan dll thunk

[samsonov]

Summary

Instead, include ASan headers in asan_dll_thunk.cc and make
use of __asan_init macro expansion.

[timurrrr]

This doesn't compile :-(

lib/asan/asan_dll_thunk.cc

238

The thing is that asan_interface_internal.h defines pretty much the same set of functions that I do here using the INTERFACE_FUNCTION macro. For editing simplicity reasons, the INTERFACE_FUNCTION macro doesn't know the argument types of the function, so we end up with conflicts between two declarations:

asan_dll_thunk.cc(238) : error C2733: '__asan_memcpy' : second C linkage of overloaded function not allowed
      asan_interface_internal.h(156) : see declaration of '__asan_memcpy'
asan_dll_thunk.cc(238) : error C2440: 'type cast' : cannot convert from 'overloaded-function' to '__sanitizer::uptr'
      Context does not allow for disambiguation of overloaded function

This is basically the reason why I haven't just used __asan_init in the first place...
Can we move declarations/definitions between headers somehow or have a minimalistic declaration-only new header for __asan_init?

lib/asan/asan_interface_internal.h

36

Suggestion: can probably use the # macro operator here?

[samsonov]

lib/asan/asan_dll_thunk.cc

238

Yeah, let's create asan_init_version.h which would hold all the comments about ABI versions and have

#define ASAN_VERSIONED_INIT __asan_init_v4

and get rid of all __asan_init mentions throughout the code.

Kostya, are you OK with that?

[timurrrr]

Done in r212699 / D4459.
[accepting merely to close this review]

lib/asan/asan_dll_thunk.cc

 // See https://code.google.com/p/address-sanitizer/issues/detail?id=209 for the
 // details.
 //===----------------------------------------------------------------------===//
 
 // Only compile this code when buidling asan_dll_thunk.lib
 // Using #ifdef rather than relying on Makefiles etc.
 // simplifies the build procedure.
 #ifdef ASAN_DLL_THUNK
+#include "asan_interface_internal.h"
 #include "sanitizer_common/sanitizer_interception.h"
 
 // ---------- Function interception helper functions and macros ----------- {{{1
 extern "C" {
 void *__stdcall GetModuleHandleA(const char *module_name);
 void *__stdcall GetProcAddress(void *module, const char *proc_name);
 void abort();
 }

 // want to call it in the __asan_init interceptor.
 WRAP_W_V(__asan_should_detect_stack_use_after_return)
 
 extern "C" {
   int __asan_option_detect_stack_use_after_return;
 
   // Manually wrap __asan_init as we need to initialize
   // __asan_option_detect_stack_use_after_return afterwards.
-  void __asan_init_v4() {
+  void __asan_init() {
     typedef void (*fntype)();
     static fntype fn = 0;
-    // __asan_init_v4 is expected to be called by only one thread.
+    // __asan_init is expected to be called by only one thread.
     if (fn) return;
 
-    fn = (fntype)getRealProcAddressOrDie("__asan_init_v4");
+    fn = (fntype)getRealProcAddressOrDie(__asan_init_name);
     fn();
     __asan_option_detect_stack_use_after_return =
         (__asan_should_detect_stack_use_after_return() != 0);
 
     InterceptHooks();
   }
 }
 
 INTERFACE_FUNCTION(__asan_handle_no_return)
 
 INTERFACE_FUNCTION(__asan_report_store1)
 INTERFACE_FUNCTION(__asan_report_store2)
 INTERFACE_FUNCTION(__asan_report_store4)
 INTERFACE_FUNCTION(__asan_report_store8)
 INTERFACE_FUNCTION(__asan_report_store16)
 INTERFACE_FUNCTION(__asan_report_store_n)
 
 INTERFACE_FUNCTION(__asan_report_load1)
 INTERFACE_FUNCTION(__asan_report_load2)
 INTERFACE_FUNCTION(__asan_report_load4)
 INTERFACE_FUNCTION(__asan_report_load8)
 INTERFACE_FUNCTION(__asan_report_load16)
 INTERFACE_FUNCTION(__asan_report_load_n)
 
 INTERFACE_FUNCTION(__asan_memcpy);
 INTERFACE_FUNCTION(__asan_memset);
 INTERFACE_FUNCTION(__asan_memmove);
 
 INTERFACE_FUNCTION(__asan_register_globals)
 INTERFACE_FUNCTION(__asan_unregister_globals)
 
 INTERFACE_FUNCTION(__asan_before_dynamic_init)
 INTERFACE_FUNCTION(__asan_after_dynamic_init)

 // We want to call __asan_init before C/C++ initializers/constructors are
 // executed, otherwise functions like memset might be invoked.
 // For some strange reason, merely linking in asan_preinit.cc doesn't work
 // as the callback is never called...  Is link.exe doing something too smart?
 
 // In DLLs, the callbacks are expected to return 0,
 // otherwise CRT initialization fails.
 static int call_asan_init() {
-  __asan_init_v4();
+  __asan_init();
   return 0;
 }
 #pragma section(".CRT$XIB", long, read)  // NOLINT
 __declspec(allocate(".CRT$XIB")) int (*__asan_preinit)() = call_asan_init;
 
 #endif // ASAN_DLL_THUNK

lib/asan/asan_interface_internal.h

extern "C" {
   // Changes between ABI versions:
   // v1=>v2: added 'module_name' to __asan_global
   // v2=>v3: stack frame description (created by the compiler)
   //         contains the function PC as the 3-rd field (see
   //         DescribeAddressIfStack).
   // v3=>v4: added '__asan_global_source_location' to __asan_global.
   SANITIZER_INTERFACE_ATTRIBUTE void __asan_init_v4();
   #define __asan_init __asan_init_v4
+  #define __asan_init_name "__asan_init_v4"
 
   // This structure is used to describe the source location of a place where
   // global was defined.
   struct __asan_global_source_location {
     const char *filename;
     int line_no;
     int column_no;
   };