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

Build fix: Adventure triggers nullptr dereference

Browse Source 
Fix a nullptr dereference when looking for a base expression
in a member access. Remove use of Optional<T*>, it wasn't providing
any value versus nullptr checking.

Swift SVN r28648
This commit is contained in:
David Farler
2015-05-15 23:36:33 +00:00
parent c9952640bb
commit dbd78643ce
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Sema/ConstraintSystem.cpp
View File

@@ -826,7 +826,7 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
bool isTypeReference,
bool isSpecialized,
ConstraintLocatorBuilder locator,
Optional<DeclRefExpr *> base,
const DeclRefExpr *base,
DependentTypeOpener *opener) {
llvm::DenseMap<CanType, TypeVariableType *> replacements;
@@ -1053,7 +1053,7 @@ ConstraintSystem::getTypeOfMemberReference(Type baseTy, ValueDecl *value,
bool isTypeReference,
bool isDynamicResult,
ConstraintLocatorBuilder locator,
Optional<DeclRefExpr *> base,
const DeclRefExpr *base,
DependentTypeOpener *opener) {
// Figure out the instance type used for the base.
TypeVariableType *baseTypeVar = nullptr;
@@ -1345,22 +1345,23 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
= choice.getKind() == OverloadChoiceKind::DeclViaDynamic;
// Retrieve the type of a reference to the specific declaration choice.
if (choice.getBaseType()) {
auto getDotBase = [](const Expr *E) -> Optional<DeclRefExpr *> {
auto getDotBase = [](const Expr *E) -> const DeclRefExpr * {
if (E == nullptr) return nullptr;
switch (E->getKind()) {
case ExprKind::MemberRef: {
auto Base = cast<MemberRefExpr>(E)->getBase();
return dyn_cast<DeclRefExpr>(Base);
return dyn_cast<const DeclRefExpr>(Base);
}
case ExprKind::UnresolvedDot: {
auto Base = cast<UnresolvedDotExpr>(E)->getBase();
return dyn_cast<DeclRefExpr>(Base);
return dyn_cast<const DeclRefExpr>(Base);
}
default:
return None;
return nullptr;
}
};
auto anchor = locator ? locator->getAnchor() : nullptr;
auto base = anchor ? getDotBase(anchor) : None;
auto base = getDotBase(anchor);
std::tie(openedFullType, refType)
= getTypeOfMemberReference(choice.getBaseType(), choice.getDecl(),
isTypeReference, isDynamicResult,
@@ -1368,7 +1369,7 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
} else {
std::tie(openedFullType, refType)
= getTypeOfReference(choice.getDecl(), isTypeReference,
choice.isSpecialized(), locator, nullptr);
choice.isSpecialized(), locator);
}
if (choice.isPotentiallyUnavailable()) {