Revert r131672 until __underlying_type is properly implemented in the

template case.

llvm-svn: 131692

clang/lib/Lex/PPMacroExpansion.cpp

@@ -602,7 +602,6 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) {
            .Case("is_trivial", LangOpts.CPlusPlus)
            .Case("is_trivially_copyable", LangOpts.CPlusPlus)
            .Case("is_union", LangOpts.CPlusPlus)
-           .Case("underlying_type", LangOpts.CPlusPlus)
            .Case("tls", PP.getTargetInfo().isTLSSupported())
            .Default(false);
 }

clang/test/Lexer/has_feature_type_traits.cpp

@@ -99,7 +99,3 @@ int is_standard_layout();
 int is_trivially_copyable();
 #endif
 // CHECK: int is_trivially_copyable();
-
-#if __has_feature(underlying_type)
-int underlying_type();
-#endif