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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@248661 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index 74bb1451d1e41ed3af6751640252434afe706ac5..40fe903feab0eccea446ccffa8b402eb451d10db 100644 (file)
--- 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.