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

<rdar://problem/15013536>

Browse Source 
Fixing the demangler to correctly deal with weak/unowned refs
Also, enhancing the node structure



Swift SVN r8454
This commit is contained in:
Enrico Granata
2013-09-19 18:29:39 +00:00
parent 20152bdd11
commit d33691a051
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Basic/Demangle.cpp
View File

@@ -1409,21 +1409,21 @@ private:
return generics;
}
if (c == 'X') {
if (c == 'o') {
if (Mangled.nextIf('o')) {
NodePointer type = demangleType();
if (!type)
return nullptr;
NodePointer unowned = Node::makeNodePointer(Node::Kind::Unowned);
unowned->setNextNode(type);
unowned->push_back_child(type);
return unowned;
}
if (c == 'w') {
if (Mangled.nextIf('w')) {
NodePointer type = demangleType();
if (!type)
return nullptr;
NodePointer unowned = Node::makeNodePointer(Node::Kind::Weak);
unowned->setNextNode(type);
return unowned;
NodePointer weak = Node::makeNodePointer(Node::Kind::Weak);
weak->push_back_child(type);
return weak;
}
return nullptr;
}
@@ -1724,10 +1724,12 @@ void toString(NodePointer pointer, DemanglerPrinter &printer) {
}
case swift::Demangle::Node::Kind::Weak:
printer << "[weak] ";
pointer = pointer->getNextNode(); continue;
toStringChildren(pointer, printer);
break;
case swift::Demangle::Node::Kind::Unowned:
printer << "[unowned] ";
pointer = pointer->getNextNode(); continue;
toStringChildren(pointer, printer);
break;
case swift::Demangle::Node::Kind::ByRef:
printer << "[byref] ";
pointer = pointer->child_at(0); continue;