[NFC][Clang] Address comments

Change-Id: I99a618d8127680cb91146e1a82e0e0b6c0717888

Author: chinmaydd

clang/include/clang/Basic/AttributeCommonInfo.h

@@ -67,7 +67,7 @@ class AttributeCommonInfo {
     IgnoredAttribute,
     UnknownAttribute,
   };
-  enum class Scope { NONE, CLANG, GNU, MSVC, OMP, HLSL, GSL, RISCV, INVALID };
+  enum class Scope { NONE, CLANG, GNU, MSVC, OMP, HLSL, GSL, RISCV };
 
 private:
   const IdentifierInfo *AttrName = nullptr;

clang/lib/Basic/Attributes.cpp

@@ -158,21 +158,15 @@ std::string AttributeCommonInfo::getNormalizedFullName() const {
 
 AttributeCommonInfo::Scope
 getScopeFromNormalizedScopeName(StringRef ScopeName) {
-  AttributeCommonInfo::Scope ParsedScope =
-      llvm::StringSwitch<AttributeCommonInfo::Scope>(ScopeName)
-          .Case("", AttributeCommonInfo::Scope::NONE)
-          .Case("clang", AttributeCommonInfo::Scope::CLANG)
-          .Case("gnu", AttributeCommonInfo::Scope::GNU)
-          .Case("gsl", AttributeCommonInfo::Scope::GSL)
-          .Case("hlsl", AttributeCommonInfo::Scope::HLSL)
-          .Case("msvc", AttributeCommonInfo::Scope::MSVC)
-          .Case("omp", AttributeCommonInfo::Scope::OMP)
-          .Case("riscv", AttributeCommonInfo::Scope::RISCV)
-          .Default(AttributeCommonInfo::Scope::INVALID);
-
-  assert(ParsedScope != AttributeCommonInfo::Scope::INVALID);
-
-  return ParsedScope;
+  return llvm::StringSwitch<AttributeCommonInfo::Scope>(ScopeName)
+      .Case("", AttributeCommonInfo::Scope::NONE)
+      .Case("clang", AttributeCommonInfo::Scope::CLANG)
+      .Case("gnu", AttributeCommonInfo::Scope::GNU)
+      .Case("gsl", AttributeCommonInfo::Scope::GSL)
+      .Case("hlsl", AttributeCommonInfo::Scope::HLSL)
+      .Case("msvc", AttributeCommonInfo::Scope::MSVC)
+      .Case("omp", AttributeCommonInfo::Scope::OMP)
+      .Case("riscv", AttributeCommonInfo::Scope::RISCV);
 }
 
 unsigned AttributeCommonInfo::calculateAttributeSpellingListIndex() const {