This is an archive of the discontinued LLVM Phabricator instance.

Differential D52790

[analyzer][PlistMacroExpansion] New flag to convert macro expansions to events
AbandonedPublic

Authored by Szelethus on Oct 2 2018, 10:29 AM.

Details

Reviewers
george.karpenkov
NoQ
dkrupp
whisperity

Diff Detail

Event Timeline

Szelethus created this revision.Oct 2 2018, 10:29 AM
Herald added subscribers: cfe-commits, mikhail.ramalho, a.sidorin and 4 others. · View Herald TranscriptOct 2 2018, 10:29 AM
Szelethus added a parent revision: D52742: [analyzer][PlistMacroExpansion] Part 1.: New expand-macros flag.Oct 2 2018, 10:29 AM
Szelethus added a parent revision: D52787: [analyzer][NFC] Refactor functions in PlistDiagnostics to take AnalyzerOptions as parameter.
Szelethus updated this revision to Diff 168315.Oct 4 2018, 9:43 AM
Szelethus updated this revision to Diff 168317.Oct 4 2018, 9:46 AM

Changed the plist output.

Szelethus updated this revision to Diff 168319.Oct 4 2018, 9:47 AM
whisperity accepted this revision.Oct 16 2018, 11:11 AM

Remove the custom file paths and URLs but other than that this is pretty trivial.

This revision is now accepted and ready to land.Oct 16 2018, 11:11 AM
Herald added a subscriber: donat.nagy. · View Herald TranscriptOct 16 2018, 11:11 AM
george.karpenkov added inline comments.Oct 16 2018, 11:34 AM
test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist
6

Could we figure out how not to have hardcoded contributor-based strings there? Maybe have a python script generating those / doing a cleanup?

Szelethus added inline comments.Oct 16 2018, 11:37 AM
test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist
6

I'm just about to remove it, as I did for all the other [PlistMacroExpancion] patches.

But yea, a tool wouldn't hurt.

Szelethus updated this revision to Diff 169874.Oct 16 2018, 12:03 PM

Removed the version from the plist files, rebased to part 5.

Szelethus edited parent revisions, added: D52988: [analyzer][PlistMacroExpansion] Part 5.: Support for # and ##; removed: D52742: [analyzer][PlistMacroExpansion] Part 1.: New expand-macros flag.Oct 16 2018, 1:31 PM
NoQ accepted this revision.Nov 1 2018, 6:53 PM

Looks great, let's land? Not sure if i already asked - am i understanding correctly that this is a "poor-man's" support for macro expansions for tools that read plists but do not support those new plist macro dictionaries yet? Also i wanted to have -analyzer-output=text tests in order to easily see how exactly macro expansions turn into events, but i guess it doesn't make sense because this feature is only for -analyzer-output=plist because other outputs have their own mechanisms for handling macros so nvm^^

I wonder how expansions of huge macros will look as events.

lib/StaticAnalyzer/Core/PlistDiagnostics.cpp
289–290

I think the proper way of using Twine is to only wrap the first value with it. Otherwise string concatenation is done normally and then a single string is converted into a Twine, which doesn't give any benefits.

xazax.hun added a comment.Nov 2 2018, 5:04 AM

I also would like to see in a tool how this would look like as an event before committing :) Just a sanity check to make sure this feature makes sense. Could you post a screenshot of CodeChecker or any other tool using this feature?

Szelethus added a comment.Nov 5 2018, 11:25 AM
In D52790#1285039, @NoQ wrote:

Looks great, let's land?

I'll probably land it after part 5, in order to ease on rebasing.

Not sure if i already asked - am i understanding correctly that this is a "poor-man's" support for macro expansions for tools that read plists but do not support those new plist macro dictionaries yet?

Correct, same as notes-as-events.

I wonder how expansions of huge macros will look as events.

Quite funny, actually :D Think about assert, it's quite a mouthful. I'll post screenshots when I have more time.

Szelethus planned changes to this revision.Dec 5 2018, 12:05 PM

Since the way how these macro events are created as a whole changed in part 1, this path will need a big overhaul.

Herald added subscribers: gamesh411, baloghadamsoftware. · View Herald TranscriptDec 5 2018, 12:05 PM
Szelethus abandoned this revision.Jan 26 2019, 1:44 PM

