From 36c281b2a091cc1b6309a34172a2b8f4129a2883 Mon Sep 17 00:00:00 2001 From: Jim Lewis Date: Fri, 17 Jul 2020 09:04:42 -0500 Subject: [PATCH] Fix clang release build (#847) Avoid missing non-void function return (#846) --- test_conformance/spir/run_services.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/test_conformance/spir/run_services.cpp b/test_conformance/spir/run_services.cpp index 257dbff7..06fc418d 100644 --- a/test_conformance/spir/run_services.cpp +++ b/test_conformance/spir/run_services.cpp @@ -302,18 +302,11 @@ const std::string& DataRow::operator[](int column)const std::string& DataRow::operator[](int column) { - assert((column > -1) && "Index out of bound"); + assert((column > -1 && (size_t)column <= m_row.size()) + && "Index out of bound"); + if ((size_t)column == m_row.size()) m_row.push_back(""); - if ((size_t)column < m_row.size()) - return m_row[column]; - - if (column == m_row.size()) - { - m_row.push_back(""); - return m_row[column]; - } - - assert(0 && "Index out of bound."); + return m_row[column]; } /*