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

[Serialization] Avoid serializing source orders, trust deserialized decls in preserving such order. rdar://24610992

Browse Source 
Thank Jordan for suggesting this.
This commit is contained in:
Xi Ge
2016-02-11 11:57:03 -08:00
parent 9da87ef3aa
commit 9aa3d01101
10 changed files with 20 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -347,28 +347,27 @@ void swift::ide::printSubmoduleInterface(
return false;
});
std::sort(SwiftDecls.begin(), SwiftDecls.end(),
[&](Decl *LHS, Decl *RHS) -> bool {
auto *LHSValue = dyn_cast<ValueDecl>(LHS);
auto *RHSValue = dyn_cast<ValueDecl>(RHS);
// If the group name is specified, we sort them according to their source order,
// which is the order preserved by getTopLeveDecls.
if (!GroupName) {
std::sort(SwiftDecls.begin(), SwiftDecls.end(),
[&](Decl *LHS, Decl *RHS) -> bool {
auto *LHSValue = dyn_cast<ValueDecl>(LHS);
auto *RHSValue = dyn_cast<ValueDecl>(RHS);
// If group is specified, we order the decls by their source order.
if (GroupName && LHS->getSourceOrder() && RHS->getSourceOrder()) {
return LHS->getSourceOrder().getValue() < RHS->getSourceOrder().getValue();
}
if (LHSValue && RHSValue) {
StringRef LHSName = LHSValue->getName().str();
StringRef RHSName = RHSValue->getName().str();
if (int Ret = LHSName.compare(RHSName))
return Ret < 0;
// FIXME: this is not sufficient to establish a total order for overloaded
// decls.
return LHS->getKind() < RHS->getKind();
}
if (LHSValue && RHSValue) {
StringRef LHSName = LHSValue->getName().str();
StringRef RHSName = RHSValue->getName().str();
if (int Ret = LHSName.compare(RHSName))
return Ret < 0;
// FIXME: this is not sufficient to establish a total order for overloaded
// decls.
return LHS->getKind() < RHS->getKind();
}
return LHS->getKind() < RHS->getKind();
});
return LHS->getKind() < RHS->getKind();
});
}
ASTPrinter *PrinterToUse = &Printer;