From d8806d9e8ffffbd87c831add83b8568791c8ac9a Mon Sep 17 00:00:00 2001 From: Lily Vulcano Date: Tue, 11 Dec 2018 12:36:17 -0800 Subject: [PATCH 1/2] [DNM] Change the symbol for the default Swift CFString class. Required for the work in https://github.com/apple/swift-corelibs-foundation/pull/1799 --- lib/CodeGen/CodeGenModule.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 88c129a2cdc..63b0c582fc4 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -4050,8 +4050,8 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) { case LangOptions::CoreFoundationABI::Swift: LLVM_FALLTHROUGH; case LangOptions::CoreFoundationABI::Swift5_0: CFConstantStringClassName = - Triple.isOSDarwin() ? "$s15SwiftFoundation19_NSCFConstantStringCN" - : "$s10Foundation19_NSCFConstantStringCN"; + Triple.isOSDarwin() ? "$s19SwiftFoundationSoil19_NSCFConstantStringCN" + : "$s14FoundationSoil19_NSCFConstantStringCN"; Ty = IntPtrTy; break; case LangOptions::CoreFoundationABI::Swift4_2: From d467e504f9cef8d083978a4033df44bea5abbcc2 Mon Sep 17 00:00:00 2001 From: Lily Vulcano Date: Wed, 2 Jan 2019 13:08:27 -0800 Subject: [PATCH 2/2] Rename FoundationSoil to FoundationBase. --- lib/CodeGen/CodeGenModule.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 63b0c582fc4..1c085f4c408 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -4050,8 +4050,8 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) { case LangOptions::CoreFoundationABI::Swift: LLVM_FALLTHROUGH; case LangOptions::CoreFoundationABI::Swift5_0: CFConstantStringClassName = - Triple.isOSDarwin() ? "$s19SwiftFoundationSoil19_NSCFConstantStringCN" - : "$s14FoundationSoil19_NSCFConstantStringCN"; + Triple.isOSDarwin() ? "$s19SwiftFoundationBase19_NSCFConstantStringCN" + : "$s14FoundationBase19_NSCFConstantStringCN"; Ty = IntPtrTy; break; case LangOptions::CoreFoundationABI::Swift4_2: