Index: include/clang/StaticAnalyzer/Core/AnalyzerOptions.h =================================================================== --- include/clang/StaticAnalyzer/Core/AnalyzerOptions.h +++ include/clang/StaticAnalyzer/Core/AnalyzerOptions.h @@ -315,6 +315,9 @@ /// \sa shouldDisplayMacroExpansions Optional DisplayMacroExpansions; + /// \sa shouldDisplayMacroExpansionsAsEvents + Optional DisplayMacroExpansionsAsEvents; + /// \sa shouldAggressivelySimplifyBinaryOperation Optional AggressiveBinaryOperationSimplification; @@ -697,6 +700,13 @@ /// when unset. 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 /// 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 Index: lib/StaticAnalyzer/Core/AnalyzerOptions.cpp =================================================================== --- lib/StaticAnalyzer/Core/AnalyzerOptions.cpp +++ lib/StaticAnalyzer/Core/AnalyzerOptions.cpp @@ -472,6 +472,13 @@ return DisplayMacroExpansions.getValue(); } +bool AnalyzerOptions::shouldDisplayMacroExpansionsAsEvents() { + if (!DisplayMacroExpansionsAsEvents.hasValue()) + DisplayMacroExpansionsAsEvents = + getBooleanOption("expand-macros-as-events", /*Default=*/false); + return DisplayMacroExpansionsAsEvents.getValue(); +} + bool AnalyzerOptions::shouldAggressivelySimplifyBinaryOperation() { if (!AggressiveBinaryOperationSimplification.hasValue()) AggressiveBinaryOperationSimplification = Index: lib/StaticAnalyzer/Core/PlistDiagnostics.cpp =================================================================== --- lib/StaticAnalyzer/Core/PlistDiagnostics.cpp +++ lib/StaticAnalyzer/Core/PlistDiagnostics.cpp @@ -282,33 +282,40 @@ const SourceManager &SM = PP.getSourceManager(); ExpansionInfo EI = getExpandedMacro(P.getLocation().asLocation(), PP); - Indent(o, indent) << "\n"; - ++indent; + if (AnOpts.shouldDisplayMacroExpansionsAsEvents()) { + ReportEvent(o, PathDiagnosticEventPiece(P.getLocation(), + llvm::Twine("Expanding macro '" + EI.MacroName + "' to '" + + EI.Expansion + "'").str()), + FM, PP, indent, depth); + } else { + Indent(o, indent) << "\n"; + ++indent; - Indent(o, indent) << "kindmacro_expansion\n"; + Indent(o, indent) << "kindmacro_expansion\n"; - // Output the location. - FullSourceLoc L = P.getLocation().asLocation(); + // Output the location. + FullSourceLoc L = P.getLocation().asLocation(); - Indent(o, indent) << "location\n"; - EmitLocation(o, SM, L, FM, indent); + Indent(o, indent) << "location\n"; + EmitLocation(o, SM, L, FM, indent); - // Output the ranges (if any). - ArrayRef Ranges = P.getRanges(); - EmitRanges(o, Ranges, FM, PP, indent); + // Output the ranges (if any). + ArrayRef Ranges = P.getRanges(); + EmitRanges(o, Ranges, FM, PP, indent); - // Output the macro name. - Indent(o, indent) << "name"; - EmitString(o, EI.MacroName) << '\n'; + // Output the macro name. + Indent(o, indent) << "name"; + EmitString(o, EI.MacroName) << '\n'; - // Output what it expands into. - Indent(o, indent) << "expansion"; - EmitString(o, EI.Expansion) << '\n'; + // Output what it expands into. + Indent(o, indent) << "expansion"; + EmitString(o, EI.Expansion) << '\n'; - // Finish up. - --indent; - Indent(o, indent); - o << "\n"; + // Finish up. + --indent; + Indent(o, indent); + o << "\n"; + } for (PathPieces::const_iterator I = P.subPieces.begin(), E = P.subPieces.end(); Index: test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp-as-events.plist =================================================================== --- /dev/null +++ test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp-as-events.plist @@ -0,0 +1,4452 @@ + + + + + diagnostics + + + path + + + kindcontrol + edges + + + start + + + line34 + col3 + file0 + + + line34 + col5 + file0 + + + end + + + line35 + col3 + file0 + + + line35 + col21 + file0 + + + + + + + kindevent + location + + line35 + col3 + file0 + + depth0 + extended_message + Expanding macro 'SET_PTR_VAR_TO_NULL' to 'ptr = 0' + message + Expanding macro 'SET_PTR_VAR_TO_NULL' to 'ptr = 0' + + + kindevent + location + + line35 + col3 + file0 + + ranges + + + + line35 + col3 + file0 + + + line35 + col21 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'ptr' + message + Null pointer value stored to 'ptr' + + + kindcontrol + edges + + + start + + + line36 + col3 + file0 + + + line36 + col3 + file0 + + + end + + + line36 + col8 + file0 + + + line36 + col8 + file0 + + + + + + + kindevent + location + + line36 + col8 + file0 + + ranges + + + + line36 + col4 + file0 + + + line36 + col6 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_contextf8fbc46cc5afbb056d92bd3d3d702781 + issue_context_kindfunction + issue_contextnonFunctionLikeMacroTest + issue_hash_function_offset3 + location + + line36 + col8 + file0 + + ExecutedLines + + 0 + + 33 + 34 + 35 + 36 + + + + + path + + + kindcontrol + edges + + + start + + + line47 + col3 + file0 + + + line47 + col5 + file0 + + + end + + + line48 + col3 + file0 + + + line48 + col39 + file0 + + + + + + + kindevent + location + + line48 + col3 + file0 + + depth0 + extended_message + Expanding macro 'SET_PTR_VAR_TO_NULL_WITH_NESTED_MACRO' to 'ptr =0' + message + Expanding macro 'SET_PTR_VAR_TO_NULL_WITH_NESTED_MACRO' to 'ptr =0' + + + kindevent + location + + line48 + col3 + file0 + + ranges + + + + line48 + col3 + file0 + + + line48 + col39 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'ptr' + message + Null pointer value stored to 'ptr' + + + kindcontrol + edges + + + start + + + line49 + col3 + file0 + + + line49 + col3 + file0 + + + end + + + line49 + col8 + file0 + + + line49 + col8 + file0 + + + + + + + kindevent + location + + line49 + col8 + file0 + + ranges + + + + line49 + col4 + file0 + + + line49 + col6 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_contextd5eba61193b41c27fc7b2705cbd607ba + issue_context_kindfunction + issue_contextnonFunctionLikeNestedMacroTest + issue_hash_function_offset3 + location + + line49 + col8 + file0 + + ExecutedLines + + 0 + + 46 + 47 + 48 + 49 + + + + + path + + + kindcontrol + edges + + + start + + + line67 + col3 + file0 + + + line67 + col5 + file0 + + + end + + + line68 + col3 + file0 + + + line68 + col9 + file0 + + + + + + + kindevent + location + + line68 + col3 + file0 + + depth0 + extended_message + Expanding macro 'TO_NULL' to 'setToNull(&ptr)' + message + Expanding macro 'TO_NULL' to 'setToNull(&ptr)' + + + kindevent + location + + line68 + col3 + file0 + + ranges + + + + line68 + col3 + file0 + + + line68 + col15 + file0 + + + + depth0 + extended_message + Calling 'setToNull' + message + Calling 'setToNull' + + + kindevent + location + + line59 + col1 + file0 + + depth1 + extended_message + Entered call from 'functionLikeMacroTest' + message + Entered call from 'functionLikeMacroTest' + + + kindcontrol + edges + + + start + + + line59 + col1 + file0 + + + line59 + col4 + file0 + + + end + + + line60 + col3 + file0 + + + line60 + col3 + file0 + + + + + + + kindevent + location + + line60 + col3 + file0 + + ranges + + + + line60 + col3 + file0 + + + line60 + col17 + file0 + + + + depth1 + extended_message + Null pointer value stored to 'ptr' + message + Null pointer value stored to 'ptr' + + + kindevent + location + + line68 + col3 + file0 + + ranges + + + + line68 + col3 + file0 + + + line68 + col15 + file0 + + + + depth0 + extended_message + Returning from 'setToNull' + message + Returning from 'setToNull' + + + kindcontrol + edges + + + start + + + line69 + col3 + file0 + + + line69 + col3 + file0 + + + end + + + line69 + col8 + file0 + + + line69 + col8 + file0 + + + + + + + kindevent + location + + line69 + col8 + file0 + + ranges + + + + line69 + col4 + file0 + + + line69 + col6 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_context370a457744311752aac789447b4ef16c + issue_context_kindfunction + issue_contextfunctionLikeMacroTest + issue_hash_function_offset3 + location + + line69 + col8 + file0 + + ExecutedLines + + 0 + + 59 + 60 + 66 + 67 + 68 + 69 + + + + + path + + + kindcontrol + edges + + + start + + + line87 + col3 + file0 + + + line87 + col5 + file0 + + + end + + + line88 + col3 + file0 + + + line88 + col9 + file0 + + + + + + + kindevent + location + + line88 + col3 + file0 + + depth0 + extended_message + Expanding macro 'TO_NULL' to 'setToNull(&a)' + message + Expanding macro 'TO_NULL' to 'setToNull(&a)' + + + kindevent + location + + line88 + col3 + file0 + + ranges + + + + line88 + col3 + file0 + + + line88 + col13 + file0 + + + + depth0 + extended_message + Calling 'setToNull' + message + Calling 'setToNull' + + + kindevent + location + + line59 + col1 + file0 + + depth1 + extended_message + Entered call from 'functionLikeNestedMacroTest' + message + Entered call from 'functionLikeNestedMacroTest' + + + kindcontrol + edges + + + start + + + line59 + col1 + file0 + + + line59 + col4 + file0 + + + end + + + line60 + col3 + file0 + + + line60 + col3 + file0 + + + + + + + kindevent + location + + line60 + col3 + file0 + + ranges + + + + line60 + col3 + file0 + + + line60 + col17 + file0 + + + + depth1 + extended_message + Null pointer value stored to 'a' + message + Null pointer value stored to 'a' + + + kindevent + location + + line88 + col3 + file0 + + ranges + + + + line88 + col3 + file0 + + + line88 + col13 + file0 + + + + depth0 + extended_message + Returning from 'setToNull' + message + Returning from 'setToNull' + + + kindevent + location + + line89 + col3 + file0 + + depth0 + extended_message + Expanding macro 'DEREF' to '{ int b; b = 5; } print(a); *a' + message + Expanding macro 'DEREF' to '{ int b; b = 5; } print(a); *a' + + + kindevent + location + + line89 + col12 + file0 + + ranges + + + + line89 + col3 + file0 + + + line89 + col10 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'a') + message + Dereference of null pointer (loaded from variable 'a') + + + descriptionDereference of null pointer (loaded from variable 'a') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_context873802674657bba4565f64c7bbf0ded9 + issue_context_kindfunction + issue_contextfunctionLikeNestedMacroTest + issue_hash_function_offset3 + location + + line89 + col12 + file0 + + ExecutedLines + + 0 + + 59 + 60 + 86 + 87 + 88 + 89 + + + + + path + + + kindcontrol + edges + + + start + + + line114 + col3 + file0 + + + line114 + col5 + file0 + + + end + + + line115 + col3 + file0 + + + line115 + col19 + file0 + + + + + + + kindevent + location + + line115 + col3 + file0 + + depth0 + extended_message + Expanding macro 'TO_NULL_AND_PRINT' to 'a = 0; print( "Will this , cause a crash?")' + message + Expanding macro 'TO_NULL_AND_PRINT' to 'a = 0; print( "Will this , cause a crash?")' + + + kindevent + location + + line115 + col3 + file0 + + ranges + + + + line115 + col3 + file0 + + + line115 + col52 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'a' + message + Null pointer value stored to 'a' + + + kindcontrol + edges + + + start + + + line116 + col3 + file0 + + + line116 + col3 + file0 + + + end + + + line116 + col6 + file0 + + + line116 + col6 + file0 + + + + + + + kindevent + location + + line116 + col6 + file0 + + ranges + + + + line116 + col4 + file0 + + + line116 + col4 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'a') + message + Dereference of null pointer (loaded from variable 'a') + + + descriptionDereference of null pointer (loaded from variable 'a') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_context7a7344244350405a514682fe228e304e + issue_context_kindfunction + issue_contextmacroArgContainsCommaInStringTest + issue_hash_function_offset3 + location + + line116 + col6 + file0 + + ExecutedLines + + 0 + + 113 + 114 + 115 + 116 + + + + + path + + + kindcontrol + edges + + + start + + + line123 + col3 + file0 + + + line123 + col5 + file0 + + + end + + + line124 + col3 + file0 + + + line124 + col19 + file0 + + + + + + + kindevent + location + + line124 + col3 + file0 + + depth0 + extended_message + Expanding macro 'TO_NULL_AND_PRINT' to 'a = 0; print( "Will this ( cause a crash?")' + message + Expanding macro 'TO_NULL_AND_PRINT' to 'a = 0; print( "Will this ( cause a crash?")' + + + kindevent + location + + line124 + col3 + file0 + + ranges + + + + line124 + col3 + file0 + + + line124 + col52 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'a' + message + Null pointer value stored to 'a' + + + kindcontrol + edges + + + start + + + line125 + col3 + file0 + + + line125 + col3 + file0 + + + end + + + line125 + col6 + file0 + + + line125 + col6 + file0 + + + + + + + kindevent + location + + line125 + col6 + file0 + + ranges + + + + line125 + col4 + file0 + + + line125 + col4 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'a') + message + Dereference of null pointer (loaded from variable 'a') + + + descriptionDereference of null pointer (loaded from variable 'a') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_context1d6d14e3f566cec02bd1f3542e3c8044 + issue_context_kindfunction + issue_contextmacroArgContainsLParenInStringTest + issue_hash_function_offset3 + location + + line125 + col6 + file0 + + ExecutedLines + + 0 + + 122 + 123 + 124 + 125 + + + + + path + + + kindcontrol + edges + + + start + + + line132 + col3 + file0 + + + line132 + col5 + file0 + + + end + + + line133 + col3 + file0 + + + line133 + col19 + file0 + + + + + + + kindevent + location + + line133 + col3 + file0 + + depth0 + extended_message + Expanding macro 'TO_NULL_AND_PRINT' to 'a = 0; print( "Will this ) cause a crash?")' + message + Expanding macro 'TO_NULL_AND_PRINT' to 'a = 0; print( "Will this ) cause a crash?")' + + + kindevent + location + + line133 + col3 + file0 + + ranges + + + + line133 + col3 + file0 + + + line133 + col52 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'a' + message + Null pointer value stored to 'a' + + + kindcontrol + edges + + + start + + + line134 + col3 + file0 + + + line134 + col3 + file0 + + + end + + + line134 + col6 + file0 + + + line134 + col6 + file0 + + + + + + + kindevent + location + + line134 + col6 + file0 + + ranges + + + + line134 + col4 + file0 + + + line134 + col4 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'a') + message + Dereference of null pointer (loaded from variable 'a') + + + descriptionDereference of null pointer (loaded from variable 'a') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_context7354d762d71f0d0a3ffc9d6d827fe580 + issue_context_kindfunction + issue_contextmacroArgContainsRParenInStringTest + issue_hash_function_offset3 + location + + line134 + col6 + file0 + + ExecutedLines + + 0 + + 131 + 132 + 133 + 134 + + + + + path + + + kindcontrol + edges + + + start + + + line146 + col3 + file0 + + + line146 + col5 + file0 + + + end + + + line147 + col3 + file0 + + + line147 + col15 + file0 + + + + + + + kindevent + location + + line147 + col3 + file0 + + depth0 + extended_message + Expanding macro 'CALL_FUNCTION' to 'setToNull(&a)' + message + Expanding macro 'CALL_FUNCTION' to 'setToNull(&a)' + + + kindevent + location + + line147 + col3 + file0 + + ranges + + + + line147 + col3 + file0 + + + line147 + col30 + file0 + + + + depth0 + extended_message + Calling 'setToNull' + message + Calling 'setToNull' + + + kindevent + location + + line59 + col1 + file0 + + depth1 + extended_message + Entered call from 'macroArgContainsLParenRParenTest' + message + Entered call from 'macroArgContainsLParenRParenTest' + + + kindcontrol + edges + + + start + + + line59 + col1 + file0 + + + line59 + col4 + file0 + + + end + + + line60 + col3 + file0 + + + line60 + col3 + file0 + + + + + + + kindevent + location + + line60 + col3 + file0 + + ranges + + + + line60 + col3 + file0 + + + line60 + col17 + file0 + + + + depth1 + extended_message + Null pointer value stored to 'a' + message + Null pointer value stored to 'a' + + + kindevent + location + + line147 + col3 + file0 + + ranges + + + + line147 + col3 + file0 + + + line147 + col30 + file0 + + + + depth0 + extended_message + Returning from 'setToNull' + message + Returning from 'setToNull' + + + kindcontrol + edges + + + start + + + line148 + col3 + file0 + + + line148 + col3 + file0 + + + end + + + line148 + col6 + file0 + + + line148 + col6 + file0 + + + + + + + kindevent + location + + line148 + col6 + file0 + + ranges + + + + line148 + col4 + file0 + + + line148 + col4 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'a') + message + Dereference of null pointer (loaded from variable 'a') + + + descriptionDereference of null pointer (loaded from variable 'a') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_contextf00b6f77288a374e864a58609e9a42ea + issue_context_kindfunction + issue_contextmacroArgContainsLParenRParenTest + issue_hash_function_offset3 + location + + line148 + col6 + file0 + + ExecutedLines + + 0 + + 59 + 60 + 145 + 146 + 147 + 148 + + + + + path + + + kindcontrol + edges + + + start + + + line160 + col3 + file0 + + + line160 + col5 + file0 + + + end + + + line161 + col3 + file0 + + + line161 + col15 + file0 + + + + + + + kindevent + location + + line161 + col3 + file0 + + depth0 + extended_message + Expanding macro 'CALL_FUNCTION' to 'setToNullAndPrint(&a, "Hello!")' + message + Expanding macro 'CALL_FUNCTION' to 'setToNullAndPrint(&a, "Hello!")' + + + kindevent + location + + line161 + col3 + file0 + + ranges + + + + line161 + col3 + file0 + + + line161 + col48 + file0 + + + + depth0 + extended_message + Calling 'setToNullAndPrint' + message + Calling 'setToNullAndPrint' + + + kindevent + location + + line154 + col1 + file0 + + depth1 + extended_message + Entered call from 'macroArgContainsCommaLParenRParenTest' + message + Entered call from 'macroArgContainsCommaLParenRParenTest' + + + kindcontrol + edges + + + start + + + line154 + col1 + file0 + + + line154 + col4 + file0 + + + end + + + line155 + col3 + file0 + + + line155 + col11 + file0 + + + + + + + kindevent + location + + line155 + col3 + file0 + + ranges + + + + line155 + col3 + file0 + + + line155 + col17 + file0 + + + + depth1 + extended_message + Calling 'setToNull' + message + Calling 'setToNull' + + + kindevent + location + + line59 + col1 + file0 + + depth2 + extended_message + Entered call from 'setToNullAndPrint' + message + Entered call from 'setToNullAndPrint' + + + kindcontrol + edges + + + start + + + line59 + col1 + file0 + + + line59 + col4 + file0 + + + end + + + line60 + col3 + file0 + + + line60 + col3 + file0 + + + + + + + kindevent + location + + line60 + col3 + file0 + + ranges + + + + line60 + col3 + file0 + + + line60 + col17 + file0 + + + + depth2 + extended_message + Null pointer value stored to 'a' + message + Null pointer value stored to 'a' + + + kindevent + location + + line155 + col3 + file0 + + ranges + + + + line155 + col3 + file0 + + + line155 + col17 + file0 + + + + depth1 + extended_message + Returning from 'setToNull' + message + Returning from 'setToNull' + + + kindcontrol + edges + + + start + + + line155 + col3 + file0 + + + line155 + col11 + file0 + + + end + + + line156 + col3 + file0 + + + line156 + col7 + file0 + + + + + + + kindevent + location + + line161 + col3 + file0 + + ranges + + + + line161 + col3 + file0 + + + line161 + col48 + file0 + + + + depth0 + extended_message + Returning from 'setToNullAndPrint' + message + Returning from 'setToNullAndPrint' + + + kindcontrol + edges + + + start + + + line162 + col3 + file0 + + + line162 + col3 + file0 + + + end + + + line162 + col6 + file0 + + + line162 + col6 + file0 + + + + + + + kindevent + location + + line162 + col6 + file0 + + ranges + + + + line162 + col4 + file0 + + + line162 + col4 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'a') + message + Dereference of null pointer (loaded from variable 'a') + + + descriptionDereference of null pointer (loaded from variable 'a') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_contextc5805abeb71bb4edb41b49ab317439b9 + issue_context_kindfunction + issue_contextmacroArgContainsCommaLParenRParenTest + issue_hash_function_offset3 + location + + line162 + col6 + file0 + + ExecutedLines + + 0 + + 59 + 60 + 154 + 155 + 156 + 159 + 160 + 161 + 162 + + + + + path + + + kindcontrol + edges + + + start + + + line172 + col3 + file0 + + + line172 + col5 + file0 + + + end + + + line173 + col3 + file0 + + + line173 + col31 + file0 + + + + + + + kindevent + location + + line173 + col3 + file0 + + depth0 + extended_message + Expanding macro 'CALL_FUNCTION_WITH_TWO_PARAMS' to 'setToNullAndPrint( &a, "Hello!")' + message + Expanding macro 'CALL_FUNCTION_WITH_TWO_PARAMS' to 'setToNullAndPrint( &a, "Hello!")' + + + kindevent + location + + line173 + col3 + file0 + + ranges + + + + line173 + col3 + file0 + + + line173 + col64 + file0 + + + + depth0 + extended_message + Calling 'setToNullAndPrint' + message + Calling 'setToNullAndPrint' + + + kindevent + location + + line154 + col1 + file0 + + depth1 + extended_message + Entered call from 'macroArgContainsCommaLParenRParenTest2' + message + Entered call from 'macroArgContainsCommaLParenRParenTest2' + + + kindcontrol + edges + + + start + + + line154 + col1 + file0 + + + line154 + col4 + file0 + + + end + + + line155 + col3 + file0 + + + line155 + col11 + file0 + + + + + + + kindevent + location + + line155 + col3 + file0 + + ranges + + + + line155 + col3 + file0 + + + line155 + col17 + file0 + + + + depth1 + extended_message + Calling 'setToNull' + message + Calling 'setToNull' + + + kindevent + location + + line59 + col1 + file0 + + depth2 + extended_message + Entered call from 'setToNullAndPrint' + message + Entered call from 'setToNullAndPrint' + + + kindcontrol + edges + + + start + + + line59 + col1 + file0 + + + line59 + col4 + file0 + + + end + + + line60 + col3 + file0 + + + line60 + col3 + file0 + + + + + + + kindevent + location + + line60 + col3 + file0 + + ranges + + + + line60 + col3 + file0 + + + line60 + col17 + file0 + + + + depth2 + extended_message + Null pointer value stored to 'a' + message + Null pointer value stored to 'a' + + + kindevent + location + + line155 + col3 + file0 + + ranges + + + + line155 + col3 + file0 + + + line155 + col17 + file0 + + + + depth1 + extended_message + Returning from 'setToNull' + message + Returning from 'setToNull' + + + kindcontrol + edges + + + start + + + line155 + col3 + file0 + + + line155 + col11 + file0 + + + end + + + line156 + col3 + file0 + + + line156 + col7 + file0 + + + + + + + kindevent + location + + line173 + col3 + file0 + + ranges + + + + line173 + col3 + file0 + + + line173 + col64 + file0 + + + + depth0 + extended_message + Returning from 'setToNullAndPrint' + message + Returning from 'setToNullAndPrint' + + + kindcontrol + edges + + + start + + + line174 + col3 + file0 + + + line174 + col3 + file0 + + + end + + + line174 + col6 + file0 + + + line174 + col6 + file0 + + + + + + + kindevent + location + + line174 + col6 + file0 + + ranges + + + + line174 + col4 + file0 + + + line174 + col4 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'a') + message + Dereference of null pointer (loaded from variable 'a') + + + descriptionDereference of null pointer (loaded from variable 'a') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_context4014a22ef054933e6ce9be43623ea85e + issue_context_kindfunction + issue_contextmacroArgContainsCommaLParenRParenTest2 + issue_hash_function_offset3 + location + + line174 + col6 + file0 + + ExecutedLines + + 0 + + 59 + 60 + 154 + 155 + 156 + 171 + 172 + 173 + 174 + + + + + path + + + kindcontrol + edges + + + start + + + line184 + col3 + file0 + + + line184 + col5 + file0 + + + end + + + line188 + col3 + file0 + + + line188 + col13 + file0 + + + + + + + kindevent + location + + line188 + col3 + file0 + + depth0 + extended_message + Expanding macro 'CALL_LAMBDA' to '([&ptr, str] () mutable { TO_NULL(&ptr); })()' + message + Expanding macro 'CALL_LAMBDA' to '([&ptr, str] () mutable { TO_NULL(&ptr); })()' + + + kindevent + location + + line188 + col3 + file0 + + ranges + + + + line188 + col3 + file0 + + + line188 + col58 + file0 + + + + depth0 + extended_message + Calling 'operator()' + message + Calling 'operator()' + + + kindevent + location + + line188 + col3 + file0 + + depth1 + extended_message + Entered call from 'commaInBracketsTest' + message + Entered call from 'commaInBracketsTest' + + + kindevent + location + + line188 + col3 + file0 + + depth1 + extended_message + Expanding macro 'CALL_LAMBDA' to '([&ptr, str] () mutable { TO_NULL(&ptr); })()' + message + Expanding macro 'CALL_LAMBDA' to '([&ptr, str] () mutable { TO_NULL(&ptr); })()' + + + kindevent + location + + line188 + col3 + file0 + + ranges + + + + line188 + col3 + file0 + + + line188 + col58 + file0 + + + + depth1 + extended_message + Calling 'setToNull' + message + Calling 'setToNull' + + + kindevent + location + + line59 + col1 + file0 + + depth2 + extended_message + Entered call from 'operator()' + message + Entered call from 'operator()' + + + kindcontrol + edges + + + start + + + line59 + col1 + file0 + + + line59 + col4 + file0 + + + end + + + line60 + col3 + file0 + + + line60 + col3 + file0 + + + + + + + kindevent + location + + line60 + col3 + file0 + + ranges + + + + line60 + col3 + file0 + + + line60 + col17 + file0 + + + + depth2 + extended_message + Null pointer value stored to 'ptr' + message + Null pointer value stored to 'ptr' + + + kindevent + location + + line188 + col3 + file0 + + ranges + + + + line188 + col3 + file0 + + + line188 + col58 + file0 + + + + depth1 + extended_message + Returning from 'setToNull' + message + Returning from 'setToNull' + + + kindevent + location + + line188 + col3 + file0 + + ranges + + + + line188 + col3 + file0 + + + line188 + col58 + file0 + + + + depth0 + extended_message + Returning from 'operator()' + message + Returning from 'operator()' + + + kindcontrol + edges + + + start + + + line189 + col3 + file0 + + + line189 + col3 + file0 + + + end + + + line189 + col8 + file0 + + + line189 + col8 + file0 + + + + + + + kindevent + location + + line189 + col8 + file0 + + ranges + + + + line189 + col4 + file0 + + + line189 + col6 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_contexta8918c38ddfa6a991701e7d19c9cd6bb + issue_context_kindfunction + issue_contextcommaInBracketsTest + issue_hash_function_offset6 + location + + line189 + col8 + file0 + + ExecutedLines + + 0 + + 59 + 60 + 183 + 184 + 185 + 188 + 189 + + + + + path + + + kindevent + location + + line199 + col3 + file0 + + depth0 + extended_message + Expanding macro 'PASTE_CODE' to '{ int *ptr = nullptr; *ptr = 5; }' + message + Expanding macro 'PASTE_CODE' to '{ int *ptr = nullptr; *ptr = 5; }' + + + kindevent + location + + line199 + col3 + file0 + + ranges + + + + line199 + col3 + file0 + + + line207 + col4 + file0 + + + + depth0 + extended_message + 'ptr' initialized to a null pointer value + message + 'ptr' initialized to a null pointer value + + + kindevent + location + + line199 + col3 + file0 + + ranges + + + + line199 + col3 + file0 + + + line207 + col4 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_context63042e03ae0d2f3832b141a63b1d4d49 + issue_context_kindfunction + issue_contextcommaInBracesTest + issue_hash_function_offset1 + location + + line199 + col3 + file0 + + ExecutedLines + + 0 + + 198 + 199 + + + + + path + + + kindcontrol + edges + + + start + + + line221 + col3 + file0 + + + line221 + col5 + file0 + + + end + + + line223 + col3 + file0 + + + line223 + col25 + file0 + + + + + + + kindevent + location + + line223 + col3 + file0 + + depth0 + extended_message + Expanding macro 'POTENTIALLY_EMPTY_PARAM' to ';ptr = nullptr' + message + Expanding macro 'POTENTIALLY_EMPTY_PARAM' to ';ptr = nullptr' + + + kindevent + location + + line223 + col3 + file0 + + ranges + + + + line223 + col3 + file0 + + + line223 + col31 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'ptr' + message + Null pointer value stored to 'ptr' + + + kindcontrol + edges + + + start + + + line224 + col3 + file0 + + + line224 + col3 + file0 + + + end + + + line224 + col8 + file0 + + + line224 + col8 + file0 + + + + + + + kindevent + location + + line224 + col8 + file0 + + ranges + + + + line224 + col4 + file0 + + + line224 + col6 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_contextcd980e278fbcd8f77bbeac79285084e2 + issue_context_kindfunction + issue_contextemptyParamTest + issue_hash_function_offset4 + location + + line224 + col8 + file0 + + ExecutedLines + + 0 + + 220 + 221 + 223 + 224 + + + + + path + + + kindcontrol + edges + + + start + + + line235 + col3 + file0 + + + line235 + col5 + file0 + + + end + + + line237 + col3 + file0 + + + line237 + col20 + file0 + + + + + + + kindevent + location + + line237 + col3 + file0 + + depth0 + extended_message + Expanding macro 'NESTED_EMPTY_PARAM' to '; ptr = nullptr;' + message + Expanding macro 'NESTED_EMPTY_PARAM' to '; ptr = nullptr;' + + + kindevent + location + + line237 + col3 + file0 + + ranges + + + + line237 + col3 + file0 + + + line237 + col27 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'ptr' + message + Null pointer value stored to 'ptr' + + + kindcontrol + edges + + + start + + + line238 + col3 + file0 + + + line238 + col3 + file0 + + + end + + + line238 + col8 + file0 + + + line238 + col8 + file0 + + + + + + + kindevent + location + + line238 + col8 + file0 + + ranges + + + + line238 + col4 + file0 + + + line238 + col6 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_contextf6a5f6c93b6e3734842ddabd3d5a7341 + issue_context_kindfunction + issue_contextnestedEmptyParamTest + issue_hash_function_offset4 + location + + line238 + col8 + file0 + + ExecutedLines + + 0 + + 234 + 235 + 237 + 238 + + + + + path + + + kindcontrol + edges + + + start + + + line248 + col3 + file0 + + + line248 + col5 + file0 + + + end + + + line249 + col3 + file0 + + + line249 + col44 + file0 + + + + + + + kindevent + location + + line249 + col3 + file0 + + depth0 + extended_message + Expanding macro 'CALL_FUNCTION_WITH_ONE_PARAM_THROUGH_MACRO' to 'setToNull( &ptr)' + message + Expanding macro 'CALL_FUNCTION_WITH_ONE_PARAM_THROUGH_MACRO' to 'setToNull( &ptr)' + + + kindevent + location + + line249 + col3 + file0 + + ranges + + + + line249 + col3 + file0 + + + line249 + col61 + file0 + + + + depth0 + extended_message + Calling 'setToNull' + message + Calling 'setToNull' + + + kindevent + location + + line59 + col1 + file0 + + depth1 + extended_message + Entered call from 'lParenRParenInNestedMacro' + message + Entered call from 'lParenRParenInNestedMacro' + + + kindcontrol + edges + + + start + + + line59 + col1 + file0 + + + line59 + col4 + file0 + + + end + + + line60 + col3 + file0 + + + line60 + col3 + file0 + + + + + + + kindevent + location + + line60 + col3 + file0 + + ranges + + + + line60 + col3 + file0 + + + line60 + col17 + file0 + + + + depth1 + extended_message + Null pointer value stored to 'ptr' + message + Null pointer value stored to 'ptr' + + + kindevent + location + + line249 + col3 + file0 + + ranges + + + + line249 + col3 + file0 + + + line249 + col61 + file0 + + + + depth0 + extended_message + Returning from 'setToNull' + message + Returning from 'setToNull' + + + kindcontrol + edges + + + start + + + line250 + col3 + file0 + + + line250 + col3 + file0 + + + end + + + line250 + col8 + file0 + + + line250 + col8 + file0 + + + + + + + kindevent + location + + line250 + col8 + file0 + + ranges + + + + line250 + col4 + file0 + + + line250 + col6 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_contextff00c8344e685317303e814970082d5f + issue_context_kindfunction + issue_contextlParenRParenInNestedMacro + issue_hash_function_offset3 + location + + line250 + col8 + file0 + + ExecutedLines + + 0 + + 59 + 60 + 247 + 248 + 249 + 250 + + + + + path + + + kindcontrol + edges + + + start + + + line268 + col3 + file0 + + + line268 + col5 + file0 + + + end + + + line269 + col3 + file0 + + + line269 + col22 + file0 + + + + + + + kindevent + location + + line269 + col3 + file0 + + depth0 + extended_message + Expanding macro 'VARIADIC_SET_TO_NULL' to 'ptr = nullptr; variadicFunc( 1, 5, "haha!")' + message + Expanding macro 'VARIADIC_SET_TO_NULL' to 'ptr = nullptr; variadicFunc( 1, 5, "haha!")' + + + kindevent + location + + line269 + col3 + file0 + + ranges + + + + line269 + col3 + file0 + + + line269 + col42 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'ptr' + message + Null pointer value stored to 'ptr' + + + kindcontrol + edges + + + start + + + line270 + col3 + file0 + + + line270 + col3 + file0 + + + end + + + line270 + col8 + file0 + + + line270 + col8 + file0 + + + + + + + kindevent + location + + line270 + col8 + file0 + + ranges + + + + line270 + col4 + file0 + + + line270 + col6 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_context1b0880549df23e9ce0edb60955ad5ac1 + issue_context_kindfunction + issue_contextvariadicMacroArgumentTest + issue_hash_function_offset3 + location + + line270 + col8 + file0 + + ExecutedLines + + 0 + + 267 + 268 + 269 + 270 + + + + + path + + + kindcontrol + edges + + + start + + + line285 + col3 + file0 + + + line285 + col5 + file0 + + + end + + + line286 + col3 + file0 + + + line286 + col30 + file0 + + + + + + + kindevent + location + + line286 + col3 + file0 + + depth0 + extended_message + Expanding macro 'DECLARE_FUNC_AND_SET_TO_NULL' to 'void generated_whatever(); ptr = nullptr;' + message + Expanding macro 'DECLARE_FUNC_AND_SET_TO_NULL' to 'void generated_whatever(); ptr = nullptr;' + + + kindevent + location + + line286 + col3 + file0 + + ranges + + + + line286 + col3 + file0 + + + line286 + col45 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'ptr' + message + Null pointer value stored to 'ptr' + + + kindcontrol + edges + + + start + + + line287 + col3 + file0 + + + line287 + col3 + file0 + + + end + + + line287 + col8 + file0 + + + line287 + col8 + file0 + + + + + + + kindevent + location + + line287 + col8 + file0 + + ranges + + + + line287 + col4 + file0 + + + line287 + col6 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_context453ed8096f5394e74e16f965886e5623 + issue_context_kindfunction + issue_contexthashHashOperatorTest + issue_hash_function_offset3 + location + + line287 + col8 + file0 + + ExecutedLines + + 0 + + 284 + 285 + 286 + 287 + + + + + path + + + kindcontrol + edges + + + start + + + line294 + col3 + file0 + + + line294 + col5 + file0 + + + end + + + line295 + col3 + file0 + + + line295 + col19 + file0 + + + + + + + kindevent + location + + line295 + col3 + file0 + + depth0 + extended_message + Expanding macro 'TO_NULL_AND_PRINT' to 'a = 0; print( "Will this ## cause a crash?")' + message + Expanding macro 'TO_NULL_AND_PRINT' to 'a = 0; print( "Will this ## cause a crash?")' + + + kindevent + location + + line295 + col3 + file0 + + ranges + + + + line295 + col3 + file0 + + + line295 + col53 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'a' + message + Null pointer value stored to 'a' + + + kindcontrol + edges + + + start + + + line296 + col3 + file0 + + + line296 + col3 + file0 + + + end + + + line296 + col6 + file0 + + + line296 + col6 + file0 + + + + + + + kindevent + location + + line296 + col6 + file0 + + ranges + + + + line296 + col4 + file0 + + + line296 + col4 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'a') + message + Dereference of null pointer (loaded from variable 'a') + + + descriptionDereference of null pointer (loaded from variable 'a') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_context6817572ced27cb7d28fc87b2aba75fb4 + issue_context_kindfunction + issue_contextmacroArgContainsHashHashInStringTest + issue_hash_function_offset3 + location + + line296 + col6 + file0 + + ExecutedLines + + 0 + + 293 + 294 + 295 + 296 + + + + + path + + + kindcontrol + edges + + + start + + + line307 + col3 + file0 + + + line307 + col5 + file0 + + + end + + + line308 + col3 + file0 + + + line308 + col11 + file0 + + + + + + + kindevent + location + + line308 + col3 + file0 + + depth0 + extended_message + Expanding macro 'PRINT_STR' to 'print("Hello"); ptr = nullptr' + message + Expanding macro 'PRINT_STR' to 'print("Hello"); ptr = nullptr' + + + kindevent + location + + line308 + col3 + file0 + + ranges + + + + line308 + col3 + file0 + + + line308 + col23 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'ptr' + message + Null pointer value stored to 'ptr' + + + kindcontrol + edges + + + start + + + line309 + col3 + file0 + + + line309 + col3 + file0 + + + end + + + line309 + col8 + file0 + + + line309 + col8 + file0 + + + + + + + kindevent + location + + line309 + col8 + file0 + + ranges + + + + line309 + col4 + file0 + + + line309 + col6 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'ptr') + message + Dereference of null pointer (loaded from variable 'ptr') + + + descriptionDereference of null pointer (loaded from variable 'ptr') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_contexte6947ee72df70243a3b4c9e9eaed0888 + issue_context_kindfunction + issue_contexthashOperatorTest + issue_hash_function_offset3 + location + + line309 + col8 + file0 + + ExecutedLines + + 0 + + 306 + 307 + 308 + 309 + + + + + path + + + kindcontrol + edges + + + start + + + line316 + col3 + file0 + + + line316 + col5 + file0 + + + end + + + line317 + col3 + file0 + + + line317 + col19 + file0 + + + + + + + kindevent + location + + line317 + col3 + file0 + + depth0 + extended_message + Expanding macro 'TO_NULL_AND_PRINT' to 'a = 0; print( "Will this # cause a crash?")' + message + Expanding macro 'TO_NULL_AND_PRINT' to 'a = 0; print( "Will this # cause a crash?")' + + + kindevent + location + + line317 + col3 + file0 + + ranges + + + + line317 + col3 + file0 + + + line317 + col52 + file0 + + + + depth0 + extended_message + Null pointer value stored to 'a' + message + Null pointer value stored to 'a' + + + kindcontrol + edges + + + start + + + line318 + col3 + file0 + + + line318 + col3 + file0 + + + end + + + line318 + col6 + file0 + + + line318 + col6 + file0 + + + + + + + kindevent + location + + line318 + col6 + file0 + + ranges + + + + line318 + col4 + file0 + + + line318 + col4 + file0 + + + + depth0 + extended_message + Dereference of null pointer (loaded from variable 'a') + message + Dereference of null pointer (loaded from variable 'a') + + + descriptionDereference of null pointer (loaded from variable 'a') + categoryLogic error + typeDereference of null pointer + check_namecore.NullDereference + + issue_hash_content_of_line_in_contextb1da2db423e721067ed5cfda858890be + issue_context_kindfunction + issue_contextmacroArgContainsHashInStringTest + issue_hash_function_offset3 + location + + line318 + col6 + file0 + + ExecutedLines + + 0 + + 315 + 316 + 317 + 318 + + + + + files + + /home/eumakri/Documents/2codechecker_dev_env/llvm/tools/clang/test/Analysis/plist-macros-with-expansion.cpp + + + 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 @@ -15,12 +15,12 @@ start - line25 + line34 col3 file0 - line25 + line34 col5 file0 @@ -28,12 +28,12 @@ end - line26 + line35 col3 file0 - line26 + line35 col21 file0 @@ -45,7 +45,7 @@ kindmacro_expansion location - line26 + line35 col3 file0 @@ -56,7 +56,7 @@ kindevent location - line26 + line35 col3 file0 @@ -64,12 +64,12 @@ - line26 + line35 col3 file0 - line26 + line35 col21 file0 @@ -89,12 +89,12 @@ start - line27 + line36 col3 file0 - line27 + line36 col3 file0 @@ -102,12 +102,12 @@ end - line27 + line36 col8 file0 - line27 + line36 col8 file0 @@ -119,7 +119,7 @@ kindevent location - line27 + line36 col8 file0 @@ -127,12 +127,12 @@ - line27 + line36 col4 file0 - line27 + line36 col6 file0 @@ -156,7 +156,7 @@ issue_hash_function_offset3 location - line27 + line36 col8 file0 @@ -164,10 +164,10 @@ 0 - 24 - 25 - 26 - 27 + 33 + 34 + 35 + 36 @@ -182,12 +182,12 @@ start - line38 + line47 col3 file0 - line38 + line47 col5 file0 @@ -195,12 +195,12 @@ end - line39 + line48 col3 file0 - line39 + line48 col39 file0 @@ -212,7 +212,7 @@ kindmacro_expansion location - line39 + line48 col3 file0 @@ -223,7 +223,7 @@ kindevent location - line39 + line48 col3 file0 @@ -231,12 +231,12 @@ - line39 + line48 col3 file0 - line39 + line48 col39 file0 @@ -256,12 +256,12 @@ start - line40 + line49 col3 file0 - line40 + line49 col3 file0 @@ -269,12 +269,12 @@ end - line40 + line49 col8 file0 - line40 + line49 col8 file0 @@ -286,7 +286,7 @@ kindevent location - line40 + line49 col8 file0 @@ -294,12 +294,12 @@ - line40 + line49 col4 file0 - line40 + line49 col6 file0 @@ -323,7 +323,7 @@ issue_hash_function_offset3 location - line40 + line49 col8 file0 @@ -331,10 +331,10 @@ 0 - 37 - 38 - 39 - 40 + 46 + 47 + 48 + 49 @@ -349,12 +349,12 @@ start - line58 + line67 col3 file0 - line58 + line67 col5 file0 @@ -362,12 +362,12 @@ end - line59 + line68 col3 file0 - line59 + line68 col9 file0 @@ -379,7 +379,7 @@ kindmacro_expansion location - line59 + line68 col3 file0 @@ -390,7 +390,7 @@ kindevent location - line59 + line68 col3 file0 @@ -398,12 +398,12 @@ - line59 + line68 col3 file0 - line59 + line68 col15 file0 @@ -419,7 +419,7 @@ kindevent location - line50 + line59 col1 file0 @@ -437,12 +437,12 @@ start - line50 + line59 col1 file0 - line50 + line59 col4 file0 @@ -450,12 +450,12 @@ end - line51 + line60 col3 file0 - line51 + line60 col3 file0 @@ -467,7 +467,7 @@ kindevent location - line51 + line60 col3 file0 @@ -475,12 +475,12 @@ - line51 + line60 col3 file0 - line51 + line60 col17 file0 @@ -496,7 +496,7 @@ kindevent location - line59 + line68 col3 file0 @@ -504,12 +504,12 @@ - line59 + line68 col3 file0 - line59 + line68 col15 file0 @@ -529,12 +529,12 @@ start - line60 + line69 col3 file0 - line60 + line69 col3 file0 @@ -542,12 +542,12 @@ end - line60 + line69 col8 file0 - line60 + line69 col8 file0 @@ -559,7 +559,7 @@ kindevent location - line60 + line69 col8 file0 @@ -567,12 +567,12 @@ - line60 + line69 col4 file0 - line60 + line69 col6 file0 @@ -596,7 +596,7 @@ issue_hash_function_offset3 location - line60 + line69 col8 file0 @@ -604,12 +604,12 @@ 0 - 50 - 51 - 57 - 58 59 60 + 66 + 67 + 68 + 69 @@ -624,12 +624,12 @@ start - line78 + line87 col3 file0 - line78 + line87 col5 file0 @@ -637,12 +637,12 @@ end - line79 + line88 col3 file0 - line79 + line88 col9 file0 @@ -654,7 +654,7 @@ kindmacro_expansion location - line79 + line88 col3 file0 @@ -665,7 +665,7 @@ kindevent location - line79 + line88 col3 file0 @@ -673,12 +673,12 @@ - line79 + line88 col3 file0 - line79 + line88 col13 file0 @@ -694,7 +694,7 @@ kindevent location - line50 + line59 col1 file0 @@ -712,12 +712,12 @@ start - line50 + line59 col1 file0 - line50 + line59 col4 file0 @@ -725,12 +725,12 @@ end - line51 + line60 col3 file0 - line51 + line60 col3 file0 @@ -742,7 +742,7 @@ kindevent location - line51 + line60 col3 file0 @@ -750,12 +750,12 @@ - line51 + line60 col3 file0 - line51 + line60 col17 file0 @@ -771,7 +771,7 @@ kindevent location - line79 + line88 col3 file0 @@ -779,12 +779,12 @@ - line79 + line88 col3 file0 - line79 + line88 col13 file0 @@ -800,7 +800,7 @@ kindmacro_expansion location - line80 + line89 col3 file0 @@ -811,7 +811,7 @@ kindevent location - line80 + line89 col12 file0 @@ -819,12 +819,12 @@ - line80 + line89 col3 file0 - line80 + line89 col10 file0 @@ -848,7 +848,7 @@ issue_hash_function_offset3 location - line80 + line89 col12 file0 @@ -856,12 +856,12 @@ 0 - 50 - 51 - 77 - 78 - 79 - 80 + 59 + 60 + 86 + 87 + 88 + 89 @@ -876,12 +876,12 @@ start - line105 + line114 col3 file0 - line105 + line114 col5 file0 @@ -889,12 +889,12 @@ end - line106 + line115 col3 file0 - line106 + line115 col19 file0 @@ -906,7 +906,7 @@ kindmacro_expansion location - line106 + line115 col3 file0 @@ -917,7 +917,7 @@ kindevent location - line106 + line115 col3 file0 @@ -925,12 +925,12 @@ - line106 + line115 col3 file0 - line106 + line115 col52 file0 @@ -950,12 +950,12 @@ start - line107 + line116 col3 file0 - line107 + line116 col3 file0 @@ -963,12 +963,12 @@ end - line107 + line116 col6 file0 - line107 + line116 col6 file0 @@ -980,7 +980,7 @@ kindevent location - line107 + line116 col6 file0 @@ -988,12 +988,12 @@ - line107 + line116 col4 file0 - line107 + line116 col4 file0 @@ -1017,7 +1017,7 @@ issue_hash_function_offset3 location - line107 + line116 col6 file0 @@ -1025,10 +1025,10 @@ 0 - 104 - 105 - 106 - 107 + 113 + 114 + 115 + 116 @@ -1043,12 +1043,12 @@ start - line114 + line123 col3 file0 - line114 + line123 col5 file0 @@ -1056,12 +1056,12 @@ end - line115 + line124 col3 file0 - line115 + line124 col19 file0 @@ -1073,7 +1073,7 @@ kindmacro_expansion location - line115 + line124 col3 file0 @@ -1084,7 +1084,7 @@ kindevent location - line115 + line124 col3 file0 @@ -1092,12 +1092,12 @@ - line115 + line124 col3 file0 - line115 + line124 col52 file0 @@ -1117,12 +1117,12 @@ start - line116 + line125 col3 file0 - line116 + line125 col3 file0 @@ -1130,12 +1130,12 @@ end - line116 + line125 col6 file0 - line116 + line125 col6 file0 @@ -1147,7 +1147,7 @@ kindevent location - line116 + line125 col6 file0 @@ -1155,12 +1155,12 @@ - line116 + line125 col4 file0 - line116 + line125 col4 file0 @@ -1184,7 +1184,7 @@ issue_hash_function_offset3 location - line116 + line125 col6 file0 @@ -1192,10 +1192,10 @@ 0 - 113 - 114 - 115 - 116 + 122 + 123 + 124 + 125 @@ -1210,12 +1210,12 @@ start - line123 + line132 col3 file0 - line123 + line132 col5 file0 @@ -1223,12 +1223,12 @@ end - line124 + line133 col3 file0 - line124 + line133 col19 file0 @@ -1240,7 +1240,7 @@ kindmacro_expansion location - line124 + line133 col3 file0 @@ -1251,7 +1251,7 @@ kindevent location - line124 + line133 col3 file0 @@ -1259,12 +1259,12 @@ - line124 + line133 col3 file0 - line124 + line133 col52 file0 @@ -1284,12 +1284,12 @@ start - line125 + line134 col3 file0 - line125 + line134 col3 file0 @@ -1297,12 +1297,12 @@ end - line125 + line134 col6 file0 - line125 + line134 col6 file0 @@ -1314,7 +1314,7 @@ kindevent location - line125 + line134 col6 file0 @@ -1322,12 +1322,12 @@ - line125 + line134 col4 file0 - line125 + line134 col4 file0 @@ -1351,7 +1351,7 @@ issue_hash_function_offset3 location - line125 + line134 col6 file0 @@ -1359,10 +1359,10 @@ 0 - 122 - 123 - 124 - 125 + 131 + 132 + 133 + 134 @@ -1377,12 +1377,12 @@ start - line137 + line146 col3 file0 - line137 + line146 col5 file0 @@ -1390,12 +1390,12 @@ end - line138 + line147 col3 file0 - line138 + line147 col15 file0 @@ -1407,7 +1407,7 @@ kindmacro_expansion location - line138 + line147 col3 file0 @@ -1418,7 +1418,7 @@ kindevent location - line138 + line147 col3 file0 @@ -1426,12 +1426,12 @@ - line138 + line147 col3 file0 - line138 + line147 col30 file0 @@ -1447,7 +1447,7 @@ kindevent location - line50 + line59 col1 file0 @@ -1465,12 +1465,12 @@ start - line50 + line59 col1 file0 - line50 + line59 col4 file0 @@ -1478,12 +1478,12 @@ end - line51 + line60 col3 file0 - line51 + line60 col3 file0 @@ -1495,7 +1495,7 @@ kindevent location - line51 + line60 col3 file0 @@ -1503,12 +1503,12 @@ - line51 + line60 col3 file0 - line51 + line60 col17 file0 @@ -1524,7 +1524,7 @@ kindevent location - line138 + line147 col3 file0 @@ -1532,12 +1532,12 @@ - line138 + line147 col3 file0 - line138 + line147 col30 file0 @@ -1557,12 +1557,12 @@ start - line139 + line148 col3 file0 - line139 + line148 col3 file0 @@ -1570,12 +1570,12 @@ end - line139 + line148 col6 file0 - line139 + line148 col6 file0 @@ -1587,7 +1587,7 @@ kindevent location - line139 + line148 col6 file0 @@ -1595,12 +1595,12 @@ - line139 + line148 col4 file0 - line139 + line148 col4 file0 @@ -1624,7 +1624,7 @@ issue_hash_function_offset3 location - line139 + line148 col6 file0 @@ -1632,12 +1632,12 @@ 0 - 50 - 51 - 136 - 137 - 138 - 139 + 59 + 60 + 145 + 146 + 147 + 148 @@ -1652,12 +1652,12 @@ start - line151 + line160 col3 file0 - line151 + line160 col5 file0 @@ -1665,12 +1665,12 @@ end - line152 + line161 col3 file0 - line152 + line161 col15 file0 @@ -1682,7 +1682,7 @@ kindmacro_expansion location - line152 + line161 col3 file0 @@ -1693,7 +1693,7 @@ kindevent location - line152 + line161 col3 file0 @@ -1701,12 +1701,12 @@ - line152 + line161 col3 file0 - line152 + line161 col48 file0 @@ -1722,7 +1722,7 @@ kindevent location - line145 + line154 col1 file0 @@ -1740,12 +1740,12 @@ start - line145 + line154 col1 file0 - line145 + line154 col4 file0 @@ -1753,12 +1753,12 @@ end - line146 + line155 col3 file0 - line146 + line155 col11 file0 @@ -1770,7 +1770,7 @@ kindevent location - line146 + line155 col3 file0 @@ -1778,12 +1778,12 @@ - line146 + line155 col3 file0 - line146 + line155 col17 file0 @@ -1799,7 +1799,7 @@ kindevent location - line50 + line59 col1 file0 @@ -1817,12 +1817,12 @@ start - line50 + line59 col1 file0 - line50 + line59 col4 file0 @@ -1830,12 +1830,12 @@ end - line51 + line60 col3 file0 - line51 + line60 col3 file0 @@ -1847,7 +1847,7 @@ kindevent location - line51 + line60 col3 file0 @@ -1855,12 +1855,12 @@ - line51 + line60 col3 file0 - line51 + line60 col17 file0 @@ -1876,7 +1876,7 @@ kindevent location - line146 + line155 col3 file0 @@ -1884,12 +1884,12 @@ - line146 + line155 col3 file0 - line146 + line155 col17 file0 @@ -1909,12 +1909,12 @@ start - line146 + line155 col3 file0 - line146 + line155 col11 file0 @@ -1922,12 +1922,12 @@ end - line147 + line156 col3 file0 - line147 + line156 col7 file0 @@ -1939,7 +1939,7 @@ kindevent location - line152 + line161 col3 file0 @@ -1947,12 +1947,12 @@ - line152 + line161 col3 file0 - line152 + line161 col48 file0 @@ -1972,12 +1972,12 @@ start - line153 + line162 col3 file0 - line153 + line162 col3 file0 @@ -1985,12 +1985,12 @@ end - line153 + line162 col6 file0 - line153 + line162 col6 file0 @@ -2002,7 +2002,7 @@ kindevent location - line153 + line162 col6 file0 @@ -2010,12 +2010,12 @@ - line153 + line162 col4 file0 - line153 + line162 col4 file0 @@ -2039,7 +2039,7 @@ issue_hash_function_offset3 location - line153 + line162 col6 file0 @@ -2047,15 +2047,15 @@ 0 - 50 - 51 - 145 - 146 - 147 - 150 - 151 - 152 - 153 + 59 + 60 + 154 + 155 + 156 + 159 + 160 + 161 + 162 @@ -2070,12 +2070,12 @@ start - line163 + line172 col3 file0 - line163 + line172 col5 file0 @@ -2083,12 +2083,12 @@ end - line164 + line173 col3 file0 - line164 + line173 col31 file0 @@ -2100,7 +2100,7 @@ kindmacro_expansion location - line164 + line173 col3 file0 @@ -2111,7 +2111,7 @@ kindevent location - line164 + line173 col3 file0 @@ -2119,12 +2119,12 @@ - line164 + line173 col3 file0 - line164 + line173 col64 file0 @@ -2140,7 +2140,7 @@ kindevent location - line145 + line154 col1 file0 @@ -2158,12 +2158,12 @@ start - line145 + line154 col1 file0 - line145 + line154 col4 file0 @@ -2171,12 +2171,12 @@ end - line146 + line155 col3 file0 - line146 + line155 col11 file0 @@ -2188,7 +2188,7 @@ kindevent location - line146 + line155 col3 file0 @@ -2196,12 +2196,12 @@ - line146 + line155 col3 file0 - line146 + line155 col17 file0 @@ -2217,7 +2217,7 @@ kindevent location - line50 + line59 col1 file0 @@ -2235,12 +2235,12 @@ start - line50 + line59 col1 file0 - line50 + line59 col4 file0 @@ -2248,12 +2248,12 @@ end - line51 + line60 col3 file0 - line51 + line60 col3 file0 @@ -2265,7 +2265,7 @@ kindevent location - line51 + line60 col3 file0 @@ -2273,12 +2273,12 @@ - line51 + line60 col3 file0 - line51 + line60 col17 file0 @@ -2294,7 +2294,7 @@ kindevent location - line146 + line155 col3 file0 @@ -2302,12 +2302,12 @@ - line146 + line155 col3 file0 - line146 + line155 col17 file0 @@ -2327,12 +2327,12 @@ start - line146 + line155 col3 file0 - line146 + line155 col11 file0 @@ -2340,12 +2340,12 @@ end - line147 + line156 col3 file0 - line147 + line156 col7 file0 @@ -2357,7 +2357,7 @@ kindevent location - line164 + line173 col3 file0 @@ -2365,12 +2365,12 @@ - line164 + line173 col3 file0 - line164 + line173 col64 file0 @@ -2390,12 +2390,12 @@ start - line165 + line174 col3 file0 - line165 + line174 col3 file0 @@ -2403,12 +2403,12 @@ end - line165 + line174 col6 file0 - line165 + line174 col6 file0 @@ -2420,7 +2420,7 @@ kindevent location - line165 + line174 col6 file0 @@ -2428,12 +2428,12 @@ - line165 + line174 col4 file0 - line165 + line174 col4 file0 @@ -2457,7 +2457,7 @@ issue_hash_function_offset3 location - line165 + line174 col6 file0 @@ -2465,15 +2465,15 @@ 0 - 50 - 51 - 145 - 146 - 147 - 162 - 163 - 164 - 165 + 59 + 60 + 154 + 155 + 156 + 171 + 172 + 173 + 174 @@ -2488,12 +2488,12 @@ start - line175 + line184 col3 file0 - line175 + line184 col5 file0 @@ -2501,12 +2501,12 @@ end - line179 + line188 col3 file0 - line179 + line188 col13 file0 @@ -2518,7 +2518,7 @@ kindmacro_expansion location - line179 + line188 col3 file0 @@ -2529,7 +2529,7 @@ kindevent location - line179 + line188 col3 file0 @@ -2537,12 +2537,12 @@ - line179 + line188 col3 file0 - line179 + line188 col58 file0 @@ -2558,7 +2558,7 @@ kindevent location - line179 + line188 col3 file0 @@ -2572,7 +2572,7 @@ kindmacro_expansion location - line179 + line188 col3 file0 @@ -2583,7 +2583,7 @@ kindevent location - line179 + line188 col3 file0 @@ -2591,12 +2591,12 @@ - line179 + line188 col3 file0 - line179 + line188 col58 file0 @@ -2612,7 +2612,7 @@ kindevent location - line50 + line59 col1 file0 @@ -2630,12 +2630,12 @@ start - line50 + line59 col1 file0 - line50 + line59 col4 file0 @@ -2643,12 +2643,12 @@ end - line51 + line60 col3 file0 - line51 + line60 col3 file0 @@ -2660,7 +2660,7 @@ kindevent location - line51 + line60 col3 file0 @@ -2668,12 +2668,12 @@ - line51 + line60 col3 file0 - line51 + line60 col17 file0 @@ -2689,7 +2689,7 @@ kindevent location - line179 + line188 col3 file0 @@ -2697,12 +2697,12 @@ - line179 + line188 col3 file0 - line179 + line188 col58 file0 @@ -2718,7 +2718,7 @@ kindevent location - line179 + line188 col3 file0 @@ -2726,12 +2726,12 @@ - line179 + line188 col3 file0 - line179 + line188 col58 file0 @@ -2751,12 +2751,12 @@ start - line180 + line189 col3 file0 - line180 + line189 col3 file0 @@ -2764,12 +2764,12 @@ end - line180 + line189 col8 file0 - line180 + line189 col8 file0 @@ -2781,7 +2781,7 @@ kindevent location - line180 + line189 col8 file0 @@ -2789,12 +2789,12 @@ - line180 + line189 col4 file0 - line180 + line189 col6 file0 @@ -2818,7 +2818,7 @@ issue_hash_function_offset6 location - line180 + line189 col8 file0 @@ -2826,13 +2826,13 @@ 0 - 50 - 51 - 174 - 175 - 176 - 179 - 180 + 59 + 60 + 183 + 184 + 185 + 188 + 189 @@ -2843,7 +2843,7 @@ kindmacro_expansion location - line190 + line199 col3 file0 @@ -2854,7 +2854,7 @@ kindevent location - line190 + line199 col3 file0 @@ -2862,12 +2862,12 @@ - line190 + line199 col3 file0 - line198 + line207 col4 file0 @@ -2883,7 +2883,7 @@ kindevent location - line190 + line199 col3 file0 @@ -2891,12 +2891,12 @@ - line190 + line199 col3 file0 - line198 + line207 col4 file0 @@ -2920,7 +2920,7 @@ issue_hash_function_offset1 location - line190 + line199 col3 file0 @@ -2928,8 +2928,8 @@ 0 - 189 - 190 + 198 + 199 @@ -2944,12 +2944,12 @@ start - line212 + line221 col3 file0 - line212 + line221 col5 file0 @@ -2957,12 +2957,12 @@ end - line214 + line223 col3 file0 - line214 + line223 col25 file0 @@ -2974,7 +2974,7 @@ kindmacro_expansion location - line214 + line223 col3 file0 @@ -2985,7 +2985,7 @@ kindevent location - line214 + line223 col3 file0 @@ -2993,12 +2993,12 @@ - line214 + line223 col3 file0 - line214 + line223 col31 file0 @@ -3018,12 +3018,12 @@ start - line215 + line224 col3 file0 - line215 + line224 col3 file0 @@ -3031,12 +3031,12 @@ end - line215 + line224 col8 file0 - line215 + line224 col8 file0 @@ -3048,7 +3048,7 @@ kindevent location - line215 + line224 col8 file0 @@ -3056,12 +3056,12 @@ - line215 + line224 col4 file0 - line215 + line224 col6 file0 @@ -3085,7 +3085,7 @@ issue_hash_function_offset4 location - line215 + line224 col8 file0 @@ -3093,10 +3093,10 @@ 0 - 211 - 212 - 214 - 215 + 220 + 221 + 223 + 224 @@ -3111,12 +3111,12 @@ start - line226 + line235 col3 file0 - line226 + line235 col5 file0 @@ -3124,12 +3124,12 @@ end - line228 + line237 col3 file0 - line228 + line237 col20 file0 @@ -3141,7 +3141,7 @@ kindmacro_expansion location - line228 + line237 col3 file0 @@ -3152,7 +3152,7 @@ kindevent location - line228 + line237 col3 file0 @@ -3160,12 +3160,12 @@ - line228 + line237 col3 file0 - line228 + line237 col27 file0 @@ -3185,12 +3185,12 @@ start - line229 + line238 col3 file0 - line229 + line238 col3 file0 @@ -3198,12 +3198,12 @@ end - line229 + line238 col8 file0 - line229 + line238 col8 file0 @@ -3215,7 +3215,7 @@ kindevent location - line229 + line238 col8 file0 @@ -3223,12 +3223,12 @@ - line229 + line238 col4 file0 - line229 + line238 col6 file0 @@ -3252,7 +3252,7 @@ issue_hash_function_offset4 location - line229 + line238 col8 file0 @@ -3260,10 +3260,10 @@ 0 - 225 - 226 - 228 - 229 + 234 + 235 + 237 + 238 @@ -3278,12 +3278,12 @@ start - line239 + line248 col3 file0 - line239 + line248 col5 file0 @@ -3291,12 +3291,12 @@ end - line240 + line249 col3 file0 - line240 + line249 col44 file0 @@ -3308,7 +3308,7 @@ kindmacro_expansion location - line240 + line249 col3 file0 @@ -3319,7 +3319,7 @@ kindevent location - line240 + line249 col3 file0 @@ -3327,12 +3327,12 @@ - line240 + line249 col3 file0 - line240 + line249 col61 file0 @@ -3348,7 +3348,7 @@ kindevent location - line50 + line59 col1 file0 @@ -3366,12 +3366,12 @@ start - line50 + line59 col1 file0 - line50 + line59 col4 file0 @@ -3379,12 +3379,12 @@ end - line51 + line60 col3 file0 - line51 + line60 col3 file0 @@ -3396,7 +3396,7 @@ kindevent location - line51 + line60 col3 file0 @@ -3404,12 +3404,12 @@ - line51 + line60 col3 file0 - line51 + line60 col17 file0 @@ -3425,7 +3425,7 @@ kindevent location - line240 + line249 col3 file0 @@ -3433,12 +3433,12 @@ - line240 + line249 col3 file0 - line240 + line249 col61 file0 @@ -3458,12 +3458,12 @@ start - line241 + line250 col3 file0 - line241 + line250 col3 file0 @@ -3471,12 +3471,12 @@ end - line241 + line250 col8 file0 - line241 + line250 col8 file0 @@ -3488,7 +3488,7 @@ kindevent location - line241 + line250 col8 file0 @@ -3496,12 +3496,12 @@ - line241 + line250 col4 file0 - line241 + line250 col6 file0 @@ -3525,7 +3525,7 @@ issue_hash_function_offset3 location - line241 + line250 col8 file0 @@ -3533,12 +3533,12 @@ 0 - 50 - 51 - 238 - 239 - 240 - 241 + 59 + 60 + 247 + 248 + 249 + 250 @@ -3553,12 +3553,12 @@ start - line259 + line268 col3 file0 - line259 + line268 col5 file0 @@ -3566,12 +3566,12 @@ end - line260 + line269 col3 file0 - line260 + line269 col22 file0 @@ -3583,7 +3583,7 @@ kindmacro_expansion location - line260 + line269 col3 file0 @@ -3594,7 +3594,7 @@ kindevent location - line260 + line269 col3 file0 @@ -3602,12 +3602,12 @@ - line260 + line269 col3 file0 - line260 + line269 col42 file0 @@ -3627,12 +3627,12 @@ start - line261 + line270 col3 file0 - line261 + line270 col3 file0 @@ -3640,12 +3640,12 @@ end - line261 + line270 col8 file0 - line261 + line270 col8 file0 @@ -3657,7 +3657,7 @@ kindevent location - line261 + line270 col8 file0 @@ -3665,12 +3665,12 @@ - line261 + line270 col4 file0 - line261 + line270 col6 file0 @@ -3694,7 +3694,7 @@ issue_hash_function_offset3 location - line261 + line270 col8 file0 @@ -3702,10 +3702,10 @@ 0 - 258 - 259 - 260 - 261 + 267 + 268 + 269 + 270 @@ -3720,12 +3720,12 @@ start - line276 + line285 col3 file0 - line276 + line285 col5 file0 @@ -3733,12 +3733,12 @@ end - line277 + line286 col3 file0 - line277 + line286 col30 file0 @@ -3750,7 +3750,7 @@ kindmacro_expansion location - line277 + line286 col3 file0 @@ -3761,7 +3761,7 @@ kindevent location - line277 + line286 col3 file0 @@ -3769,12 +3769,12 @@ - line277 + line286 col3 file0 - line277 + line286 col45 file0 @@ -3794,12 +3794,12 @@ start - line278 + line287 col3 file0 - line278 + line287 col3 file0 @@ -3807,12 +3807,12 @@ end - line278 + line287 col8 file0 - line278 + line287 col8 file0 @@ -3824,7 +3824,7 @@ kindevent location - line278 + line287 col8 file0 @@ -3832,12 +3832,12 @@ - line278 + line287 col4 file0 - line278 + line287 col6 file0 @@ -3861,7 +3861,7 @@ issue_hash_function_offset3 location - line278 + line287 col8 file0 @@ -3869,10 +3869,10 @@ 0 - 275 - 276 - 277 - 278 + 284 + 285 + 286 + 287 @@ -3887,12 +3887,12 @@ start - line285 + line294 col3 file0 - line285 + line294 col5 file0 @@ -3900,12 +3900,12 @@ end - line286 + line295 col3 file0 - line286 + line295 col19 file0 @@ -3917,7 +3917,7 @@ kindmacro_expansion location - line286 + line295 col3 file0 @@ -3928,7 +3928,7 @@ kindevent location - line286 + line295 col3 file0 @@ -3936,12 +3936,12 @@ - line286 + line295 col3 file0 - line286 + line295 col53 file0 @@ -3961,12 +3961,12 @@ start - line287 + line296 col3 file0 - line287 + line296 col3 file0 @@ -3974,12 +3974,12 @@ end - line287 + line296 col6 file0 - line287 + line296 col6 file0 @@ -3991,7 +3991,7 @@ kindevent location - line287 + line296 col6 file0 @@ -3999,12 +3999,12 @@ - line287 + line296 col4 file0 - line287 + line296 col4 file0 @@ -4028,7 +4028,7 @@ issue_hash_function_offset3 location - line287 + line296 col6 file0 @@ -4036,10 +4036,10 @@ 0 - 284 - 285 - 286 - 287 + 293 + 294 + 295 + 296 @@ -4054,12 +4054,12 @@ start - line298 + line307 col3 file0 - line298 + line307 col5 file0 @@ -4067,12 +4067,12 @@ end - line299 + line308 col3 file0 - line299 + line308 col11 file0 @@ -4084,7 +4084,7 @@ kindmacro_expansion location - line299 + line308 col3 file0 @@ -4095,7 +4095,7 @@ kindevent location - line299 + line308 col3 file0 @@ -4103,12 +4103,12 @@ - line299 + line308 col3 file0 - line299 + line308 col23 file0 @@ -4128,12 +4128,12 @@ start - line300 + line309 col3 file0 - line300 + line309 col3 file0 @@ -4141,12 +4141,12 @@ end - line300 + line309 col8 file0 - line300 + line309 col8 file0 @@ -4158,7 +4158,7 @@ kindevent location - line300 + line309 col8 file0 @@ -4166,12 +4166,12 @@ - line300 + line309 col4 file0 - line300 + line309 col6 file0 @@ -4195,7 +4195,7 @@ issue_hash_function_offset3 location - line300 + line309 col8 file0 @@ -4203,10 +4203,10 @@ 0 - 297 - 298 - 299 - 300 + 306 + 307 + 308 + 309 @@ -4221,12 +4221,12 @@ start - line307 + line316 col3 file0 - line307 + line316 col5 file0 @@ -4234,12 +4234,12 @@ end - line308 + line317 col3 file0 - line308 + line317 col19 file0 @@ -4251,7 +4251,7 @@ kindmacro_expansion location - line308 + line317 col3 file0 @@ -4262,7 +4262,7 @@ kindevent location - line308 + line317 col3 file0 @@ -4270,12 +4270,12 @@ - line308 + line317 col3 file0 - line308 + line317 col52 file0 @@ -4295,12 +4295,12 @@ start - line309 + line318 col3 file0 - line309 + line318 col3 file0 @@ -4308,12 +4308,12 @@ end - line309 + line318 col6 file0 - line309 + line318 col6 file0 @@ -4325,7 +4325,7 @@ kindevent location - line309 + line318 col6 file0 @@ -4333,12 +4333,12 @@ - line309 + line318 col4 file0 - line309 + line318 col4 file0 @@ -4362,7 +4362,7 @@ issue_hash_function_offset3 location - line309 + line318 col6 file0 @@ -4370,10 +4370,10 @@ 0 - 306 - 307 - 308 - 309 + 315 + 316 + 317 + 318 Index: test/Analysis/plist-macros-with-expansion.cpp =================================================================== --- test/Analysis/plist-macros-with-expansion.cpp +++ test/Analysis/plist-macros-with-expansion.cpp @@ -11,6 +11,15 @@ // Check the macro expansions from the plist output here, to make the test more // understandable. // 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*);