feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GccParser: Catch file paths in "inlined from" lines

Browse Source 
Change-Id: Ia16e5e4e3d3ce453e54df8eac48248164059bdc9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-07-06 17:17:49 +02:00
parent ef87abdfbf
commit 284ff753f3
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/projectexplorer/gccparser.cpp
View File

@@ -52,6 +52,10 @@ GccParser::GccParser()
+ QLatin1String("(\\d+)(:\\d+)?[,:]?$")); + QLatin1String("(\\d+)(:\\d+)?[,:]?$"));
QTC_CHECK(m_regExpIncluded.isValid()); QTC_CHECK(m_regExpIncluded.isValid());
m_regExpInlined.setPattern(QString::fromLatin1("\\binlined from\\s.* at ")
+ FILE_PATTERN + "(\\d+)(:\\d+)?[,:]?$");
QTC_CHECK(m_regExpInlined.isValid());
// optional path with trailing slash // optional path with trailing slash
// optional arm-linux-none-thingy // optional arm-linux-none-thingy
// name of executable // name of executable
@@ -166,6 +170,8 @@ OutputLineParser::Result GccParser::handleLine(const QString &line, OutputFormat
} }
match = m_regExpIncluded.match(lne); match = m_regExpIncluded.match(lne);
if (!match.hasMatch())
match = m_regExpInlined.match(lne);
if (match.hasMatch()) { if (match.hasMatch()) {
const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(1))); const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(1)));
const int lineNo = match.captured(3).toInt(); const int lineNo = match.captured(3).toInt();
@@ -1106,6 +1112,36 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
" | ~~~~~~~~~~~~^~~", " | ~~~~~~~~~~~~^~~",
FilePath::fromUserInput("param-type-mismatch.c"), 5)} FilePath::fromUserInput("param-type-mismatch.c"), 5)}
<< QString(); << QString();
QTest::newRow(R"("inlined from")")
<< QString("In file included from smallstringvector.h:30,\n"
" from smallstringio.h:28,\n"
" from gtest-creator-printing.h:29,\n"
" from googletest.h:41,\n"
" from smallstring-test.cpp:26:\n"
"In member function ‘void Utils::BasicSmallString<Size>::append(Utils::SmallStringView) [with unsigned int Size = 31]’,\n"
" inlined from ‘Utils::BasicSmallString<Size>& Utils::BasicSmallString<Size>::operator+=(Utils::SmallStringView) [with unsigned int Size = 31]’ at smallstring.h:471:15,\n"
" inlined from ‘virtual void SmallString_AppendLongSmallStringToShortSmallString_Test::TestBody()’ at smallstring-test.cpp:850:63:\n"
"smallstring.h:465:21: warning: writing 1 byte into a region of size 0 [-Wstringop-overflow=]\n"
" 465 | at(newSize) = 0;\n"
" | ~~~~~~~~~~~~^~~")
<< OutputParserTester::STDERR
<< QString() << QString()
<< Tasks{CompileTask(Task::Warning,
"writing 1 byte into a region of size 0 [-Wstringop-overflow=]\n"
"In file included from smallstringvector.h:30,\n"
" from smallstringio.h:28,\n"
" from gtest-creator-printing.h:29,\n"
" from googletest.h:41,\n"
" from smallstring-test.cpp:26:\n"
"In member function ‘void Utils::BasicSmallString<Size>::append(Utils::SmallStringView) [with unsigned int Size = 31]’,\n"
" inlined from ‘Utils::BasicSmallString<Size>& Utils::BasicSmallString<Size>::operator+=(Utils::SmallStringView) [with unsigned int Size = 31]’ at smallstring.h:471:15,\n"
" inlined from ‘virtual void SmallString_AppendLongSmallStringToShortSmallString_Test::TestBody()’ at smallstring-test.cpp:850:63:\n"
"smallstring.h:465:21: warning: writing 1 byte into a region of size 0 [-Wstringop-overflow=]\n"
" 465 | at(newSize) = 0;\n"
" | ~~~~~~~~~~~~^~~",
FilePath::fromUserInput("smallstring.h"), 465)}
<< QString();
} }
void ProjectExplorerPlugin::testGccOutputParsers() void ProjectExplorerPlugin::testGccOutputParsers()

1
src/plugins/projectexplorer/gccparser.h
View File

@@ -63,6 +63,7 @@ private:
QRegularExpression m_regExp; QRegularExpression m_regExp;
QRegularExpression m_regExpIncluded; QRegularExpression m_regExpIncluded;
QRegularExpression m_regExpInlined;
QRegularExpression m_regExpGccNames; QRegularExpression m_regExpGccNames;
Task m_currentTask; Task m_currentTask;