From: Rui Ueyama Date: Fri, 2 Aug 2019 05:11:19 +0000 (+0000) Subject: Add an assert() to catch possible regexp errors. X-Git-Tag: llvmorg-11-init~12977 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1981b2b269da946aa38f665495edb693deb5e96;p=platform%2Fupstream%2Fllvm.git Add an assert() to catch possible regexp errors. llvm-svn: 367651 --- diff --git a/lld/Common/ErrorHandler.cpp b/lld/Common/ErrorHandler.cpp index f22de25..a012afc 100644 --- a/lld/Common/ErrorHandler.cpp +++ b/lld/Common/ErrorHandler.cpp @@ -124,13 +124,14 @@ std::string ErrorHandler::getLocation(const Twine &msg) { std::string str = msg.str(); for (std::regex &re : regexes) { - std::smatch match; - if (!std::regex_search(str, match, re)) + std::smatch m; + if (!std::regex_search(str, m, re)) continue; + assert(m.size() == 2 || m.size() == 3); - if (match.size() > 2) - return match.str(1) + "(" + match.str(2) + ")"; - return match.str(1); + if (m.size() == 2) + return m.str(1); + return m.str(1) + "(" + m.str(2) + ")"; } return logName;