AST: Simplify ArchetypeType::requiresClass()

slavapestov · slavapestov · commit a6fbc59b6fe9 · 2020-08-15T03:09:12.000-04:00
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
@@ -3206,14 +3206,8 @@ PrimaryArchetypeType::getNew(const ASTContext &Ctx,
 }
 
 bool ArchetypeType::requiresClass() const {
-  if (Bits.ArchetypeType.HasSuperclass)
-    return true;
   if (auto layout = getLayoutConstraint())
-    if (layout->isClass())
-      return true;
-  for (ProtocolDecl *conformed : getConformsTo())
-    if (conformed->requiresClass())
-      return true;
+    return layout->isClass();
   return false;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3206,14 +3206,8 @@ PrimaryArchetypeType::getNew(const ASTContext &Ctx,`
`3206`	`3206`	`}`
`3207`	`3207`
`3208`	`3208`	`bool ArchetypeType::requiresClass() const {`
`3209`		`- if (Bits.ArchetypeType.HasSuperclass)`
`3210`		`- return true;`
`3211`	`3209`	`if (auto layout = getLayoutConstraint())`
`3212`		`- if (layout->isClass())`
`3213`		`- return true;`
`3214`		`- for (ProtocolDecl *conformed : getConformsTo())`
`3215`		`- if (conformed->requiresClass())`
`3216`		`- return true;`
	`3210`	`+ return layout->isClass();`
`3217`	`3211`	`return false;`
`3218`	`3212`	`}`
`3219`	`3213`