This is an archive of the discontinued LLVM Phabricator instance.

Differential D22090

[analyzer] Add more FileIDs to PlistDiagnostic map
ClosedPublic

Authored by a.sidorin on Jul 7 2016, 6:04 AM.

Details

Reviewers
dcoughlin
zaks.anna
Commits
rGe1beaf1ee7fb: [analyzer] Add more FileIDs to PlistDiagnostic map to avoid assertion
rC280360: [analyzer] Add more FileIDs to PlistDiagnostic map to avoid assertion
rL280360: [analyzer] Add more FileIDs to PlistDiagnostic map to avoid assertion
Summary

Some FileIDs that may be used by PlistDiagnostics are not added while building a list of pieces. This leads to assertion violation in GetFID() function. This patch tries to add such missing FileIDs. It also contains small refactoring of this piece of code.

Authors: Aleksei Sidorin, Ilya Palachev.

Diff Detail

Repository
rL LLVM

Event Timeline

a.sidorin updated this revision to Diff 63062.Jul 7 2016, 6:04 AM
a.sidorin retitled this revision from to [analyzer] Add more FileIDs to PlistDiagnostic map.
a.sidorin updated this object.
a.sidorin added reviewers: zaks.anna, dcoughlin.
a.sidorin added a subscriber: cfe-commits.
xazax.hun added a subscriber: xazax.hun.Jul 8 2016, 2:24 AM
NoQ added a subscriber: NoQ.Jul 11 2016, 8:55 AM
zaks.anna added inline comments.Jul 27 2016, 10:33 PM
test/Analysis/diagnostics/Inputs/include/Something.h
1 ↗(On Diff #63062)

Please, choose better file names. Every test that adds something cannot add a header called something:) It won't scale.

