add typealias to known types

formatting

underscore

Author: Azoy

include/swift/AST/ASTContext.h

@@ -530,9 +530,6 @@ class ASTContext final {
 
   // Retrieve the declaration of Swift._stdlib_isOSVersionAtLeast.
   FuncDecl *getIsOSVersionAtLeastDecl() const;
-
-  // Retrieve the declaration of Swift._MaxBuiltinFloatType.
-  TypeAliasDecl *getMaxBuiltinFloatTypeDecl() const;
 
   /// Look for the declaration with the given name within the
   /// Swift module.

include/swift/AST/KnownStdlibTypes.def

@@ -45,6 +45,8 @@ KNOWN_STDLIB_TYPE_DECL(Float,  NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(Double, NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(Float80, NominalTypeDecl, 0)
 
+KNOWN_STDLIB_TYPE_DECL(_MaxBuiltinFloatType, TypeAliasDecl, 0)
+
 KNOWN_STDLIB_TYPE_DECL(String, NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(Substring, NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(Array, NominalTypeDecl, 1)

lib/AST/ASTContext.cpp

@@ -206,9 +206,6 @@ FOR_KNOWN_FOUNDATION_TYPES(CACHE_FOUNDATION_DECL)
   //    -> Builtin.Int1
   FuncDecl *IsOSVersionAtLeastDecl = nullptr;
 
-  /// typealias Swift._MaxBuiltinFloatType
-  TypeAliasDecl *MaxBuiltinFloatTypeDecl = nullptr;
-
   /// The set of known protocols, lazily populated as needed.
   ProtocolDecl *KnownProtocols[NumKnownProtocols] = { };
 
@@ -1180,25 +1177,6 @@ FuncDecl *ASTContext::getIsOSVersionAtLeastDecl() const {
   return decl;
 }
 
-TypeAliasDecl *ASTContext::getMaxBuiltinFloatTypeDecl() const {
-  if (getImpl().MaxBuiltinFloatTypeDecl)
-    return getImpl().MaxBuiltinFloatTypeDecl;
-
-  // Go find '_MaxBuiltinFloatType' in the Swift module.
-  SmallVector<ValueDecl *, 1> results;
-  lookupInSwiftModule("_MaxBuiltinFloatType", results);
-
-  if (results.size() != 1)
-    return nullptr;
-
-  if (auto typeAlias = dyn_cast<TypeAliasDecl>(results.front())) {
-    getImpl().MaxBuiltinFloatTypeDecl = typeAlias;
-    return typeAlias;
-  }
-
-  return nullptr;
-}
-
 static bool isHigherPrecedenceThan(PrecedenceGroupDecl *a,
                                    PrecedenceGroupDecl *b) {
   assert(a != b && "exact match should already have been filtered");

lib/Sema/CSApply.cpp

@@ -2001,7 +2001,7 @@ namespace {
       }
 
       // Get the _MaxBuiltinFloatType decl, or look for it if it's not cached.
-      auto maxFloatTypeDecl = tc.Context.getMaxBuiltinFloatTypeDecl();
+      auto maxFloatTypeDecl = tc.Context.get_MaxBuiltinFloatTypeDecl();
 
       if (!maxFloatTypeDecl ||
           !maxFloatTypeDecl->hasInterfaceType() ||