[PATCH] D56518: Change the symbol for the default Swift CFString class.

[Lily Vulcano via Phabricator via cfe-commits]

millenomi created this revision.
Herald added a subscriber: cfe-commits.

Required for the work in 
https://github.com/apple/swift-corelibs-foundation/pull/1799


Repository:
  rC Clang

https://reviews.llvm.org/D56518

Files:
  lib/CodeGen/CodeGenModule.cpp


Index: lib/CodeGen/CodeGenModule.cpp
===================================================================
--- lib/CodeGen/CodeGenModule.cpp
+++ lib/CodeGen/CodeGenModule.cpp
@@ -4235,8 +4235,8 @@
     case LangOptions::CoreFoundationABI::Swift: LLVM_FALLTHROUGH;
     case LangOptions::CoreFoundationABI::Swift5_0:
       CFConstantStringClassName =
-          Triple.isOSDarwin() ? "$s15SwiftFoundation19_NSCFConstantStringCN"
-                              : "$s10Foundation19_NSCFConstantStringCN";
+          Triple.isOSDarwin() ? 
"$s19SwiftFoundationBase19_NSCFConstantStringCN"
+                              : "$s14FoundationBase19_NSCFConstantStringCN";
       Ty = IntPtrTy;
       break;
     case LangOptions::CoreFoundationABI::Swift4_2:



Index: lib/CodeGen/CodeGenModule.cpp
===================================================================
--- lib/CodeGen/CodeGenModule.cpp
+++ lib/CodeGen/CodeGenModule.cpp
@@ -4235,8 +4235,8 @@
     case LangOptions::CoreFoundationABI::Swift: LLVM_FALLTHROUGH;
     case LangOptions::CoreFoundationABI::Swift5_0:
       CFConstantStringClassName =
-          Triple.isOSDarwin() ? "$s15SwiftFoundation19_NSCFConstantStringCN"
-                              : "$s10Foundation19_NSCFConstantStringCN";
+          Triple.isOSDarwin() ? "$s19SwiftFoundationBase19_NSCFConstantStringCN"
+                              : "$s14FoundationBase19_NSCFConstantStringCN";
       Ty = IntPtrTy;
       break;
     case LangOptions::CoreFoundationABI::Swift4_2:

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits