Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

lib/SILOptimizer/Mandatory/PredictableMemOpt.cpp

@@ -65,16 +65,24 @@ static unsigned getNumSubElements(SILType T, SILModule &M) {
 
 /// getAccessPathRoot - Given an address, dive through any tuple/struct element
 /// addresses to get the underlying value.
-static SILValue getAccessPathRoot(SILValue Pointer) {
-  while (1) {
-    if (auto *TEAI = dyn_cast<TupleElementAddrInst>(Pointer))
-      Pointer = TEAI->getOperand();
-    else if (auto SEAI = dyn_cast<StructElementAddrInst>(Pointer))
-      Pointer = SEAI->getOperand();
-    else if (auto BAI = dyn_cast<BeginAccessInst>(Pointer))
-      Pointer = BAI->getSource();
-    else
-      return Pointer;
+static SILValue getAccessPathRoot(SILValue pointer) {
+  while (true) {
+    if (auto *TEAI = dyn_cast<TupleElementAddrInst>(pointer)) {
+      pointer = TEAI->getOperand();
+      continue;
+    }
+
+    if (auto *SEAI = dyn_cast<StructElementAddrInst>(pointer)) {
+      pointer = SEAI->getOperand();
+      continue;
+    }
+
+    if (auto *BAI = dyn_cast<BeginAccessInst>(pointer)) {
+      pointer = BAI->getSource();
+      continue;
+    }
+
+    return pointer;
   }
 }