test/Analysis/diagnostics/plist-diagnostics-include-check.cpp
1 ↗(On Diff #63062)

Please, check that output is produced. Search for other tests with -analyzer-poutput=plist-multi-file for examples.

zaks.anna edited edge metadata.Jul 30 2016, 11:00 AM
a.sidorin updated this revision to Diff 68987.Aug 23 2016, 6:48 AM
a.sidorin edited edge metadata.

Add plist output; give test files meaningful names.

zaks.anna accepted this revision.Aug 23 2016, 9:24 PM
zaks.anna edited edge metadata.

Thanks!

This revision is now accepted and ready to land.Aug 23 2016, 9:24 PM
Closed by commit rL280360: [analyzer] Add more FileIDs to PlistDiagnostic map to avoid assertion (authored by a.sidorin). · Explain WhySep 1 2016, 5:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
lib/
StaticAnalyzer/
Core/
52 lines
test/
Analysis/
diagnostics/
Inputs/
include/
9 lines
1 line
140 lines

Diff 69993

cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp

Show First 20 Lines • Show All 291 Lines • ▼ Show 20 Linesvoid PlistDiagnostics::FlushDiagnosticsImpl(
FIDMap FM; FIDMap FM;
SmallVector<FileID, 10> Fids; SmallVector<FileID, 10> Fids;
const SourceManager* SM = nullptr; const SourceManager* SM = nullptr;
if (!Diags.empty()) if (!Diags.empty())
SM = &Diags.front()->path.front()->getLocation().getManager(); SM = &Diags.front()->path.front()->getLocation().getManager();
for (std::vector<const PathDiagnostic*>::iterator DI = Diags.begin(), auto AddPieceFID = [&FM, &Fids, SM](const PathDiagnosticPiece *Piece)->void {
DE = Diags.end(); DI != DE; ++DI) { AddFID(FM, Fids, *SM, Piece->getLocation().asLocation());
ArrayRef<SourceRange> Ranges = Piece->getRanges();
for (const SourceRange &Range : Ranges) {
AddFID(FM, Fids, *SM, Range.getBegin());
AddFID(FM, Fids, *SM, Range.getEnd());
}
};
const PathDiagnostic *D = *DI; for (const PathDiagnostic *D : Diags) {
SmallVector<const PathPieces *, 5> WorkList; SmallVector<const PathPieces *, 5> WorkList;
WorkList.push_back(&D->path); WorkList.push_back(&D->path);
while (!WorkList.empty()) { while (!WorkList.empty()) {
const PathPieces &path = *WorkList.pop_back_val(); const PathPieces &Path = *WorkList.pop_back_val();
for (PathPieces::const_iterator I = path.begin(), E = path.end(); I != E; for (const auto &Iter : Path) {
++I) { const PathDiagnosticPiece *Piece = Iter.get();
const PathDiagnosticPiece *piece = I->get(); AddPieceFID(Piece);
AddFID(FM, Fids, *SM, piece->getLocation().asLocation());
ArrayRef<SourceRange> Ranges = piece->getRanges(); if (const PathDiagnosticCallPiece *Call =
for (ArrayRef<SourceRange>::iterator I = Ranges.begin(), dyn_cast<PathDiagnosticCallPiece>(Piece)) {
E = Ranges.end(); I != E; ++I) { if (IntrusiveRefCntPtr<PathDiagnosticEventPiece>
AddFID(FM, Fids, *SM, I->getBegin()); CallEnterWithin = Call->getCallEnterWithinCallerEvent())
AddFID(FM, Fids, *SM, I->getEnd()); AddPieceFID(CallEnterWithin.get());
}
if (IntrusiveRefCntPtr<PathDiagnosticEventPiece>
if (const PathDiagnosticCallPiece *call = CallEnterEvent = Call->getCallEnterEvent())
dyn_cast<PathDiagnosticCallPiece>(piece)) { AddPieceFID(CallEnterEvent.get());
IntrusiveRefCntPtr<PathDiagnosticEventPiece>
callEnterWithin = call->getCallEnterWithinCallerEvent(); WorkList.push_back(&Call->path);
if (callEnterWithin) }
AddFID(FM, Fids, *SM, callEnterWithin->getLocation().asLocation()); else if (const PathDiagnosticMacroPiece *Macro =
dyn_cast<PathDiagnosticMacroPiece>(Piece)) {
WorkList.push_back(&call->path); WorkList.push_back(&Macro->subPieces);
}
else if (const PathDiagnosticMacroPiece *macro =
dyn_cast<PathDiagnosticMacroPiece>(piece)) {
WorkList.push_back(&macro->subPieces);
} }
} }
} }
} }
// Open the file. // Open the file.
std::error_code EC; std::error_code EC;
llvm::raw_fd_ostream o(OutputFile, EC, llvm::sys::fs::F_Text); llvm::raw_fd_ostream o(OutputFile, EC, llvm::sys::fs::F_Text);
▲ Show 20 Lines • Show All 155 Lines • Show Last 20 Lines

cfe/trunk/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.h

void clang_analyzer_warnIfReached();
class PlistCheckMacro {
public:
PlistCheckMacro () { }
void run() {
clang_analyzer_warnIfReached();
}
};

cfe/trunk/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.def

PLIST_DEF_MACRO

cfe/trunk/test/Analysis/diagnostics/plist-diagnostics-include-check.cpp

// RUN: %clang_cc1 -analyze -analyzer-checker=debug.ExprInspection -analyzer-output=plist-multi-file %s -o %t.plist
// RUN: FileCheck --input-file=%t.plist %s
#include "Inputs/include/plist-diagnostics-include-check-macro.h"
void foo() {
PlistCheckMacro()
#define PLIST_DEF_MACRO .run();
#include "Inputs/include/plist-diagnostics-include-check-macro.def"
}
// CHECK: <key>diagnostics</key>
// CHECK-NEXT: <array>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>path</key>
// CHECK-NEXT: <array>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>kind</key><string>event</string>
// CHECK-NEXT: <key>location</key>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>7</integer>
// CHECK-NEXT: <key>col</key><integer>3</integer>
// CHECK-NEXT: <key>file</key><integer>0</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: <key>ranges</key>
// CHECK-NEXT: <array>
// CHECK-NEXT: <array>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>7</integer>
// CHECK-NEXT: <key>col</key><integer>3</integer>
// CHECK-NEXT: <key>file</key><integer>0</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>1</integer>
// CHECK-NEXT: <key>col</key><integer>15</integer>
// CHECK-NEXT: <key>file</key><integer>2</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: </array>
// CHECK-NEXT: </array>
// CHECK-NEXT: <key>depth</key><integer>0</integer>
// CHECK-NEXT: <key>extended_message</key>
// CHECK-NEXT: <string>Calling &apos;PlistCheckMacro::run&apos;</string>
// CHECK-NEXT: <key>message</key>
// CHECK-NEXT: <string>Calling &apos;PlistCheckMacro::run&apos;</string>
// CHECK-NEXT: </dict>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>kind</key><string>event</string>
// CHECK-NEXT: <key>location</key>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>6</integer>
// CHECK-NEXT: <key>col</key><integer>3</integer>
// CHECK-NEXT: <key>file</key><integer>1</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: <key>depth</key><integer>1</integer>
// CHECK-NEXT: <key>extended_message</key>
// CHECK-NEXT: <string>Entered call from &apos;foo&apos;</string>
// CHECK-NEXT: <key>message</key>
// CHECK-NEXT: <string>Entered call from &apos;foo&apos;</string>
// CHECK-NEXT: </dict>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>kind</key><string>control</string>
// CHECK-NEXT: <key>edges</key>
// CHECK-NEXT: <array>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>start</key>
// CHECK-NEXT: <array>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>6</integer>
// CHECK-NEXT: <key>col</key><integer>3</integer>
// CHECK-NEXT: <key>file</key><integer>1</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>6</integer>
// CHECK-NEXT: <key>col</key><integer>6</integer>
// CHECK-NEXT: <key>file</key><integer>1</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: </array>
// CHECK-NEXT: <key>end</key>
// CHECK-NEXT: <array>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>7</integer>
// CHECK-NEXT: <key>col</key><integer>5</integer>
// CHECK-NEXT: <key>file</key><integer>1</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>7</integer>
// CHECK-NEXT: <key>col</key><integer>32</integer>
// CHECK-NEXT: <key>file</key><integer>1</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: </array>
// CHECK-NEXT: </dict>
// CHECK-NEXT: </array>
// CHECK-NEXT: </dict>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>kind</key><string>event</string>
// CHECK-NEXT: <key>location</key>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>7</integer>
// CHECK-NEXT: <key>col</key><integer>5</integer>
// CHECK-NEXT: <key>file</key><integer>1</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: <key>ranges</key>
// CHECK-NEXT: <array>
// CHECK-NEXT: <array>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>7</integer>
// CHECK-NEXT: <key>col</key><integer>5</integer>
// CHECK-NEXT: <key>file</key><integer>1</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>7</integer>
// CHECK-NEXT: <key>col</key><integer>34</integer>
// CHECK-NEXT: <key>file</key><integer>1</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: </array>
// CHECK-NEXT: </array>
// CHECK-NEXT: <key>depth</key><integer>1</integer>
// CHECK-NEXT: <key>extended_message</key>
// CHECK-NEXT: <string>REACHABLE</string>
// CHECK-NEXT: <key>message</key>
// CHECK-NEXT: <string>REACHABLE</string>
// CHECK-NEXT: </dict>
// CHECK-NEXT: </array>
// CHECK-NEXT: <key>description</key><string>REACHABLE</string>
// CHECK-NEXT: <key>category</key><string>debug</string>
// CHECK-NEXT: <key>type</key><string>Checking analyzer assumptions</string>
// CHECK-NEXT: <key>check_name</key><string>debug.ExprInspection</string>
// CHECK-NEXT: <!-- This hash is experimental and going to change! -->
// CHECK-NEXT: <key>issue_hash_content_of_line_in_context</key><string>93b4eab05b21c892c8e31723e5af3f59</string>
// CHECK-NEXT: <key>issue_context_kind</key><string>C++ method</string>
// CHECK-NEXT: <key>issue_context</key><string>run</string>
// CHECK-NEXT: <key>issue_hash_function_offset</key><string>1</string>
// CHECK-NEXT: <key>location</key>
// CHECK-NEXT: <dict>
// CHECK-NEXT: <key>line</key><integer>7</integer>
// CHECK-NEXT: <key>col</key><integer>5</integer>
// CHECK-NEXT: <key>file</key><integer>1</integer>
// CHECK-NEXT: </dict>
// CHECK-NEXT: </dict>
// CHECK-NEXT: </array>