summaryrefslogtreecommitdiffstats
path: root/lib/AST/Type.cpp
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2015-09-26 05:42:17 +0000
committerCraig Topper <craig.topper@gmail.com>2015-09-26 05:42:17 +0000
commite472c6954445768c6ebba6b66e777f2e5328ac97 (patch)
treec9d20158e3de24eb2136349cc5b8719bf7f06548 /lib/AST/Type.cpp
parentcc4ce6d6bbc69135df4c7553997c6863caa411f1 (diff)
Revert part of r248660 as using None didn't work with the ArrayRef being returned as an Optional.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@248661 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/Type.cpp')
-rw-r--r--lib/AST/Type.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index 74bb1451d1..40fe903fea 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -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.