Skip to content
This repository was archived by the owner on Apr 2, 2020. It is now read-only.

Rename various ObjC-visible classes #911

Merged
merged 3 commits into from
Sep 24, 2018
Merged

Rename various ObjC-visible classes #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a9a2b8
Swift is renaming some classes that are visible to Objective-C to avo…
mikeash Sep 19, 2018
434a35b
Merge branch 'stable' into rename-conflicting-classes-and-methods
mikeash Sep 21, 2018
a31beee
[Swift] Rename a few more instances of RawNativeSet/DictionaryStorage.
mikeash Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lit/SwiftREPL/DeferredNSArray.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import Foundation
let patatino = [1,2,3,4] as AnyObject
// CHECK: patatino: _SwiftDeferredNSArray = 4 values {
// CHECK: patatino: __SwiftDeferredNSArray = 4 values {
// CHECK-NEXT: [0] = 1
// CHECK-NEXT: [1] = 2
// CHECK-NEXT: [2] = 3
Expand Down
2 changes: 1 addition & 1 deletion lit/SwiftREPL/DictBridging.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let d0: Dictionary<Int, Int> = [:]

// All empty dictionaries use the same type-punned storage class.
let d0b = d0 as NSDictionary
// DICT-LABEL: d0b: {{(_RawNativeDictionaryStorage|_EmptyDictionarySingleton)}} = 0 key/value pairs
// DICT-LABEL: d0b: {{(__RawNativeDictionaryStorage|_EmptyDictionarySingleton)}} = 0 key/value pairs

// Baseline case: native Dictionary of non-verbatim bridged elements
let d1: Dictionary<Int,Int> = [1:2]
Expand Down
2 changes: 1 addition & 1 deletion lit/SwiftREPL/SetBridging.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let s0: Set<Int> = []

// All empty sets use the same type-punned storage class.
let s0b = s0 as NSSet
// DICT-LABEL: s0b: {{(_RawNativeSetStorage|_EmptySetSingleton)}} = 0 values
// DICT-LABEL: s0b: {{(__RawNativeSetStorage|_EmptySetSingleton)}} = 0 values

// Baseline case: native Set of non-verbatim bridged elements
let s1: Set<Int> = [1]
Expand Down
6 changes: 3 additions & 3 deletions source/Plugins/Language/Swift/SwiftArray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,9 @@ SwiftArrayBufferHandler::CreateBufferHandler(ValueObject &valobj) {
return nullptr;
}

