Skip to content

Commit c02811d

Browse files
committed
[Clang mangling] Don't mangle when Clang says not to
We have been mangling extern "C" symbols when building with C++ interoperability, leading to incorrectly-mangled names such as _Z6memset that should have been unmangled "memset". Fix this so we get consistent mangling between C and C++ interoperability modes. Fixes rdar://164495210.
1 parent cc78bb5 commit c02811d

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

lib/ClangImporter/ClangImporter.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4759,8 +4759,10 @@ void ClangImporter::Implementation::getMangledName(
47594759
auto ctorGlobalDecl =
47604760
clang::GlobalDecl(ctor, clang::CXXCtorType::Ctor_Complete);
47614761
mangler->mangleCXXName(ctorGlobalDecl, os);
4762-
} else {
4762+
} else if (mangler->shouldMangleDeclName(clangDecl)) {
47634763
mangler->mangleName(clangDecl, os);
4764+
} else {
4765+
os << clangDecl->getName();
47644766
}
47654767
}
47664768

test/Inputs/clang-importer-sdk/usr/include/string.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77

88
#include <stdint.h>
99

10+
#ifdef __cplusplus
11+
extern "C" {
12+
13+
typedef __SIZE_TYPE__ size_t;
14+
#endif
15+
1016
void* memcpy(void* s1, const void* s2, size_t n);
1117
void* memmove(void* s1, const void* s2, size_t n);
1218
char* strcpy (char* s1, const char* s2);
@@ -30,4 +36,8 @@ void* memset(void* s, int c, size_t n);
3036
char* strerror(int errnum);
3137
size_t strlen(const char* s);
3238

39+
#ifdef __cplusplus
40+
}
41+
#endif
42+
3343
#endif // SDK_STRING_H
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// RUN: %target-swift-emit-silgen(mock-sdk: %clang-importer-sdk) %s -I %S/Inputs -import-bridging-header %S/../../../Inputs/clang-importer-sdk/usr/include/string.h -enable-experimental-cxx-interop | %FileCheck %s
2+
3+
4+
func zerome(ptr: UnsafeMutablePointer<Int>) {
5+
memset(ptr, 0, MemoryLayout<Int>.size)
6+
}
7+
8+
// Verify that the asmname is "memset", not a C++-mangled version
9+
// CHECK: sil [serialized] [asmname "memset"] [clang memset] @$sSo6memsetySvSgAB_s5Int32VSitFTo : $@convention(c) (Optional<UnsafeMutableRawPointer>, Int32, Int) -> Optional<UnsafeMutableRawPointer>

0 commit comments

Comments
 (0)