From d4e129e1627cdad278ce5f0ece1b04344d383c4c Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Tue, 10 Sep 2019 10:08:15 +0200
Subject: [PATCH] [apps/shared/expression_model_store] Simplify
 recordSatisfyingTestAtIndex

---
 apps/shared/expression_model_store.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/shared/expression_model_store.cpp b/apps/shared/expression_model_store.cpp
index 54eccf23d..cdd25ea60 100644
--- a/apps/shared/expression_model_store.cpp
+++ b/apps/shared/expression_model_store.cpp
@@ -59,21 +59,22 @@ Ion::Storage::Record ExpressionModelStore::recordSatisfyingTestAtIndex(int i, Mo
   assert(0 <= i && i < numberOfModelsSatisfyingTest(test));
   int index = 0;
   int currentModelIndex = 0;
+  Ion::Storage::Record record;
   do {
-    Ion::Storage::Record r = recordAtIndex(currentModelIndex++);
-    ExpressionModelHandle * m = privateModelForRecord(r);
+    record = recordAtIndex(currentModelIndex++);
+    ExpressionModelHandle * m = privateModelForRecord(record);
     if (m->isNull()) {
+      assert(false);
       break;
     }
     if (test(m)) {
       if (i == index) {
-        return r;
+        break;
       }
       index++;
     }
   } while (true);
-  assert(false);
-  return Ion::Storage::Record();
+  return record;
 }
 
 void ExpressionModelStore::resetMemoizedModelsExceptRecord(const Ion::Storage::Record record) const {