Author: ctopper Date: Sat Sep 26 00:42:17 2015 New Revision: 248661 URL: http://llvm.org/viewvc/llvm-project?rev=248661&view=rev Log: Revert part of r248660 as using None didn't work with the ArrayRef being returned as an Optional.
Modified: cfe/trunk/lib/AST/Type.cpp Modified: cfe/trunk/lib/AST/Type.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Type.cpp?rev=248661&r1=248660&r2=248661&view=diff ============================================================================== --- cfe/trunk/lib/AST/Type.cpp (original) +++ cfe/trunk/lib/AST/Type.cpp Sat Sep 26 00:42:17 2015 @@ -1307,7 +1307,7 @@ Optional<ArrayRef<QualType>> Type::getOb 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::getOb // 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. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits