---

yaml
---
r: 347078
b: refs/heads/master
c: af7f34e
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fa6e3abc5fe95adc7938a28a0482db7c404781a5
+refs/heads/master: af7f34e6811aede14377e82c9c0ef36aed828a4b
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/stdlib/public/runtime/Errors.cpp

@@ -67,7 +67,8 @@ enum: uint32_t {
 using namespace swift;
 
 #if SWIFT_SUPPORTS_BACKTRACE_REPORTING
-static bool getSymbolNameAddr(llvm::StringRef libraryName, SymbolInfo syminfo,
+static bool getSymbolNameAddr(llvm::StringRef libraryName,
+                              const SymbolInfo &syminfo,
                               std::string &symbolName, uintptr_t &addrOut) {
   // If we failed to find a symbol and thus dlinfo->dli_sname is nullptr, we
   // need to use the hex address.
@@ -96,7 +97,7 @@ static bool getSymbolNameAddr(llvm::StringRef libraryName, SymbolInfo syminfo,
 
   {
     std::lock_guard<std::mutex> lock(mutex);
-    dwResult = UnDecorateSymbolName(syminfo.symbolName, szUndName,
+    dwResult = UnDecorateSymbolName(syminfo.symbolName.get(), szUndName,
                                     sizeof(szUndName), dwFlags);
   }
 
@@ -106,7 +107,8 @@ static bool getSymbolNameAddr(llvm::StringRef libraryName, SymbolInfo syminfo,
   }
 #else
   int status;
-  char *demangled = abi::__cxa_demangle(syminfo.symbolName, 0, 0, &status);
+  char *demangled =
+      abi::__cxa_demangle(syminfo.symbolName.get(), 0, 0, &status);
   if (status == 0) {
     assert(demangled != nullptr &&
            "If __cxa_demangle succeeds, demangled should never be nullptr");
@@ -121,7 +123,7 @@ static bool getSymbolNameAddr(llvm::StringRef libraryName, SymbolInfo syminfo,
   // Otherwise, try to demangle with swift. If swift fails to demangle, it will
   // just pass through the original output.
   symbolName = demangleSymbolAsString(
-      syminfo.symbolName, strlen(syminfo.symbolName),
+      syminfo.symbolName.get(), strlen(syminfo.symbolName.get()),
       Demangle::DemangleOptions::SimplifiedUIDemangleOptions());
   return true;
 }

trunk/stdlib/public/runtime/ImageInspection.h

@@ -24,16 +24,42 @@
 #include "ImageInspectionELF.h"
 #include <cstdint>
 #include <cstddef>
+#if defined(__cplusplus)
+#include <memory>
+#endif
 
 namespace swift {
 
 /// This is a platform independent version of Dl_info from dlfcn.h
+#if defined(__cplusplus)
+
+template <typename T>
+struct null_deleter {
+  void operator()(T *) const {}
+  void operator()(typename std::remove_cv<T>::type *value) const {}
+};
+
+template <typename T>
+struct free_deleter {
+  void operator()(T *value) const {
+    free(const_cast<typename std::remove_cv<T>::type *>(value));
+  }
+  void operator()(typename std::remove_cv<T>::type *value) const {
+    free(value);
+  }
+};
+
 struct SymbolInfo {
   const char *fileName;
   void *baseAddress;
-  const char *symbolName;
+#if defined(_WIN32)
+  std::unique_ptr<const char, free_deleter<const char>> symbolName;
+#else
+  std::unique_ptr<const char, null_deleter<const char>> symbolName;
+#endif
   void *symbolAddress;
 };
+#endif
 
 /// Load the metadata from the image necessary to find protocols by name.
 void initializeProtocolLookup();

trunk/stdlib/public/runtime/ImageInspectionCOFF.cpp

@@ -17,6 +17,11 @@
 
 #if defined(__CYGWIN__)
 #include <dlfcn.h>
+#elif defined(_WIN32)
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#include <Windows.h>
+#include <DbgHelp.h>
 #endif
 
 using namespace swift;
@@ -129,10 +134,38 @@ int swift::lookupSymbol(const void *address, SymbolInfo *info) {
   info->baseAddress = dlinfo.dli_fbase;
   info->symbolName = dli_info.dli_sname;
   info->symbolAddress = dli_saddr;
+  return 1;
+#elif defined(_WIN32)
+  static const constexpr size_t kSymbolMaxNameLen = 1024;
+  static bool bInitialized = false;
+
+  if (bInitialized == false) {
+    if (SymInitialize(GetCurrentProcess(), /*UserSearchPath=*/NULL,
+                      /*fInvadeProcess=*/TRUE) == FALSE)
+      return 0;
+    bInitialized = true;
+  }
+
+  char buffer[sizeof(SYMBOL_INFO) + kSymbolMaxNameLen];
+  PSYMBOL_INFO pSymbol = reinterpret_cast<PSYMBOL_INFO>(buffer);
+  pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
+  pSymbol->MaxNameLen = kSymbolMaxNameLen;
+
+  DWORD64 dwDisplacement = 0;
+
+  if (SymFromAddr(GetCurrentProcess(), reinterpret_cast<const DWORD64>(address),
+                  &dwDisplacement, pSymbol) == FALSE)
+    return 0;
+
+  info->fileName = NULL;
+  info->baseAddress = reinterpret_cast<void *>(pSymbol->ModBase);
+  info->symbolName.reset(_strdup(pSymbol->Name));
+  info->symbolAddress = reinterpret_cast<void *>(pSymbol->Address);
+
   return 1;
 #else
   return 0;
-#endif // __CYGWIN__
+#endif // defined(__CYGWIN__) || defined(_WIN32)
 }
 
 // This is only used for backward deployment hooks, which we currently only support for

trunk/stdlib/public/runtime/ImageInspectionELF.cpp

@@ -134,7 +134,7 @@ int swift::lookupSymbol(const void *address, SymbolInfo *info) {
 
   info->fileName = dlinfo.dli_fname;
   info->baseAddress = dlinfo.dli_fbase;
-  info->symbolName = dlinfo.dli_sname;
+  info->symbolName.reset(dlinfo.dli_sname);
   info->symbolAddress = dlinfo.dli_saddr;
   return 1;
 }

trunk/stdlib/public/runtime/ImageInspectionMachO.cpp

@@ -105,7 +105,7 @@ int swift::lookupSymbol(const void *address, SymbolInfo *info) {
 
   info->fileName = dlinfo.dli_fname;
   info->baseAddress = dlinfo.dli_fbase;
-  info->symbolName = dlinfo.dli_sname;
+  info->symbolName.reset(dlinfo.dli_sname);
   info->symbolAddress = dlinfo.dli_saddr;
   return 1;
 }

trunk/stdlib/public/runtime/ProtocolConformance.cpp

@@ -67,7 +67,7 @@ template<> void ProtocolConformanceDescriptor::dump() const {
     int ok = lookupSymbol(addr, &info);
     if (!ok)
       return "<unknown addr>";
-    return info.symbolName;
+    return info.symbolName.get();
   };
 
   switch (auto kind = getTypeKind()) {