[NFC] Use ClangTypeInfo's implicit null state instead of an extra Optional.

Author: varungandhi-apple

include/swift/AST/ExtInfo.h

@@ -246,10 +246,7 @@ class ASTExtInfoBuilder {
            DifferentiabilityKind::NonDifferentiable;
   }
 
-  /// Get the underlying ClangTypeInfo value if it is not the default value.
-  Optional<ClangTypeInfo> getClangTypeInfo() const {
-    return clangTypeInfo.empty() ? Optional<ClangTypeInfo>() : clangTypeInfo;
-  }
+  ClangTypeInfo getClangTypeInfo() const { return clangTypeInfo; }
 
   constexpr SILFunctionTypeRepresentation getSILRepresentation() const {
     unsigned rawRep = bits & RepresentationMask;
@@ -396,9 +393,7 @@ class ASTExtInfo {
 
   constexpr bool isDifferentiable() const { return builder.isDifferentiable(); }
 
-  Optional<ClangTypeInfo> getClangTypeInfo() const {
-    return builder.getClangTypeInfo();
-  }
+  ClangTypeInfo getClangTypeInfo() const { return builder.getClangTypeInfo(); }
 
   constexpr bool hasSelfParam() const { return builder.hasSelfParam(); }
 
@@ -558,10 +553,8 @@ class SILExtInfoBuilder {
            DifferentiabilityKind::NonDifferentiable;
   }
 
-  /// Get the underlying ClangTypeInfo value if it is not the default value.
-  Optional<ClangTypeInfo> getClangTypeInfo() const {
-    return clangTypeInfo.empty() ? Optional<ClangTypeInfo>() : clangTypeInfo;
-  }
+  /// Get the underlying ClangTypeInfo value.
+  ClangTypeInfo getClangTypeInfo() const { return clangTypeInfo; }
 
   constexpr bool hasSelfParam() const {
     switch (getRepresentation()) {
@@ -689,9 +682,7 @@ class SILExtInfo {
 
   constexpr bool isDifferentiable() const { return builder.isDifferentiable(); }
 
-  Optional<ClangTypeInfo> getClangTypeInfo() const {
-    return builder.getClangTypeInfo();
-  }
+  ClangTypeInfo getClangTypeInfo() const { return builder.getClangTypeInfo(); }
 
   constexpr bool hasSelfParam() const { return builder.hasSelfParam(); }
 

include/swift/AST/Types.h

@@ -2872,7 +2872,7 @@ class AnyFunctionType : public TypeBase {
                   unsigned NumParams, ExtInfo Info)
   : TypeBase(Kind, CanTypeContext, properties), Output(Output) {
     Bits.AnyFunctionType.ExtInfoBits = Info.getBits();
-    Bits.AnyFunctionType.HasClangTypeInfo = Info.getClangTypeInfo().hasValue();
+    Bits.AnyFunctionType.HasClangTypeInfo = !Info.getClangTypeInfo().empty();
     Bits.AnyFunctionType.NumParams = NumParams;
     assert(Bits.AnyFunctionType.NumParams == NumParams && "Params dropped!");
     // The use of both assert() and static_assert() is intentional.

lib/AST/ASTContext.cpp

@@ -3131,16 +3131,16 @@ FunctionType *FunctionType::get(ArrayRef<AnyFunctionType::Param> params,
     return funcTy;
   }
 
-  Optional<ClangTypeInfo> clangTypeInfo = info.getClangTypeInfo();
+  auto clangTypeInfo = info.getClangTypeInfo();
 
   size_t allocSize = totalSizeToAlloc<AnyFunctionType::Param, ClangTypeInfo>(
-      params.size(), clangTypeInfo.hasValue() ? 1 : 0);
+      params.size(), clangTypeInfo.empty() ? 0 : 1);
   void *mem = ctx.Allocate(allocSize, alignof(FunctionType), arena);
 
   bool isCanonical = isFunctionTypeCanonical(params, result);
-  if (clangTypeInfo.hasValue()) {
+  if (!clangTypeInfo.empty()) {
     if (ctx.LangOpts.UseClangFunctionTypes)
-      isCanonical &= clangTypeInfo->type->isCanonicalUnqualified();
+      isCanonical &= clangTypeInfo.getType()->isCanonicalUnqualified();
     else
       isCanonical = false;
   }
@@ -3162,8 +3162,8 @@ FunctionType::FunctionType(ArrayRef<AnyFunctionType::Param> params,
   std::uninitialized_copy(params.begin(), params.end(),
                           getTrailingObjects<AnyFunctionType::Param>());
   auto clangTypeInfo = info.getClangTypeInfo();
-  if (clangTypeInfo.hasValue())
-    *getTrailingObjects<ClangTypeInfo>() = clangTypeInfo.getValue();
+  if (!clangTypeInfo.empty())
+    *getTrailingObjects<ClangTypeInfo>() = clangTypeInfo;
 }
 
 void GenericFunctionType::Profile(llvm::FoldingSetNodeID &ID,

lib/AST/ASTPrinter.cpp

@@ -3629,7 +3629,7 @@ void printCType(ASTContext &Ctx, ASTPrinter &Printer, ExtInfo &info) {
   auto *cml = Ctx.getClangModuleLoader();
   SmallString<64> buf;
   llvm::raw_svector_ostream os(buf);
-  info.getClangTypeInfo().getValue().printType(cml, os);
+  info.getClangTypeInfo().printType(cml, os);
   Printer << ", cType: " << QuotedString(os.str());
 }
 
@@ -4054,7 +4054,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       case SILFunctionType::Representation::CFunctionPointer:
         Printer << "c";
         // [TODO: Clang-type-plumbing] Remove the second check.
-        if (printNameOnly || !info.getClangTypeInfo().hasValue())
+        if (printNameOnly || info.getClangTypeInfo().empty())
           break;
         printCType(Ctx, Printer, info);
         break;
@@ -4120,7 +4120,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       case SILFunctionType::Representation::CFunctionPointer:
         Printer << "c";
         // [TODO: Clang-type-plumbing] Remove the second check.
-        if (printNameOnly || !info.getClangTypeInfo().hasValue())
+        if (printNameOnly || info.getClangTypeInfo().empty())
           break;
         printCType(Ctx, Printer, info);
         break;