bruntib updated this revision to Diff 185971. bruntib added a comment. There was another place where this crash could have happened.
CHANGES SINCE LAST ACTION https://reviews.llvm.org/D57893/new/ https://reviews.llvm.org/D57893 Files: lib/StaticAnalyzer/Core/PlistDiagnostics.cpp test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist test/Analysis/plist-macros-with-expansion.cpp
Index: test/Analysis/plist-macros-with-expansion.cpp =================================================================== --- test/Analysis/plist-macros-with-expansion.cpp +++ test/Analysis/plist-macros-with-expansion.cpp @@ -441,3 +441,17 @@ } // CHECK: <key>name</key><string>YET_ANOTHER_SET_TO_NULL</string> // CHECK-NEXT: <key>expansion</key><string>print((void *)5); print((void *)"Remember the Vasa"); ptr = nullptr;</string> + +#define FOO(x) int foo() { return x; } +#define APPLY_ZERO1(function) function(0) +#define BAR(x) int bar() { return x; } +#define APPLY_ZERO2 BAR(0) +APPLY_ZERO1(FOO) +APPLY_ZERO2 +void useZeroApplier1() { (void)(1 / foo()); } // expected-warning{{Division by zero}} +void useZeroApplier2() { (void)(1 / bar()); } // expected-warning{{Division by zero}} + +// CHECK: <key>name</key><string>APPLY_ZERO1</string> +// CHECK-NEXT: <key>expansion</key><string>int foo() { return x; }(0)</string> +// CHECK: <key>name</key><string>APPLY_ZERO2</string> +// CHECK-NEXT: <key>expansion</key><string>int bar() { return 0; }</string> Index: test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist =================================================================== --- test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist +++ test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist @@ -5168,6 +5168,468 @@ <key>file</key><integer>0</integer> </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>451</integer> + <key>col</key><integer>33</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>33</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + <key>end</key> + <array> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>451</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>451</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <key>ranges</key> + <array> + <array> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>41</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + </array> + <key>depth</key><integer>0</integer> + <key>extended_message</key> + <string>Calling 'foo'</string> + <key>message</key> + <string>Calling 'foo'</string> + </dict> + <dict> + <key>kind</key><string>event</string> + <key>location</key> + <dict> + <key>line</key><integer>449</integer> + <key>col</key><integer>1</integer> + <key>file</key><integer>0</integer> + </dict> + <key>depth</key><integer>1</integer> + <key>extended_message</key> + <string>Entered call from 'useZeroApplier1'</string> + <key>message</key> + <string>Entered call from 'useZeroApplier1'</string> + </dict> + <dict> + <key>kind</key><string>event</string> + <key>location</key> + <dict> + <key>line</key><integer>449</integer> + <key>col</key><integer>1</integer> + <key>file</key><integer>0</integer> + </dict> + <key>ranges</key> + <array> + <array> + <dict> + <key>line</key><integer>449</integer> + <key>col</key><integer>1</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>449</integer> + <key>col</key><integer>16</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + </array> + <key>depth</key><integer>1</integer> + <key>extended_message</key> + <string>Returning zero</string> + <key>message</key> + <string>Returning zero</string> + </dict> + <dict> + <key>kind</key><string>event</string> + <key>location</key> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <key>ranges</key> + <array> + <array> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>41</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + </array> + <key>depth</key><integer>0</integer> + <key>extended_message</key> + <string>Returning from 'foo'</string> + <key>message</key> + <string>Returning from 'foo'</string> + </dict> + <dict> + <key>kind</key><string>control</string> + <key>edges</key> + <array> + <dict> + <key>start</key> + <array> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>39</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + <key>end</key> + <array> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>35</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>35</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>451</integer> + <key>col</key><integer>35</integer> + <key>file</key><integer>0</integer> + </dict> + <key>ranges</key> + <array> + <array> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>33</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>41</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + </array> + <key>depth</key><integer>0</integer> + <key>extended_message</key> + <string>Division by zero</string> + <key>message</key> + <string>Division by zero</string> + </dict> + </array> + <key>macro_expansions</key> + <array> + <dict> + <key>location</key> + <dict> + <key>line</key><integer>449</integer> + <key>col</key><integer>1</integer> + <key>file</key><integer>0</integer> + </dict> + <key>name</key><string>APPLY_ZERO1</string> + <key>expansion</key><string>int foo() { return x; }(0)</string> + </dict> + </array> + <key>description</key><string>Division by zero</string> + <key>category</key><string>Logic error</string> + <key>type</key><string>Division by zero</string> + <key>check_name</key><string>core.DivideZero</string> + <!-- This hash is experimental and going to change! --> + <key>issue_hash_content_of_line_in_context</key><string>7ff82561a6c752746649d05220deeb40</string> + <key>issue_context_kind</key><string>function</string> + <key>issue_context</key><string>useZeroApplier1</string> + <key>issue_hash_function_offset</key><string>0</string> + <key>location</key> + <dict> + <key>line</key><integer>451</integer> + <key>col</key><integer>35</integer> + <key>file</key><integer>0</integer> + </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>452</integer> + <key>col</key><integer>33</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>33</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + <key>end</key> + <array> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>452</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>452</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <key>ranges</key> + <array> + <array> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>41</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + </array> + <key>depth</key><integer>0</integer> + <key>extended_message</key> + <string>Calling 'bar'</string> + <key>message</key> + <string>Calling 'bar'</string> + </dict> + <dict> + <key>kind</key><string>event</string> + <key>location</key> + <dict> + <key>line</key><integer>450</integer> + <key>col</key><integer>1</integer> + <key>file</key><integer>0</integer> + </dict> + <key>depth</key><integer>1</integer> + <key>extended_message</key> + <string>Entered call from 'useZeroApplier2'</string> + <key>message</key> + <string>Entered call from 'useZeroApplier2'</string> + </dict> + <dict> + <key>kind</key><string>event</string> + <key>location</key> + <dict> + <key>line</key><integer>450</integer> + <key>col</key><integer>1</integer> + <key>file</key><integer>0</integer> + </dict> + <key>ranges</key> + <array> + <array> + <dict> + <key>line</key><integer>450</integer> + <key>col</key><integer>1</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>450</integer> + <key>col</key><integer>11</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + </array> + <key>depth</key><integer>1</integer> + <key>extended_message</key> + <string>Returning zero</string> + <key>message</key> + <string>Returning zero</string> + </dict> + <dict> + <key>kind</key><string>event</string> + <key>location</key> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <key>ranges</key> + <array> + <array> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>41</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + </array> + <key>depth</key><integer>0</integer> + <key>extended_message</key> + <string>Returning from 'bar'</string> + <key>message</key> + <string>Returning from 'bar'</string> + </dict> + <dict> + <key>kind</key><string>control</string> + <key>edges</key> + <array> + <dict> + <key>start</key> + <array> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>37</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>39</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + <key>end</key> + <array> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>35</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>35</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>452</integer> + <key>col</key><integer>35</integer> + <key>file</key><integer>0</integer> + </dict> + <key>ranges</key> + <array> + <array> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>33</integer> + <key>file</key><integer>0</integer> + </dict> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>41</integer> + <key>file</key><integer>0</integer> + </dict> + </array> + </array> + <key>depth</key><integer>0</integer> + <key>extended_message</key> + <string>Division by zero</string> + <key>message</key> + <string>Division by zero</string> + </dict> + </array> + <key>macro_expansions</key> + <array> + <dict> + <key>location</key> + <dict> + <key>line</key><integer>450</integer> + <key>col</key><integer>1</integer> + <key>file</key><integer>0</integer> + </dict> + <key>name</key><string>APPLY_ZERO2</string> + <key>expansion</key><string>int bar() { return 0; }</string> + </dict> + </array> + <key>description</key><string>Division by zero</string> + <key>category</key><string>Logic error</string> + <key>type</key><string>Division by zero</string> + <key>check_name</key><string>core.DivideZero</string> + <!-- This hash is experimental and going to change! --> + <key>issue_hash_content_of_line_in_context</key><string>dd82c11b436b00009e37f54b1620a728</string> + <key>issue_context_kind</key><string>function</string> + <key>issue_context</key><string>useZeroApplier2</string> + <key>issue_hash_function_offset</key><string>0</string> + <key>location</key> + <dict> + <key>line</key><integer>452</integer> + <key>col</key><integer>35</integer> + <key>file</key><integer>0</integer> + </dict> + </dict> </array> </dict> </plist> Index: lib/StaticAnalyzer/Core/PlistDiagnostics.cpp =================================================================== --- lib/StaticAnalyzer/Core/PlistDiagnostics.cpp +++ lib/StaticAnalyzer/Core/PlistDiagnostics.cpp @@ -851,7 +851,7 @@ // If this is a function-like macro, skip its arguments, as // getExpandedMacro() already printed them. If this is the case, let's // first jumo to the '(' token. - if (MI->getNumParams() != 0) + if (std::next(It)->is(tok::l_paren)) It = getMatchingRParen(++It, E); continue; } @@ -879,7 +879,15 @@ getMacroNameAndPrintExpansion(Printer, ArgIt->getLocation(), PP, Info.Args, AlreadyProcessedTokens); - if (MI->getNumParams() != 0) + // Peek the next token if it is a tok::l_paren. This way we can decide + // if this is the application or just a reference to a function maxro + // symbol: + // + // #define apply(f) ... + // #define func(x) ... + // apply(func) + // apply(func(42)) + if (std::next(ArgIt)->is(tok::l_paren)) ArgIt = getMatchingRParen(++ArgIt, ArgEnd); } continue;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits