averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change mangling for the Swift module from 'Ss' to 's'.

Browse Source 
'Ss' appears in manglings tens of thousands of times in the standard library and is also incredibly frequent in other modules. This alone is enough to shrink the standard library by 59KB.

Swift SVN r32409
This commit is contained in:
Joe Groff
2015-10-02 22:39:44 +00:00
parent 394b948989
commit 0cd5aa8c7c
180 changed files with 969 additions and 930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Basic/Demangle.cpp
View File

@@ -1002,8 +1002,6 @@ private:
return NodeFactory::create(Node::Kind::Module, MANGLING_MODULE_OBJC);
if (Mangled.nextIf('C'))
return NodeFactory::create(Node::Kind::Module, MANGLING_MODULE_C);
if (Mangled.nextIf('s'))
return NodeFactory::create(Node::Kind::Module, STDLIB_NAME);
if (Mangled.nextIf('a'))
return createSwiftType(Node::Kind::Structure, "Array");
if (Mangled.nextIf('b'))
@@ -1016,10 +1014,18 @@ private:
return createSwiftType(Node::Kind::Structure, "Float");
if (Mangled.nextIf('i'))
return createSwiftType(Node::Kind::Structure, "Int");
if (Mangled.nextIf('P'))
return createSwiftType(Node::Kind::Structure, "UnsafePointer");
if (Mangled.nextIf('p'))
return createSwiftType(Node::Kind::Structure, "UnsafeMutablePointer");
if (Mangled.nextIf('q'))
return createSwiftType(Node::Kind::Enum, "Optional");
if (Mangled.nextIf('Q'))
return createSwiftType(Node::Kind::Enum, "ImplicitlyUnwrappedOptional");
if (Mangled.nextIf('R'))
return createSwiftType(Node::Kind::Structure, "UnsafeBufferPointer");
if (Mangled.nextIf('r'))
return createSwiftType(Node::Kind::Structure, "UnsafeMutableBufferPointer");
if (Mangled.nextIf('S'))
return createSwiftType(Node::Kind::Structure, "String");
if (Mangled.nextIf('u'))
@@ -1033,6 +1039,9 @@ private:
}
NodePointer demangleModule() {
if (Mangled.nextIf('s')) {
return NodeFactory::create(Node::Kind::Module, STDLIB_NAME);
}
if (Mangled.nextIf('S')) {
NodePointer module = demangleSubstitutionIndex();
if (!module)
@@ -1095,6 +1104,19 @@ private:
return proto;
}
if (Mangled.nextIf('s')) {
NodePointer stdlib = NodeFactory::create(Node::Kind::Module, STDLIB_NAME);
NodePointer name = demangleDeclName();
if (!name) return nullptr;
auto proto = NodeFactory::create(Node::Kind::Protocol);
proto->addChild(std::move(stdlib));
proto->addChild(std::move(name));
Substitutions.push_back(proto);
return proto;
}
return demangleDeclarationName(Node::Kind::Protocol);
}
@@ -1148,6 +1170,8 @@ private:
}
if (Mangled.nextIf('S'))
return demangleSubstitutionIndex();
if (Mangled.nextIf('s'))
return NodeFactory::create(Node::Kind::Module, STDLIB_NAME);
if (isStartOfEntity(Mangled.peek()))
return demangleEntity();
return demangleModule();
@@ -1198,7 +1222,7 @@ private:
entityBasicKind = Node::Kind::Variable;
} else if (Mangled.nextIf('I')) {
entityBasicKind = Node::Kind::Initializer;
} else if (Mangled.nextIf('s')) {
} else if (Mangled.nextIf('i')) {
entityBasicKind = Node::Kind::Subscript;
} else {
return demangleNominalType();
@@ -1356,7 +1380,7 @@ private:
if (!Mangled)
return nullptr;
char c = Mangled.peek();
if (c != '_' && c != 'S'
if (c != '_' && c != 'S' && c != 's'
&& (nodeKind == Node::Kind::AssociatedType || c != 'U')
&& !isStartOfIdentifier(c))
break;
@@ -1589,6 +1613,10 @@ private:
else
return makeAssociatedType(sub);
}
if (Mangled.nextIf('s')) {
NodePointer stdlib = NodeFactory::create(Node::Kind::Module, STDLIB_NAME);
return makeAssociatedType(stdlib);
}
if (Mangled.nextIf('d')) {
Node::IndexType depth, index;
if (!demangleIndex(depth))