AST: Change isResilient() to do the cheaper check first

slavapestov · slavapestov · commit fcb52172fc29 · 2018-11-29T23:20:02.000-05:00
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -1819,7 +1819,7 @@ bool AbstractStorageDecl::isResilient(ModuleDecl *M,
   case ResilienceExpansion::Minimal:
     return isResilient();
   case ResilienceExpansion::Maximal:
-    return isResilient() && M != getModuleContext();
+    return M != getModuleContext() && isResilient();
   }
   llvm_unreachable("bad resilience expansion");
 }
@@ -2915,7 +2915,7 @@ bool NominalTypeDecl::isResilient(ModuleDecl *M,
   case ResilienceExpansion::Minimal:
     return isResilient();
   case ResilienceExpansion::Maximal:
-    return isResilient() && M != getModuleContext();
+    return M != getModuleContext() && isResilient();
   }
   llvm_unreachable("bad resilience expansion");
 }

Original file line number	Diff line number	Diff line change
`@@ -1819,7 +1819,7 @@ bool AbstractStorageDecl::isResilient(ModuleDecl *M,`
`1819`	`1819`	`case ResilienceExpansion::Minimal:`
`1820`	`1820`	`return isResilient();`
`1821`	`1821`	`case ResilienceExpansion::Maximal:`
`1822`		`- return isResilient() && M != getModuleContext();`
	`1822`	`+ return M != getModuleContext() && isResilient();`
`1823`	`1823`	`}`
`1824`	`1824`	`llvm_unreachable("bad resilience expansion");`
`1825`	`1825`	`}`
`@@ -2915,7 +2915,7 @@ bool NominalTypeDecl::isResilient(ModuleDecl *M,`
`2915`	`2915`	`case ResilienceExpansion::Minimal:`
`2916`	`2916`	`return isResilient();`
`2917`	`2917`	`case ResilienceExpansion::Maximal:`
`2918`		`- return isResilient() && M != getModuleContext();`
	`2918`	`+ return M != getModuleContext() && isResilient();`
`2919`	`2919`	`}`
`2920`	`2920`	`llvm_unreachable("bad resilience expansion");`
`2921`	`2921`	`}`