[index] Remove unreachable materializeForSet case in indexer

benlangmuir · benlangmuir · commit 552326671566 · 2016-04-28T16:51:03.000-07:00
We already had it marked unreachable in SourceKit, so lift that up into
the libIndex and remove the unnecessary enum case.
diff --git a/include/swift/Index/IndexSymbol.h b/include/swift/Index/IndexSymbol.h
@@ -64,7 +64,6 @@ enum class SymbolSubKind {
   AccessorSetter,
   AccessorWillSet,
   AccessorDidSet,
-  AccessorMaterializeForSet,
   AccessorAddressor,
   AccessorMutableAddressor,
 
diff --git a/lib/Index/Index.cpp b/lib/Index/Index.cpp
@@ -557,11 +557,11 @@ static SymbolSubKind getSubKindForAccessor(AccessorKind AK) {
   case AccessorKind::IsSetter:    return SymbolSubKind::AccessorSetter;
   case AccessorKind::IsWillSet:   return SymbolSubKind::AccessorWillSet;
   case AccessorKind::IsDidSet:    return SymbolSubKind::AccessorDidSet;
-  case AccessorKind::IsMaterializeForSet:
-    return SymbolSubKind::AccessorMaterializeForSet;
   case AccessorKind::IsAddressor: return SymbolSubKind::AccessorAddressor;
   case AccessorKind::IsMutableAddressor:
     return SymbolSubKind::AccessorMutableAddressor;
+  case AccessorKind::IsMaterializeForSet:
+    llvm_unreachable("unexpected MaterializeForSet");
   }
 }
 
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
@@ -578,8 +578,6 @@ UIdent SwiftLangSupport::getUIDForSymbol(SymbolKind kind, SymbolSubKind subKind,
       return UID_FOR(AccessorWillSet);
     case SymbolSubKind::AccessorDidSet:
       return UID_FOR(AccessorDidSet);
-    case SymbolSubKind::AccessorMaterializeForSet:
-      llvm_unreachable("unexpected MaterializeForSet");
     case SymbolSubKind::AccessorAddressor:
       return UID_FOR(AccessorAddress);
     case SymbolSubKind::AccessorMutableAddressor:

Original file line number	Diff line number	Diff line change
`@@ -557,11 +557,11 @@ static SymbolSubKind getSubKindForAccessor(AccessorKind AK) {`
`557`	`557`	`case AccessorKind::IsSetter: return SymbolSubKind::AccessorSetter;`
`558`	`558`	`case AccessorKind::IsWillSet: return SymbolSubKind::AccessorWillSet;`
`559`	`559`	`case AccessorKind::IsDidSet: return SymbolSubKind::AccessorDidSet;`
`560`		`- case AccessorKind::IsMaterializeForSet:`
`561`		`- return SymbolSubKind::AccessorMaterializeForSet;`
`562`	`560`	`case AccessorKind::IsAddressor: return SymbolSubKind::AccessorAddressor;`
`563`	`561`	`case AccessorKind::IsMutableAddressor:`
`564`	`562`	`return SymbolSubKind::AccessorMutableAddressor;`
	`563`	`+ case AccessorKind::IsMaterializeForSet:`
	`564`	`+ llvm_unreachable("unexpected MaterializeForSet");`
`565`	`565`	`}`
`566`	`566`	`}`
`567`	`567`