As we currently support the actual macro_expansions format in CodeChecker, and AFAIK you guys at Apple prefer relying on Xcode (http://lists.llvm.org/pipermail/cfe-dev/2018-September/059231.html), I'd like to focus on more pressing matters.

george.karpenkov added a comment.Jan 28 2019, 1:52 PM

I personally do use HTML output quite a lot (and we do have non-Xcode projects), and complex macros in HTML are currently totally unusable.
I'm not sure whether this is a right approach to handling this, but it's definitely a problem for us.
In general - thanks for working on this anyway.

Revision Contents

PathSize
include/
clang/
StaticAnalyzer/
Core/
10 lines
lib/
StaticAnalyzer/
Core/
7 lines
47 lines
test/
Analysis/
Inputs/
expected-plists/
355 lines
82 lines
9 lines

Diff 168315

include/clang/StaticAnalyzer/Core/AnalyzerOptions.h

Show First 20 Lines • Show All 305 Lines • ▼ Show 20 Linesprivate:
Optional<bool> UnrollLoops; Optional<bool> UnrollLoops;
/// \sa shouldDisplayNotesAsEvents /// \sa shouldDisplayNotesAsEvents
Optional<bool> DisplayNotesAsEvents; Optional<bool> DisplayNotesAsEvents;
/// \sa shouldDisplayMacroExpansions /// \sa shouldDisplayMacroExpansions
Optional<bool> DisplayMacroExpansions; Optional<bool> DisplayMacroExpansions;
/// \sa shouldDisplayMacroExpansionsAsEvents
Optional<bool> DisplayMacroExpansionsAsEvents;
/// \sa shouldAggressivelySimplifyBinaryOperation /// \sa shouldAggressivelySimplifyBinaryOperation
Optional<bool> AggressiveBinaryOperationSimplification; Optional<bool> AggressiveBinaryOperationSimplification;
/// \sa shouldEagerlyAssume /// \sa shouldEagerlyAssume
Optional<bool> EagerlyAssumeBinOpBifurcation; Optional<bool> EagerlyAssumeBinOpBifurcation;
/// \sa getCTUDir /// \sa getCTUDir
Optional<StringRef> CTUDir; Optional<StringRef> CTUDir;
▲ Show 20 Lines • Show All 366 Lines • ▼ Show 20 Linespublic:
/// Returns true if macros related to the bugpath should be expanded and /// Returns true if macros related to the bugpath should be expanded and
/// included in the plist output. /// included in the plist output.
/// ///
/// This is controlled by the 'expand-macros' option, which defaults to false /// This is controlled by the 'expand-macros' option, which defaults to false
/// when unset. /// when unset.
bool shouldDisplayMacroExpansions(); bool shouldDisplayMacroExpansions();
/// Returns with true if macros expansions generated by the 'expand-macros'
/// option should be converted to events.
///
/// This is controlled by the 'expand-macros-as-events' option, which defaults
/// to false when unset.
bool shouldDisplayMacroExpansionsAsEvents();
/// Returns true if SValBuilder should rearrange comparisons and additive /// Returns true if SValBuilder should rearrange comparisons and additive
/// operations of symbolic expressions which consist of a sum of a symbol and /// operations of symbolic expressions which consist of a sum of a symbol and
/// a concrete integer into the format where symbols are on the left-hand /// a concrete integer into the format where symbols are on the left-hand
/// side and the integer is on the right. This is only done if both symbols /// side and the integer is on the right. This is only done if both symbols
/// and both concrete integers are signed, greater than or equal to the /// and both concrete integers are signed, greater than or equal to the
/// quarter of the minimum value of the type and less than or equal to the /// quarter of the minimum value of the type and less than or equal to the
/// quarter of the maximum value of that type. /// quarter of the maximum value of that type.
/// ///
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines

lib/StaticAnalyzer/Core/AnalyzerOptions.cpp

Show First 20 Lines • Show All 464 Lines • ▼ Show 20 Lines
bool AnalyzerOptions::shouldDisplayMacroExpansions() { bool AnalyzerOptions::shouldDisplayMacroExpansions() {
if (!DisplayMacroExpansions.hasValue()) if (!DisplayMacroExpansions.hasValue())
DisplayMacroExpansions = DisplayMacroExpansions =
getBooleanOption("expand-macros", /*Default=*/false); getBooleanOption("expand-macros", /*Default=*/false);
return DisplayMacroExpansions.getValue(); return DisplayMacroExpansions.getValue();
} }
bool AnalyzerOptions::shouldDisplayMacroExpansionsAsEvents() {
if (!DisplayMacroExpansionsAsEvents.hasValue())
DisplayMacroExpansionsAsEvents =
getBooleanOption("expand-macros-as-events", /*Default=*/false);
return DisplayMacroExpansionsAsEvents.getValue();
}
bool AnalyzerOptions::shouldAggressivelySimplifyBinaryOperation() { bool AnalyzerOptions::shouldAggressivelySimplifyBinaryOperation() {
if (!AggressiveBinaryOperationSimplification.hasValue()) if (!AggressiveBinaryOperationSimplification.hasValue())
AggressiveBinaryOperationSimplification = AggressiveBinaryOperationSimplification =
getBooleanOption("aggressive-binary-operation-simplification", getBooleanOption("aggressive-binary-operation-simplification",
/*Default=*/false); /*Default=*/false);
return AggressiveBinaryOperationSimplification.getValue(); return AggressiveBinaryOperationSimplification.getValue();
} }
Show All 29 Lines

lib/StaticAnalyzer/Core/PlistDiagnostics.cpp

Show First 20 Lines • Show All 278 Lines • ▼ Show 20 Linesstatic void ReportMacro(raw_ostream &o,
const FIDMap& FM, const FIDMap& FM,
const Preprocessor &PP, const Preprocessor &PP,
AnalyzerOptions &AnOpts, AnalyzerOptions &AnOpts,
unsigned indent, unsigned indent,
unsigned depth) { unsigned depth) {
const SourceManager &SM = PP.getSourceManager(); const SourceManager &SM = PP.getSourceManager();
ExpansionInfo EI = getExpandedMacro(P.getLocation().asLocation(), PP); ExpansionInfo EI = getExpandedMacro(P.getLocation().asLocation(), PP);
if (AnOpts.shouldDisplayMacroExpansionsAsEvents()) {
ReportEvent(o, PathDiagnosticEventPiece(P.getLocation(),
llvm::Twine("Expanding macro '" + EI.MacroName + "' to '" +
EI.Expansion + "'").str()),
NoQUnsubmitted
Not Done
ReplyInline Actions

I think the proper way of using Twine is to only wrap the first value with it. Otherwise string concatenation is done normally and then a single string is converted into a Twine, which doesn't give any benefits.

NoQ: I think the proper way of using `Twine` is to only wrap the first value with it. Otherwise…
FM, PP, indent, depth);
} else {
Indent(o, indent) << "<dict>\n"; Indent(o, indent) << "<dict>\n";
++indent; ++indent;
Indent(o, indent) << "<key>kind</key><string>macro_expansion</string>\n"; Indent(o, indent) << "<key>kind</key><string>macro_expansion</string>\n";
// Output the location. // Output the location.
FullSourceLoc L = P.getLocation().asLocation(); FullSourceLoc L = P.getLocation().asLocation();
Indent(o, indent) << "<key>location</key>\n"; Indent(o, indent) << "<key>location</key>\n";
EmitLocation(o, SM, L, FM, indent); EmitLocation(o, SM, L, FM, indent);
// Output the ranges (if any). // Output the ranges (if any).
ArrayRef<SourceRange> Ranges = P.getRanges(); ArrayRef<SourceRange> Ranges = P.getRanges();
EmitRanges(o, Ranges, FM, PP, indent); EmitRanges(o, Ranges, FM, PP, indent);
// Output the macro name. // Output the macro name.
Indent(o, indent) << "<key>name</key>"; Indent(o, indent) << "<key>name</key>";
EmitString(o, EI.MacroName) << '\n'; EmitString(o, EI.MacroName) << '\n';
// Output what it expands into. // Output what it expands into.
Indent(o, indent) << "<key>expansion</key>"; Indent(o, indent) << "<key>expansion</key>";
EmitString(o, EI.Expansion) << '\n'; EmitString(o, EI.Expansion) << '\n';
// Finish up. // Finish up.
--indent; --indent;
Indent(o, indent); Indent(o, indent);
o << "</dict>\n"; o << "</dict>\n";
}
for (PathPieces::const_iterator I = P.subPieces.begin(), for (PathPieces::const_iterator I = P.subPieces.begin(),
E = P.subPieces.end(); E = P.subPieces.end();
I != E; ++I) { I != E; ++I) {
ReportPiece(o, **I, FM, PP, AnOpts, indent, depth, ReportPiece(o, **I, FM, PP, AnOpts, indent, depth,
/*includeControlFlow*/ false); /*includeControlFlow*/ false);
} }
} }
▲ Show 20 Lines • Show All 346 Lines • Show Last 20 Lines

