no optional

Author: keith

lib/Index/Index.cpp

@@ -977,7 +977,7 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
   /// \param isImplicit Whether the reference is implicit, such as for a typealias' underlying type.
   /// \param Loc The location of the reference, otherwise the location of the TypeLoc is used.
   bool reportRelatedTypeRef(const TypeLoc &Ty, SymbolRoleSet Relations, Decl *Related,
-                            bool isImplicit=false, Optional<SourceLoc> Loc=Optional<SourceLoc>());
+                            bool isImplicit=false, SourceLoc Loc={});
   bool reportInheritedTypeRefs(
       ArrayRef<InheritedEntry> Inherited, Decl *Inheritee);
   NominalTypeDecl *getTypeLocAsNominalTypeDecl(const TypeLoc &Ty);
@@ -1394,16 +1394,17 @@ bool IndexSwiftASTWalker::reportInheritedTypeRefs(ArrayRef<InheritedEntry> Inher
 }
 
 bool IndexSwiftASTWalker::reportRelatedTypeRef(const TypeLoc &Ty, SymbolRoleSet Relations,
-                                               Decl *Related, bool Implicit, Optional<SourceLoc> Loc) {
+                                               Decl *Related, bool Implicit, SourceLoc Loc) {
   if (auto *composite = llvm::dyn_cast_or_null<CompositionTypeRepr>(Ty.getTypeRepr())) {
-    SourceLoc IdLoc = Loc.value_or(composite->getSourceLoc());
-    for (auto *Type : composite->getTypes())
+    SourceLoc IdLoc = Loc.isValid() ? Loc : composite->getSourceLoc();
+    for (auto *Type : composite->getTypes()) {
       if (!reportRelatedTypeRef(Type, Relations, Related, /*isImplicit=*/Implicit, IdLoc))
         return false;
+    }
 
     return true;
   } else if (auto *declRefTR = dyn_cast_or_null<DeclRefTypeRepr>(Ty.getTypeRepr())) {
-    SourceLoc IdLoc = Loc.value_or(declRefTR->getLoc());
+    SourceLoc IdLoc = Loc.isValid() ? Loc : declRefTR->getLoc();
     NominalTypeDecl *NTD = nullptr;
     bool isImplicit = Implicit;
     if (auto *VD = declRefTR->getBoundDecl()) {