Merge pull request #13645 from davezarzycki/nfc_hasParenSugar

Author: swift-ci

include/swift/AST/Types.h

@@ -480,6 +480,9 @@ class alignas(1 << TypeAlignInBits) TypeBase {
   /// Is this the 'Any' type?
   bool isAny();
 
+  /// Does the type have outer parenthesis?
+  bool hasParenSugar() const { return getKind() == TypeKind::Paren; }
+
   /// Are values of this type essentially just class references,
   /// possibly with some sort of additional information?
   ///

lib/AST/ASTPrinter.cpp

@@ -3581,7 +3581,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     }
 
     bool needsParens =
-      !isa<ParenType>(inputType.getPointer()) &&
+      !inputType->hasParenSugar() &&
       !inputType->is<TupleType>();
 
     if (needsParens)
@@ -3620,7 +3620,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     Printer << " ";
 
     bool needsParens =
-      !isa<ParenType>(T->getInput().getPointer()) &&
+      !T->getInput()->hasParenSugar() &&
       !T->getInput()->is<TupleType>();
 
     if (needsParens)

lib/AST/Expr.cpp

@@ -1097,7 +1097,7 @@ static ArrayRef<Identifier> getArgumentLabelsFromArgument(
 
   // Otherwise, use the type information.
   auto type = getType(arg);
-  if (isa<ParenType>(type.getPointer())) {
+  if (type->hasParenSugar()) {
     scratch.clear();
     scratch.push_back(Identifier());
     return scratch;    

lib/AST/Type.cpp

@@ -1028,7 +1028,7 @@ static Type
 getCanonicalInputType(AnyFunctionType *funcType,
                       llvm::function_ref<CanType(Type)> getCanonicalType) {
   auto origInputType = funcType->getInput();
-  bool isParen = isa<ParenType>(origInputType.getPointer());
+  bool isParen = origInputType->hasParenSugar();
   Type inputType = getCanonicalType(origInputType);
 
   if (!isParen && AnyFunctionType::isCanonicalFunctionInputType(inputType))

lib/IDE/CodeCompletion.cpp

@@ -1633,7 +1633,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
     Type In = AFT->getInput();
     if (!In)
       return;
-    if (isa<ParenType>(In.getPointer())) {
+    if (In->hasParenSugar()) {
       FoundFunctionsWithoutFirstKeyword = true;
       return;
     }
@@ -3696,7 +3696,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
     }
 
     void unboxType(Type T) {
-      if (isa<ParenType>(T.getPointer())) {
+      if (T->hasParenSugar()) {
         unboxType(T->getDesugaredType());
       } else if (T->is<TupleType>()) {
         for (auto Ele : T->getAs<TupleType>()->getElements()) {

lib/SILGen/SILGenExpr.cpp

@@ -2677,7 +2677,7 @@ RValue RValueEmitter::visitTupleShuffleExpr(TupleShuffleExpr *E,
     //
     // FIXME: Remove this eventually.
     if (I->canSplitIntoTupleElements() &&
-        !(isa<ParenType>(E->getType().getPointer()) &&
+        !(E->getType()->hasParenSugar() &&
           SGF.getASTContext().isSwiftVersion3())) {
       emitTupleShuffleExprInto(*this, E, I);
       return RValue::forInContext();
@@ -2700,7 +2700,7 @@ RValue RValueEmitter::visitTupleShuffleExpr(TupleShuffleExpr *E,
   // that case.
   //
   // FIXME: Remove this eventually.
-  if (isa<ParenType>(E->getType().getPointer()) &&
+  if (E->getType()->hasParenSugar() &&
       SGF.getASTContext().isSwiftVersion3()) {
     assert(E->getElementMapping().size() == 1);
     auto shuffleIndex = E->getElementMapping()[0];

lib/Sema/CSDiag.cpp

@@ -40,7 +40,7 @@ namespace swift {
 
     // Always make sure to have at least one set of parens
     bool forceParens =
-    !type->is<TupleType>() && !isa<ParenType>(type.getPointer());
+    !type->is<TupleType>() && !type->hasParenSugar();
     if (forceParens)
       result.push_back('(');
 
@@ -4110,7 +4110,7 @@ class ArgumentMatcher : public MatchCallArgumentListener {
       // FIXME: Due to a quirk of CSApply, we can end up without a
       // ParenExpr if the argument has an '@lvalue TupleType'.
       assert((isa<TupleType>(CS.getType(ArgExpr).getPointer()) ||
-              isa<ParenType>(CS.getType(ArgExpr).getPointer())) &&
+              CS.getType(ArgExpr)->hasParenSugar()) &&
              "unexpected argument expression type");
       insertLoc = ArgExpr->getLoc();
 

lib/Sema/CSSimplify.cpp

@@ -1171,7 +1171,7 @@ ConstraintSystem::matchFunctionTypes(FunctionType *func1, FunctionType *func2,
     if (last != path.rend()) {
       if (last->getKind() == ConstraintLocator::ApplyArgToParam) {
         if (auto *paren2 = dyn_cast<ParenType>(func2Input.getPointer())) {
-          if (!isa<ParenType>(func1Input.getPointer()))
+          if (!func1Input->hasParenSugar())
             func2Input = paren2->getUnderlyingType();
         }
       }
@@ -1562,8 +1562,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
     typeVar2 = dyn_cast<TypeVariableType>(type2.getPointer());
 
     // If the types are obviously equivalent, we're done.
-    if (isa<ParenType>(type1.getPointer()) ==
-          isa<ParenType>(type2.getPointer()) &&
+    if (type1->hasParenSugar() == type2->hasParenSugar() &&
         type1->isEqual(type2))
       return SolutionKind::Solved;
   } else {
@@ -1747,8 +1746,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
   if (isArgumentTupleMatch &&
       !isSwiftVersion3) {
     if (!typeVar1 && !typeVar2) {
-      if (isa<ParenType>(type1.getPointer()) !=
-          isa<ParenType>(type2.getPointer())) {
+      if (type1->hasParenSugar() != type2->hasParenSugar()) {
         return SolutionKind::Error;
       }
     }

lib/Sema/TypeCheckDecl.cpp

@@ -5616,7 +5616,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         return;
 
       // Allow silencing this warning using parens.
-      if (isa<ParenType>(TL.getType().getPointer()))
+      if (TL.getType()->hasParenSugar())
         return;
 
       TC.diagnose(decl->getStartLoc(), diag::override_unnecessary_IUO,
@@ -5685,7 +5685,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         return;
 
       // Allow silencing this warning using parens.
-      if (isa<ParenType>(resultTy.getPointer()))
+      if (resultTy->hasParenSugar())
         return;
 
       TC.diagnose(resultTL.getSourceRange().Start,

lib/Sema/TypeCheckPattern.cpp

@@ -1599,7 +1599,7 @@ bool TypeChecker::coerceParameterListToType(ParameterList *P, ClosureExpr *CE,
   // with a single underlying TupleType. In that case, check if
   // the closure argument is also one to avoid the tuple splat
   // from happening.
-  if (!hadError && isa<ParenType>(paramListType.getPointer())) {
+  if (!hadError && paramListType->hasParenSugar()) {
     auto underlyingTy = cast<ParenType>(paramListType.getPointer())
       ->getUnderlyingType();