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

[Mangler] Change the Swift mangler into a symbol builder.

Browse Source 
This commit changes the Swift mangler from a utility that writes tokens into a
stream into a name-builder that has two phases: "building a name", and "ready".
This clear separation is needed for the implementation of the compression layer.

Users of the mangler can continue to build the name using the mangleXXX methods,
but to access the results the users of the mangler need to call the finalize()
method. This method can write the result into a stream, like before, or return
an std::string.
This commit is contained in:
Nadav Rotem
2015-12-25 21:36:21 -08:00
parent c26f97fa78
commit 07d4558c1c
27 changed files with 243 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/driver/frontend_main.cpp
View File

@@ -168,10 +168,10 @@ static bool extendedTypeIsPrivate(TypeLoc inheritedType) {
return std::all_of(protocols.begin(), protocols.end(), declIsPrivate);
}
template <typename StreamTy>
static void mangleTypeAsContext(StreamTy &&out, const NominalTypeDecl *type) {
Mangle::Mangler mangler(out, /*debug style=*/false, /*Unicode=*/true);
static std::string mangleTypeAsContext(const NominalTypeDecl *type) {
Mangle::Mangler mangler(/*debug style=*/false, /*Unicode=*/true);
mangler.mangleContext(type, Mangle::Mangler::BindGenerics::None);
return mangler.finalize();
}
/// Emits a Swift-style dependencies file.
@@ -301,22 +301,21 @@ static bool emitReferenceDependencies(DiagnosticEngine &diags,
if (!entry.second)
continue;
out << "- \"";
mangleTypeAsContext(out, entry.first);
out << mangleTypeAsContext(entry.first);
out << "\"\n";
}
out << "provides-member:\n";
for (auto entry : extendedNominals) {
out << "- [\"";
mangleTypeAsContext(out, entry.first);
out << mangleTypeAsContext(entry.first);
out << "\", \"\"]\n";
}
// This is also part of "provides-member".
for (auto *ED : extensionsWithJustMembers) {
SmallString<32> mangledName;
mangleTypeAsContext(llvm::raw_svector_ostream(mangledName),
ED->getExtendedType()->getAnyNominal());
auto mangledName = mangleTypeAsContext(
ED->getExtendedType()->getAnyNominal());
for (auto *member : ED->getMembers()) {
auto *VD = dyn_cast<ValueDecl>(member);
@@ -324,7 +323,7 @@ static bool emitReferenceDependencies(DiagnosticEngine &diags,
VD->getFormalAccess() == Accessibility::Private) {
continue;
}
out << "- [\"" << mangledName.str() << "\", \""
out << "- [\"" << mangledName << "\", \""
<< escape(VD->getName()) << "\"]\n";
}
}
@@ -378,12 +377,9 @@ static bool emitReferenceDependencies(DiagnosticEngine &diags,
return lhs->first.first->getName().compare(rhs->first.first->getName());
// Break type name ties by mangled name.
SmallString<32> lhsMangledName, rhsMangledName;
mangleTypeAsContext(llvm::raw_svector_ostream(lhsMangledName),
lhs->first.first);
mangleTypeAsContext(llvm::raw_svector_ostream(rhsMangledName),
rhs->first.first);
return lhsMangledName.str().compare(rhsMangledName.str());
auto lhsMangledName = mangleTypeAsContext(lhs->first.first);
auto rhsMangledName = mangleTypeAsContext(rhs->first.first);
return lhsMangledName.compare(rhsMangledName);
});
for (auto &entry : sortedMembers) {
@@ -396,7 +392,7 @@ static bool emitReferenceDependencies(DiagnosticEngine &diags,
if (!entry.second)
out << "!private ";
out << "[\"";
mangleTypeAsContext(out, entry.first.first);
out << mangleTypeAsContext(entry.first.first);
out << "\", \"";
if (!entry.first.second.empty())
out << escape(entry.first.second);
@@ -419,7 +415,7 @@ static bool emitReferenceDependencies(DiagnosticEngine &diags,
if (!isCascading)
out << "!private ";
out << "\"";
mangleTypeAsContext(out, i->first.first);
out << mangleTypeAsContext(i->first.first);
out << "\"\n";
}