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

Demangler: make the demangler more tolerant with malformed symbols.

Browse Source 
Instead of crashing it just should not demangle malformed symbols.

rdar://problem/32113006
This commit is contained in:
Erik Eckstein
2017-05-16 12:28:32 -07:00
parent 04de6586ef
commit 4efdcebf80
3 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/Demangling/OldDemangler.cpp
View File

@@ -32,12 +32,6 @@ using namespace Demangle;
using llvm::Optional;
using llvm::None;
[[noreturn]]
static void unreachable(const char *Message) {
fprintf(stderr, "fatal error: %s\n", Message);
std::abort();
}
namespace {
struct FindPtr {
FindPtr(Node *v) : Target(v) {}
@@ -575,7 +569,8 @@ private:
return true;
}
unreachable("Unknown constant prop specialization");
// Unknown constant prop specialization
return false;
}
bool demangleFuncSigSpecializationClosureProp(NodePointer parent) {
@@ -1483,7 +1478,8 @@ private:
return Factory.createNode(Node::Kind::MetatypeRepresentation,
"@objc_metatype");
unreachable("Unhandled metatype representation");
// Unknown metatype representation
return nullptr;
}
NodePointer demangleGenericRequirement() {
@@ -1546,7 +1542,7 @@ private:
return nullptr;
name = "m";
} else {
unreachable("Unknown layout constraint");
return nullptr;
}
NodePointer second = Factory.createNode(kind, name);
@@ -2114,7 +2110,7 @@ private:
case ImplConventionContext::Parameter: return (FOR_PARAMETER); \
case ImplConventionContext::Result: return (FOR_RESULT); \
} \
unreachable("bad context"); \
return StringRef(); \
}
auto Nothing = StringRef();
CASE('a', Nothing, Nothing, "@autoreleased")
@@ -2177,18 +2173,18 @@ private:
return nullptr;
kind = Node::Kind::ImplErrorResult;
}
auto getContext = [](Node::Kind kind) -> ImplConventionContext {
if (kind == Node::Kind::ImplParameter)
return ImplConventionContext::Parameter;
else if (kind == Node::Kind::ImplResult
|| kind == Node::Kind::ImplErrorResult)
return ImplConventionContext::Result;
else
unreachable("unexpected node kind");
};
auto convention = demangleImplConvention(getContext(kind));
ImplConventionContext ConvCtx;
if (kind == Node::Kind::ImplParameter) {
ConvCtx = ImplConventionContext::Parameter;
} else if (kind == Node::Kind::ImplResult
|| kind == Node::Kind::ImplErrorResult) {
ConvCtx = ImplConventionContext::Result;
} else {
return nullptr;
}
auto convention = demangleImplConvention(ConvCtx);
if (convention.empty()) return nullptr;
auto type = demangleType();
if (!type) return nullptr;