[gardening] Replace else-if with early returns and sink computation of ownership in the SILVerifier.

Noticed this while doing other work. Just chopping it off to ease review on the
larger patch.

Author: gottesmm

lib/SIL/SILVerifier.cpp

@@ -4031,8 +4031,6 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
       auto mappedTy = F.mapTypeIntoContext(ty);
       SILArgument *bbarg = *argI;
       ++argI;
-      auto ownershipkind = ValueOwnershipKind(
-          M, mappedTy, fnConv.getSILArgumentConvention(bbarg->getIndex()));
       if (bbarg->getType() != mappedTy) {
         llvm::errs() << what << " type mismatch!\n";
         llvm::errs() << "  argument: "; bbarg->dump();
@@ -4045,6 +4043,9 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
         return;
       }
 
+      auto ownershipkind = ValueOwnershipKind(
+          M, mappedTy, fnConv.getSILArgumentConvention(bbarg->getIndex()));
+
       if (bbarg->getOwnershipKind() != ownershipkind) {
         llvm::errs() << what << " ownership kind mismatch!\n";
         llvm::errs() << "  argument: " << bbarg->getOwnershipKind() << '\n';

lib/SILOptimizer/Utils/Local.cpp

@@ -2887,7 +2887,9 @@ swift::analyzeStaticInitializer(SILValue V,
         return false;
     }
     return true;
-  } else if (auto *TI = dyn_cast<TupleInst>(V)) {
+  }
+
+  if (auto *TI = dyn_cast<TupleInst>(V)) {
     // If it is not a tuple which is a simple type, bail.
     if (!isSimpleType(TI->getType(), TI->getModule()))
       return false;
@@ -2898,7 +2900,9 @@ swift::analyzeStaticInitializer(SILValue V,
         return false;
     }
     return true;
-  } else if (auto *bi = dyn_cast<BuiltinInst>(V)) {
+  }
+
+  if (auto *bi = dyn_cast<BuiltinInst>(V)) {
     switch (bi->getBuiltinInfo().ID) {
     case BuiltinValueKind::FPTrunc:
       if (auto *LI = dyn_cast<LiteralInst>(bi->getArguments()[0])) {
@@ -2908,13 +2912,15 @@ swift::analyzeStaticInitializer(SILValue V,
     default:
       return false;
     }
-  } else if (isa<IntegerLiteralInst>(V)
-             || isa<FloatLiteralInst>(V)
-             || isa<StringLiteralInst>(V)) {
+  }
+
+  if (isa<IntegerLiteralInst>(V)
+      || isa<FloatLiteralInst>(V)
+      || isa<StringLiteralInst>(V)) {
     return true;
-  } else {
-    return false;
   }
+
+  return false;
 }
 
 /// Replace load sequence which may contain