if (valobj_typename.startswith(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs21_SwiftDeferredNSArray"))
|| valobj_typename.startswith("_TtCs21_SwiftDeferredNSArray")
|| valobj_typename.startswith("Swift._SwiftDeferredNSArray") ) {
if (valobj_typename.startswith(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs22__SwiftDeferredNSArray"))
|| valobj_typename.startswith("_TtCs22__SwiftDeferredNSArray")
|| valobj_typename.startswith("Swift.__SwiftDeferredNSArray") ) {
ProcessSP process_sp(valobj.GetProcessSP());
if (!process_sp)
return nullptr;
Expand Down
4 changes: 2 additions & 2 deletions source/Plugins/Language/Swift/SwiftDictionary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ DictionaryConfig::DictionaryConfig()
m_legacy_nativeStorage_demangledRegex =
ConstString("^Swift\\._HashableTypedNativeDictionaryStorage<.+,.+>$");
m_legacy_emptyStorage_mangled_ObjC =
ConstString("_TtCs27_RawNativeDictionaryStorage");
ConstString("_TtCs28__RawNativeDictionaryStorage");
m_legacy_emptyStorage_demangled
= ConstString("Swift._RawNativeDictionaryStorage");
= ConstString("Swift.__RawNativeDictionaryStorage");
}

bool
Expand Down
40 changes: 20 additions & 20 deletions source/Plugins/Language/Swift/SwiftLanguage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ using lldb_private::formatters::swift::DictionaryConfig;
using lldb_private::formatters::swift::SetConfig;

void SwiftLanguage::Initialize() {
static ConstString g_NSStringClass1(SwiftLanguageRuntime::GetCurrentMangledName("_NSContiguousString"));
static ConstString g_NSStringClass2(SwiftLanguageRuntime::GetCurrentMangledName("_TtCSs19_NSContiguousString"));
static ConstString g_NSStringClass3Old("_TtCs19_NSContiguousString");
static ConstString g_NSStringClass3(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs19_NSContiguousString"));
static ConstString g_NSArrayClass1Old("_TtCs21_SwiftDeferredNSArray");
static ConstString g_NSArrayClass1(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs21_SwiftDeferredNSArray"));
static ConstString g_NSStringClass1(SwiftLanguageRuntime::GetCurrentMangledName("__NSContiguousString"));
static ConstString g_NSStringClass2(SwiftLanguageRuntime::GetCurrentMangledName("_TtCSs20__NSContiguousString"));
static ConstString g_NSStringClass3Old("_TtCs20__NSContiguousString");
static ConstString g_NSStringClass3(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs20__NSContiguousString"));
static ConstString g_NSArrayClass1Old("_TtCs22__SwiftDeferredNSArray");
static ConstString g_NSArrayClass1(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs22__SwiftDeferredNSArray"));

PluginManager::RegisterPlugin(GetPluginNameStatic(), "Swift Language",
CreateInstance);
Expand Down Expand Up @@ -98,12 +98,12 @@ void SwiftLanguage::Initialize() {

void SwiftLanguage::Terminate() {
// FIXME: Duplicating this list from Initialize seems error-prone.
static ConstString g_NSStringClass1(SwiftLanguageRuntime::GetCurrentMangledName("_NSContiguousString"));
static ConstString g_NSStringClass2(SwiftLanguageRuntime::GetCurrentMangledName("_TtCSs19_NSContiguousString"));
static ConstString g_NSStringClass3Old("_TtCs19_NSContiguousString");
static ConstString g_NSStringClass3(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs19_NSContiguousString"));
static ConstString g_NSArrayClass1Old("_TtCs21_SwiftDeferredNSArray");
static ConstString g_NSArrayClass1(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs21_SwiftDeferredNSArray"));
static ConstString g_NSStringClass1(SwiftLanguageRuntime::GetCurrentMangledName("__NSContiguousString"));
static ConstString g_NSStringClass2(SwiftLanguageRuntime::GetCurrentMangledName("_TtCSs20__NSContiguousString"));
static ConstString g_NSStringClass3Old("_TtCs20__NSContiguousString");
static ConstString g_NSStringClass3(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs20__NSContiguousString"));
static ConstString g_NSArrayClass1Old("_TtCs22__SwiftDeferredNSArray");
static ConstString g_NSArrayClass1(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs22__SwiftDeferredNSArray"));

lldb_private::formatters::NSString_Additionals::GetAdditionalSummaries()
.erase(g_NSStringClass1);
Expand Down Expand Up @@ -327,15 +327,15 @@ static void LoadSwiftFormatters(lldb::TypeCategoryImplSP swift_category_sp) {
AddCXXSummary(
swift_category_sp, lldb_private::formatters::NSArraySummaryProvider,
"Swift.Array summary provider",
ConstString(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs21_SwiftDeferredNSArray")), summary_flags, false);
ConstString(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs22__SwiftDeferredNSArray")), summary_flags, false);
AddCXXSummary(
swift_category_sp, lldb_private::formatters::swift::Array_SummaryProvider,
"Swift.Array summary provider",
ConstString("Swift._SwiftDeferredNSArray"), summary_flags, false);
ConstString("Swift.__SwiftDeferredNSArray"), summary_flags, false);
AddCXXSummary(
swift_category_sp, lldb_private::formatters::NSArraySummaryProvider,
"Swift.Array summary provider",
ConstString("_TtCs21_SwiftDeferredNSArray"), summary_flags, false);
ConstString("_TtCs22__SwiftDeferredNSArray"), summary_flags, false);

DictionaryConfig::Get()
.RegisterSummaryProviders(swift_category_sp, summary_flags);
Expand Down Expand Up @@ -379,19 +379,19 @@ static void LoadSwiftFormatters(lldb::TypeCategoryImplSP swift_category_sp) {
AddCXXSynthetic(swift_category_sp,
lldb_private::formatters::NSArraySyntheticFrontEndCreator,
"Swift.Array synthetic children",
ConstString(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs21_SwiftDeferredNSArray")),
ConstString(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs22__SwiftDeferredNSArray")),
synth_flags,
false);
AddCXXSynthetic(swift_category_sp,
lldb_private::formatters::NSArraySyntheticFrontEndCreator,
"Swift.Array synthetic children",
ConstString("_TtCs21_SwiftDeferredNSArray"),
ConstString("_TtCs22__SwiftDeferredNSArray"),
synth_flags,
false);
AddCXXSynthetic(swift_category_sp,
lldb_private::formatters::swift::ArraySyntheticFrontEndCreator,
"Swift.Array synthetic children",
ConstString("Swift._SwiftDeferredNSArray"),
ConstString("Swift.__SwiftDeferredNSArray"),
synth_flags,
false);

Expand Down Expand Up @@ -444,13 +444,13 @@ static void LoadSwiftFormatters(lldb::TypeCategoryImplSP swift_category_sp) {
AddCXXSummary(
swift_category_sp,
lldb_private::formatters::swift::NSContiguousString_SummaryProvider,
"NSContiguousString summary provider", ConstString("_NSContiguousString"),
"NSContiguousString summary provider", ConstString("__NSContiguousString"),
summary_flags);
AddCXXSummary(
swift_category_sp,
lldb_private::formatters::swift::NSContiguousString_SummaryProvider,
"NSContiguousString summary provider",
ConstString(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs19_NSContiguousString")), summary_flags);
ConstString(SwiftLanguageRuntime::GetCurrentMangledName("_TtCs20__NSContiguousString")), summary_flags);
summary_flags.SetSkipPointers(true);
AddCXXSummary(swift_category_sp,
lldb_private::formatters::swift::BuiltinObjC_SummaryProvider,
Expand Down
4 changes: 2 additions & 2 deletions source/Plugins/Language/Swift/SwiftSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ SetConfig::SetConfig()
ConstString("Swift._HashableTypedNativeSetStorage<");
m_legacy_nativeStorage_demangledRegex =
ConstString("^Swift\\._HashableTypedNativeSetStorage<.+>$");
m_legacy_emptyStorage_mangled_ObjC = ConstString("_TtCs20_RawNativeSetStorage");
m_legacy_emptyStorage_demangled = ConstString("Swift._RawNativeSetStorage");
m_legacy_emptyStorage_mangled_ObjC = ConstString("_TtCs21__RawNativeSetStorage");
m_legacy_emptyStorage_demangled = ConstString("Swift.__RawNativeSetStorage");
}

bool
Expand Down
4 changes: 2 additions & 2 deletions source/Target/SwiftLanguageRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void SwiftLanguageRuntime::SetupSwiftError() {
if (m_SwiftNativeNSErrorISA.hasValue())
return;

ConstString g_SwiftNativeNSError("_SwiftNativeNSError");
ConstString g_SwiftNativeNSError("__SwiftNativeNSError");

m_SwiftNativeNSErrorISA = FindSymbolForSwiftObject(
target, g_SwiftNativeNSError, eSymbolTypeObjCClass);
Expand Down Expand Up @@ -1566,7 +1566,7 @@ bool SwiftLanguageRuntime::IsValidErrorValue(
if (auto descriptor =
objc_runtime->GetClassDescriptor(*instance_type_sp)) {
if (descriptor->GetISA() != m_SwiftNativeNSErrorISA.getValue()) {
// not a _SwiftNativeNSError - but statically typed as ErrorType
// not a __SwiftNativeNSError - but statically typed as ErrorType
// return true here
if (out_error_descriptor) {
*out_error_descriptor = SwiftErrorDescriptor();
Expand Down