From fa35aaf5eed4b71821fea2888da8061d4920a56c Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Wed, 27 Feb 2019 16:19:32 +0000 Subject: [PATCH] [windows] Handle changes to clang's EH mangling For compatibility with a Facebook internal project, clang now mangles Objective-C types and C structures in the same way. This is a terrible idea, but it apparently doesn't break anything. --- eh_win32_msvc.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eh_win32_msvc.cc b/eh_win32_msvc.cc index 1d4c117..9947d59 100644 --- a/eh_win32_msvc.cc +++ b/eh_win32_msvc.cc @@ -65,9 +65,9 @@ namespace static std::string mangleObjcObject() { #if defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8 - return ".PEAU.objc_object@@"; + return ".PEAUobjc_object@@"; #else - return ".PAU.objc_object@@"; + return ".PAUobjc_object@@"; #endif } @@ -80,9 +80,9 @@ static std::string mangleStructNamed(const char* className) //return auto r = #if defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8 - std::string(".PEAU.objc_cls_") + + std::string(".PEAU") + #else - std::string(".PAU.objc_cls_") + + std::string(".PAU") + #endif className + "@@"; return r;