replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert part of r248660 as using None didn't work with the ArrayRef being returned as an Optional. 

llvm-svn: 248661
This commit is contained in:
Craig Topper 2015-09-26 05:42:17 +00:00
parent 5b7183551f
commit 19e1261043
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/AST/Type.cpp
View File

@ -1307,7 +1307,7 @@ Optional<ArrayRef<QualType>> Type::getObjCSubstitutions(
if (!curClassDecl) {
// If we don't have a context type (e.g., this is "id" or some
// variant thereof), substitute the bounds.
return None;
return llvm::ArrayRef<QualType>();
}
// Follow the superclass chain until we've mapped the receiver type
@ -1327,7 +1327,7 @@ Optional<ArrayRef<QualType>> Type::getObjCSubstitutions(
// If we don't have a receiver type, or the receiver type does not
// have type arguments, substitute in the defaults.
if (!objectType || objectType->isUnspecialized()) {
return None;
return llvm::ArrayRef<QualType>();
}
// The receiver type has the type arguments we want.