Go with a more direct implementation; NFC

Author: AaronBallman

clang/lib/Sema/SemaInit.cpp

@@ -264,18 +264,19 @@ static void CheckStringInit(Expr *Str, QualType &DeclT, const ArrayType *AT,
       // silence the "missing nonstring" diagnostic. If there's no entity,
       // check whether we're initializing an array of arrays; if so, walk the
       // parents to find an entity.
-      auto FindCorrectEntity = [](const InitializedEntity &Entity) {
-        const ValueDecl *Ret = nullptr;
-        for (const InitializedEntity *E = &Entity; E; E = Entity.getParent()) {
-          Ret = E->getDecl();
-          if (Ret)
-            break;
-          if (!E->getType()->isArrayType())
-            break;
+      auto FindCorrectEntity =
+          [](const InitializedEntity *Entity) -> const ValueDecl * {
+        while (Entity) {
+          if (const ValueDecl *VD = Entity->getDecl())
+            return VD;
+          if (!Entity->getType()->isArrayType())
+            return nullptr;
+          Entity = Entity->getParent();
         }
-        return Ret;
+
+        return nullptr;
       };
-      if (const ValueDecl *D = FindCorrectEntity(Entity);
+      if (const ValueDecl *D = FindCorrectEntity(&Entity);
           !D || !D->hasAttr<NonStringAttr>())
         S.Diag(
             Str->getBeginLoc(),