Merge pull request #13661 from davezarzycki/nfc_avoid_getCanonicalType_reg_spills

Author: swift-ci

include/swift/AST/Types.h

@@ -400,17 +400,17 @@ class alignas(1 << TypeAlignInBits) TypeBase {
   bool hasCanonicalTypeComputed() const { return !CanonicalType.isNull(); }
 
 private:
-  void computeCanonicalType();
+  CanType computeCanonicalType();
 
 public:
   /// getCanonicalType - Return the canonical version of this type, which has
   /// sugar from all levels stripped off.
   CanType getCanonicalType() {
     if (isCanonical())
       return CanType(this);
-    if (!hasCanonicalTypeComputed())
-      computeCanonicalType();
-    return CanType(CanonicalType.get<TypeBase*>());
+    if (hasCanonicalTypeComputed())
+      return CanType(CanonicalType.get<TypeBase*>());
+    return computeCanonicalType();
   }
 
   /// getCanonicalType - Stronger canonicalization which folds away equivalent

lib/AST/Type.cpp

@@ -1045,7 +1045,7 @@ getCanonicalInputType(AnyFunctionType *funcType,
   return inputType;
 }
 
-void TypeBase::computeCanonicalType() {
+CanType TypeBase::computeCanonicalType() {
   assert(!hasCanonicalTypeComputed() && "called unnecessarily");
 
   TypeBase *Result = nullptr;
@@ -1223,6 +1223,7 @@ void TypeBase::computeCanonicalType() {
   // Cache the canonical type for future queries.
   assert(Result && "Case not implemented!");
   CanonicalType = Result;
+  return CanType(Result);
 }
 
 CanType TypeBase::getCanonicalType(GenericSignature *sig) {