test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp-as-events.plist

  • This file was added.
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>clang_version</key>
<string>clang version 8.0.0 (http://mainstream.inf.elte.hu/Szelethus/clang ec097c9a35733c2c703e8ff03ea9b6ae345bf3f3) (https://github.com/llvm-mirror/llvm 1ffbf26a1a0a190d69327af875a3337b74a2ce82)</string>
<key>diagnostics</key>
<array>
<dict>
<key>path</key>
<array>
<dict>
<key>kind</key><string>control</string>
<key>edges</key>
<array>
<dict>
<key>start</key>
<array>
<dict>
<key>line</key><integer>34</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>34</integer>
<key>col</key><integer>5</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
<key>end</key>
<array>
<dict>
<key>line</key><integer>35</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>35</integer>
<key>col</key><integer>21</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
</dict>
</array>
</dict>
<dict>
<key>kind</key><string>event</string>
<key>location</key>
<dict>
<key>line</key><integer>35</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<key>depth</key><integer>0</integer>
<key>extended_message</key>
<string>Expanding macro &apos;&apos; to &apos;&apos;</string>
<key>message</key>
<string>Expanding macro &apos;&apos; to &apos;&apos;</string>
</dict>
<dict>
<key>kind</key><string>event</string>
<key>location</key>
<dict>
<key>line</key><integer>35</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<key>ranges</key>
<array>
<array>
<dict>
<key>line</key><integer>35</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>35</integer>
<key>col</key><integer>21</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
</array>
<key>depth</key><integer>0</integer>
<key>extended_message</key>
<string>Null pointer value stored to &apos;ptr&apos;</string>
<key>message</key>
<string>Null pointer value stored to &apos;ptr&apos;</string>
</dict>
<dict>
<key>kind</key><string>control</string>
<key>edges</key>
<array>
<dict>
<key>start</key>
<array>
<dict>
<key>line</key><integer>36</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>36</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
<key>end</key>
<array>
<dict>
<key>line</key><integer>36</integer>
<key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>36</integer>
<key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
</dict>
</array>
</dict>
<dict>
<key>kind</key><string>event</string>
<key>location</key>
<dict>
<key>line</key><integer>36</integer>
<key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
<key>ranges</key>
<array>
<array>
<dict>
<key>line</key><integer>36</integer>
<key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>36</integer>
<key>col</key><integer>6</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
</array>
<key>depth</key><integer>0</integer>
<key>extended_message</key>
<string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
<key>message</key>
<string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
</dict>
</array>
<key>description</key><string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
<key>category</key><string>Logic error</string>
<key>type</key><string>Dereference of null pointer</string>
<key>check_name</key><string>core.NullDereference</string>
<!-- This hash is experimental and going to change! -->
<key>issue_hash_content_of_line_in_context</key><string>f8fbc46cc5afbb056d92bd3d3d702781</string>
<key>issue_context_kind</key><string>function</string>
<key>issue_context</key><string>nonFunctionLikeMacroTest</string>
<key>issue_hash_function_offset</key><string>3</string>
<key>location</key>
<dict>
<key>line</key><integer>36</integer>
<key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
<key>ExecutedLines</key>
<dict>
<key>0</key>
<array>
<integer>33</integer>
<integer>34</integer>
<integer>35</integer>
<integer>36</integer>
</array>
</dict>
</dict>
<dict>
<key>path</key>
<array>
<dict>
<key>kind</key><string>control</string>
<key>edges</key>
<array>
<dict>
<key>start</key>
<array>
<dict>
<key>line</key><integer>47</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>47</integer>
<key>col</key><integer>5</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
<key>end</key>
<array>
<dict>
<key>line</key><integer>48</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>48</integer>
<key>col</key><integer>39</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
</dict>
</array>
</dict>
<dict>
<key>kind</key><string>event</string>
<key>location</key>
<dict>
<key>line</key><integer>48</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<key>depth</key><integer>0</integer>
<key>extended_message</key>
<string>Expanding macro &apos;&apos; to &apos;&apos;</string>
<key>message</key>
<string>Expanding macro &apos;&apos; to &apos;&apos;</string>
</dict>
<dict>
<key>kind</key><string>event</string>
<key>location</key>
<dict>
<key>line</key><integer>48</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<key>ranges</key>
<array>
<array>
<dict>
<key>line</key><integer>48</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>48</integer>
<key>col</key><integer>39</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
</array>
<key>depth</key><integer>0</integer>
<key>extended_message</key>
<string>Null pointer value stored to &apos;ptr&apos;</string>
<key>message</key>
<string>Null pointer value stored to &apos;ptr&apos;</string>
</dict>
<dict>
<key>kind</key><string>control</string>
<key>edges</key>
<array>
<dict>
<key>start</key>
<array>
<dict>
<key>line</key><integer>49</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>49</integer>
<key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
<key>end</key>
<array>
<dict>
<key>line</key><integer>49</integer>
<key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>49</integer>
<key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
</dict>
</array>
</dict>
<dict>
<key>kind</key><string>event</string>
<key>location</key>
<dict>
<key>line</key><integer>49</integer>
<key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
<key>ranges</key>
<array>
<array>
<dict>
<key>line</key><integer>49</integer>
<key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
<dict>
<key>line</key><integer>49</integer>
<key>col</key><integer>6</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
</array>
<key>depth</key><integer>0</integer>
<key>extended_message</key>
<string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
<key>message</key>
<string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
</dict>
</array>
<key>description</key><string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
<key>category</key><string>Logic error</string>
<key>type</key><string>Dereference of null pointer</string>
<key>check_name</key><string>core.NullDereference</string>
<!-- This hash is experimental and going to change! -->
<key>issue_hash_content_of_line_in_context</key><string>d5eba61193b41c27fc7b2705cbd607ba</string>
<key>issue_context_kind</key><string>function</string>
<key>issue_context</key><string>nonFunctionLikeNestedMacroTest</string>
<key>issue_hash_function_offset</key><string>3</string>
<key>location</key>
<dict>
<key>line</key><integer>49</integer>
<key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
<key>ExecutedLines</key>
<dict>
<key>0</key>
<array>
<integer>46</integer>
<integer>47</integer>
<integer>48</integer>
<integer>49</integer>
</array>
</dict>
</dict>
</array>
<key>files</key>
<array>
<string>/home/eumakri/Documents/2codechecker_dev_env/llvm/tools/clang/test/Analysis/plist-macros-with-expansion.cpp</string>
</array>
</dict>
</plist>
No newline at end of file

test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist

<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>clang_version</key> <key>clang_version</key>
<string>clang version 8.0.0 (http://mainstream.inf.elte.hu/Szelethus/clang 80e1678b9f598ca78bb3b71cf546a63414a37b11) (https://github.com/llvm-mirror/llvm 1ffbf26a1a0a190d69327af875a3337b74a2ce82)</string> <string>clang version 8.0.0 (http://mainstream.inf.elte.hu/Szelethus/clang ec097c9a35733c2c703e8ff03ea9b6ae345bf3f3) (https://github.com/llvm-mirror/llvm 1ffbf26a1a0a190d69327af875a3337b74a2ce82)</string>
george.karpenkovUnsubmitted
Not Done
ReplyInline Actions

Could we figure out how not to have hardcoded contributor-based strings there? Maybe have a python script generating those / doing a cleanup?

george.karpenkov: Could we figure out how not to have hardcoded contributor-based strings there? Maybe have a…
SzelethusAuthorUnsubmitted
Not Done
ReplyInline Actions

I'm just about to remove it, as I did for all the other [PlistMacroExpancion] patches.

But yea, a tool wouldn't hurt.

Szelethus: I'm just about to remove it, as I did for all the other [PlistMacroExpancion] patches. But yea…
<key>diagnostics</key> <key>diagnostics</key>
<array> <array>
<dict> <dict>
<key>path</key> <key>path</key>
<array> <array>
<dict> <dict>
<key>kind</key><string>control</string> <key>kind</key><string>control</string>
<key>edges</key> <key>edges</key>
<array> <array>
<dict> <dict>
<key>start</key> <key>start</key>
<array> <array>
<dict> <dict>
<key>line</key><integer>25</integer> <key>line</key><integer>34</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>25</integer> <key>line</key><integer>34</integer>
<key>col</key><integer>5</integer> <key>col</key><integer>5</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
<key>end</key> <key>end</key>
<array> <array>
<dict> <dict>
<key>line</key><integer>26</integer> <key>line</key><integer>35</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>26</integer> <key>line</key><integer>35</integer>
<key>col</key><integer>21</integer> <key>col</key><integer>21</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
</dict> </dict>
</array> </array>
</dict> </dict>
<dict> <dict>
<key>kind</key><string>macro_expansion</string> <key>kind</key><string>macro_expansion</string>
<key>location</key> <key>location</key>
<dict> <dict>
<key>line</key><integer>26</integer> <key>line</key><integer>35</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<key>name</key><string></string> <key>name</key><string></string>
<key>expansion</key><string></string> <key>expansion</key><string></string>
</dict> </dict>
<dict> <dict>
<key>kind</key><string>event</string> <key>kind</key><string>event</string>
<key>location</key> <key>location</key>
<dict> <dict>
<key>line</key><integer>26</integer> <key>line</key><integer>35</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<key>ranges</key> <key>ranges</key>
<array> <array>
<array> <array>
<dict> <dict>
<key>line</key><integer>26</integer> <key>line</key><integer>35</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>26</integer> <key>line</key><integer>35</integer>
<key>col</key><integer>21</integer> <key>col</key><integer>21</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
</array> </array>
<key>depth</key><integer>0</integer> <key>depth</key><integer>0</integer>
<key>extended_message</key> <key>extended_message</key>
<string>Null pointer value stored to &apos;ptr&apos;</string> <string>Null pointer value stored to &apos;ptr&apos;</string>
<key>message</key> <key>message</key>
<string>Null pointer value stored to &apos;ptr&apos;</string> <string>Null pointer value stored to &apos;ptr&apos;</string>
</dict> </dict>
<dict> <dict>
<key>kind</key><string>control</string> <key>kind</key><string>control</string>
<key>edges</key> <key>edges</key>
<array> <array>
<dict> <dict>
<key>start</key> <key>start</key>
<array> <array>
<dict> <dict>
<key>line</key><integer>27</integer> <key>line</key><integer>36</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>27</integer> <key>line</key><integer>36</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
<key>end</key> <key>end</key>
<array> <array>
<dict> <dict>
<key>line</key><integer>27</integer> <key>line</key><integer>36</integer>
<key>col</key><integer>8</integer> <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>27</integer> <key>line</key><integer>36</integer>
<key>col</key><integer>8</integer> <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
</dict> </dict>
</array> </array>
</dict> </dict>
<dict> <dict>
<key>kind</key><string>event</string> <key>kind</key><string>event</string>
<key>location</key> <key>location</key>
<dict> <dict>
<key>line</key><integer>27</integer> <key>line</key><integer>36</integer>
<key>col</key><integer>8</integer> <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<key>ranges</key> <key>ranges</key>
<array> <array>
<array> <array>
<dict> <dict>
<key>line</key><integer>27</integer> <key>line</key><integer>36</integer>
<key>col</key><integer>4</integer> <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>27</integer> <key>line</key><integer>36</integer>
<key>col</key><integer>6</integer> <key>col</key><integer>6</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
</array> </array>
<key>depth</key><integer>0</integer> <key>depth</key><integer>0</integer>
<key>extended_message</key> <key>extended_message</key>
<string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string> <string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
<key>message</key> <key>message</key>
<string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string> <string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
</dict> </dict>
</array> </array>
<key>description</key><string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string> <key>description</key><string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
<key>category</key><string>Logic error</string> <key>category</key><string>Logic error</string>
<key>type</key><string>Dereference of null pointer</string> <key>type</key><string>Dereference of null pointer</string>
<key>check_name</key><string>core.NullDereference</string> <key>check_name</key><string>core.NullDereference</string>
<!-- This hash is experimental and going to change! --> <!-- This hash is experimental and going to change! -->
<key>issue_hash_content_of_line_in_context</key><string>f8fbc46cc5afbb056d92bd3d3d702781</string> <key>issue_hash_content_of_line_in_context</key><string>f8fbc46cc5afbb056d92bd3d3d702781</string>
<key>issue_context_kind</key><string>function</string> <key>issue_context_kind</key><string>function</string>
<key>issue_context</key><string>nonFunctionLikeMacroTest</string> <key>issue_context</key><string>nonFunctionLikeMacroTest</string>
<key>issue_hash_function_offset</key><string>3</string> <key>issue_hash_function_offset</key><string>3</string>
<key>location</key> <key>location</key>
<dict> <dict>
<key>line</key><integer>27</integer> <key>line</key><integer>36</integer>
<key>col</key><integer>8</integer> <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<key>ExecutedLines</key> <key>ExecutedLines</key>
<dict> <dict>
<key>0</key> <key>0</key>
<array> <array>
<integer>24</integer> <integer>33</integer>
<integer>25</integer> <integer>34</integer>
<integer>26</integer> <integer>35</integer>
<integer>27</integer> <integer>36</integer>
</array> </array>
</dict> </dict>
</dict> </dict>
<dict> <dict>
<key>path</key> <key>path</key>
<array> <array>
<dict> <dict>
<key>kind</key><string>control</string> <key>kind</key><string>control</string>
<key>edges</key> <key>edges</key>
<array> <array>
<dict> <dict>
<key>start</key> <key>start</key>
<array> <array>
<dict> <dict>
<key>line</key><integer>38</integer> <key>line</key><integer>47</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>38</integer> <key>line</key><integer>47</integer>
<key>col</key><integer>5</integer> <key>col</key><integer>5</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
<key>end</key> <key>end</key>
<array> <array>
<dict> <dict>
<key>line</key><integer>39</integer> <key>line</key><integer>48</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>39</integer> <key>line</key><integer>48</integer>
<key>col</key><integer>39</integer> <key>col</key><integer>39</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
</dict> </dict>
</array> </array>
</dict> </dict>
<dict> <dict>
<key>kind</key><string>macro_expansion</string> <key>kind</key><string>macro_expansion</string>
<key>location</key> <key>location</key>
<dict> <dict>
<key>line</key><integer>39</integer> <key>line</key><integer>48</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<key>name</key><string></string> <key>name</key><string></string>
<key>expansion</key><string></string> <key>expansion</key><string></string>
</dict> </dict>
<dict> <dict>
<key>kind</key><string>event</string> <key>kind</key><string>event</string>
<key>location</key> <key>location</key>
<dict> <dict>
<key>line</key><integer>39</integer> <key>line</key><integer>48</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<key>ranges</key> <key>ranges</key>
<array> <array>
<array> <array>
<dict> <dict>
<key>line</key><integer>39</integer> <key>line</key><integer>48</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>39</integer> <key>line</key><integer>48</integer>
<key>col</key><integer>39</integer> <key>col</key><integer>39</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
</array> </array>
<key>depth</key><integer>0</integer> <key>depth</key><integer>0</integer>
<key>extended_message</key> <key>extended_message</key>
<string>Null pointer value stored to &apos;ptr&apos;</string> <string>Null pointer value stored to &apos;ptr&apos;</string>
<key>message</key> <key>message</key>
<string>Null pointer value stored to &apos;ptr&apos;</string> <string>Null pointer value stored to &apos;ptr&apos;</string>
</dict> </dict>
<dict> <dict>
<key>kind</key><string>control</string> <key>kind</key><string>control</string>
<key>edges</key> <key>edges</key>
<array> <array>
<dict> <dict>
<key>start</key> <key>start</key>
<array> <array>
<dict> <dict>
<key>line</key><integer>40</integer> <key>line</key><integer>49</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>40</integer> <key>line</key><integer>49</integer>
<key>col</key><integer>3</integer> <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
<key>end</key> <key>end</key>
<array> <array>
<dict> <dict>
<key>line</key><integer>40</integer> <key>line</key><integer>49</integer>
<key>col</key><integer>8</integer> <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>40</integer> <key>line</key><integer>49</integer>
<key>col</key><integer>8</integer> <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
</dict> </dict>
</array> </array>
</dict> </dict>
<dict> <dict>
<key>kind</key><string>event</string> <key>kind</key><string>event</string>
<key>location</key> <key>location</key>
<dict> <dict>
<key>line</key><integer>40</integer> <key>line</key><integer>49</integer>
<key>col</key><integer>8</integer> <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<key>ranges</key> <key>ranges</key>
<array> <array>
<array> <array>
<dict> <dict>
<key>line</key><integer>40</integer> <key>line</key><integer>49</integer>
<key>col</key><integer>4</integer> <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<dict> <dict>
<key>line</key><integer>40</integer> <key>line</key><integer>49</integer>
<key>col</key><integer>6</integer> <key>col</key><integer>6</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
</array> </array>
</array> </array>
<key>depth</key><integer>0</integer> <key>depth</key><integer>0</integer>
<key>extended_message</key> <key>extended_message</key>
<string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string> <string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
<key>message</key> <key>message</key>
<string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string> <string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
</dict> </dict>
</array> </array>
<key>description</key><string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string> <key>description</key><string>Dereference of null pointer (loaded from variable &apos;ptr&apos;)</string>
<key>category</key><string>Logic error</string> <key>category</key><string>Logic error</string>
<key>type</key><string>Dereference of null pointer</string> <key>type</key><string>Dereference of null pointer</string>
<key>check_name</key><string>core.NullDereference</string> <key>check_name</key><string>core.NullDereference</string>
<!-- This hash is experimental and going to change! --> <!-- This hash is experimental and going to change! -->
<key>issue_hash_content_of_line_in_context</key><string>d5eba61193b41c27fc7b2705cbd607ba</string> <key>issue_hash_content_of_line_in_context</key><string>d5eba61193b41c27fc7b2705cbd607ba</string>
<key>issue_context_kind</key><string>function</string> <key>issue_context_kind</key><string>function</string>
<key>issue_context</key><string>nonFunctionLikeNestedMacroTest</string> <key>issue_context</key><string>nonFunctionLikeNestedMacroTest</string>
<key>issue_hash_function_offset</key><string>3</string> <key>issue_hash_function_offset</key><string>3</string>
<key>location</key> <key>location</key>
<dict> <dict>
<key>line</key><integer>40</integer> <key>line</key><integer>49</integer>
<key>col</key><integer>8</integer> <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer> <key>file</key><integer>0</integer>
</dict> </dict>
<key>ExecutedLines</key> <key>ExecutedLines</key>
<dict> <dict>
<key>0</key> <key>0</key>
<array> <array>
<integer>37</integer> <integer>46</integer>
<integer>38</integer> <integer>47</integer>
<integer>39</integer> <integer>48</integer>
<integer>40</integer> <integer>49</integer>
</array> </array>
</dict> </dict>
</dict> </dict>
</array> </array>
<key>files</key> <key>files</key>
<array> <array>
<string>/home/eumakri/Documents/2codechecker_dev_env/llvm/tools/clang/test/Analysis/plist-macros-with-expansion.cpp</string> <string>/home/eumakri/Documents/2codechecker_dev_env/llvm/tools/clang/test/Analysis/plist-macros-with-expansion.cpp</string>
</array> </array>
</dict> </dict>
</plist> </plist>
No newline at end of file No newline at end of file

test/Analysis/plist-macros-with-expansion.cpp

// RUN: %clang_analyze_cc1 -analyzer-checker=core -verify %s // RUN: %clang_analyze_cc1 -analyzer-checker=core -verify %s
// //
// RUN: %clang_analyze_cc1 -analyzer-checker=core %s \ // RUN: %clang_analyze_cc1 -analyzer-checker=core %s \
// RUN: -analyzer-output=plist -o %t.plist \ // RUN: -analyzer-output=plist -o %t.plist \
// RUN: -analyzer-config expand-macros=true // RUN: -analyzer-config expand-macros=true
// //
// Check the actual plist output. // Check the actual plist output.
// RUN: cat %t.plist | %diff_plist \ // RUN: cat %t.plist | %diff_plist \
// RUN: %S/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist // RUN: %S/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist
// //
// Check the macro expansions from the plist output here, to make the test more // Check the macro expansions from the plist output here, to make the test more
// understandable. // understandable.
// RUN: FileCheck --input-file=%t.plist %s // RUN: FileCheck --input-file=%t.plist %s
//
// RUN: %clang_analyze_cc1 -analyzer-checker=core %s \
// RUN: -analyzer-output=plist -o %t-as-events.plist \
// RUN: -analyzer-config expand-macros=true \
// RUN: -analyzer-config expand-macros-as-events=true
//
// We're only interested in the generated plist file in this case.
// RUN: cat %t-as-events.plist | %diff_plist \
// RUN: %S/Inputs/expected-plists/plist-macros-with-expansion.cpp-as-events.plist
void print(const void*); void print(const void*);
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Tests for non-function-like macro expansions. // Tests for non-function-like macro expansions.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#define SET_PTR_VAR_TO_NULL \ #define SET_PTR_VAR_TO_NULL \
Show All 23 Lines