Author: Kirstóf Umann Date: 2020-09-11T13:48:26+02:00 New Revision: 7527898fef47da929e70c81100a0248c2f445762
URL: https://github.com/llvm/llvm-project/commit/7527898fef47da929e70c81100a0248c2f445762 DIFF: https://github.com/llvm/llvm-project/commit/7527898fef47da929e70c81100a0248c2f445762.diff LOG: [analyzer][MacroExpansion][NFC] Fix a missing test output check Added: Modified: clang/test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist clang/test/Analysis/plist-macros-with-expansion.cpp Removed: ################################################################################ diff --git a/clang/test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist b/clang/test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist index 2988f8504fcf..499119c81d25 100644 --- a/clang/test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist +++ b/clang/test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist @@ -5645,12 +5645,12 @@ <key>start</key> <array> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>33</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>33</integer> <key>file</key><integer>0</integer> </dict> @@ -5658,12 +5658,12 @@ <key>end</key> <array> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>39</integer> <key>file</key><integer>0</integer> </dict> @@ -5675,7 +5675,7 @@ <key>kind</key><string>event</string> <key>location</key> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> @@ -5683,12 +5683,12 @@ <array> <array> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>41</integer> <key>file</key><integer>0</integer> </dict> @@ -5704,7 +5704,7 @@ <key>kind</key><string>event</string> <key>location</key> <dict> - <key>line</key><integer>458</integer> + <key>line</key><integer>461</integer> <key>col</key><integer>1</integer> <key>file</key><integer>0</integer> </dict> @@ -5718,7 +5718,7 @@ <key>kind</key><string>event</string> <key>location</key> <dict> - <key>line</key><integer>458</integer> + <key>line</key><integer>461</integer> <key>col</key><integer>1</integer> <key>file</key><integer>0</integer> </dict> @@ -5726,12 +5726,12 @@ <array> <array> <dict> - <key>line</key><integer>458</integer> + <key>line</key><integer>461</integer> <key>col</key><integer>1</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>458</integer> + <key>line</key><integer>461</integer> <key>col</key><integer>16</integer> <key>file</key><integer>0</integer> </dict> @@ -5747,7 +5747,7 @@ <key>kind</key><string>event</string> <key>location</key> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> @@ -5755,12 +5755,12 @@ <array> <array> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>41</integer> <key>file</key><integer>0</integer> </dict> @@ -5780,12 +5780,12 @@ <key>start</key> <array> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>39</integer> <key>file</key><integer>0</integer> </dict> @@ -5793,12 +5793,12 @@ <key>end</key> <array> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>35</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>35</integer> <key>file</key><integer>0</integer> </dict> @@ -5810,7 +5810,7 @@ <key>kind</key><string>event</string> <key>location</key> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>35</integer> <key>file</key><integer>0</integer> </dict> @@ -5818,12 +5818,12 @@ <array> <array> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>33</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>41</integer> <key>file</key><integer>0</integer> </dict> @@ -5841,7 +5841,7 @@ <dict> <key>location</key> <dict> - <key>line</key><integer>458</integer> + <key>line</key><integer>461</integer> <key>col</key><integer>1</integer> <key>file</key><integer>0</integer> </dict> @@ -5860,7 +5860,7 @@ <key>issue_hash_function_offset</key><string>0</string> <key>location</key> <dict> - <key>line</key><integer>459</integer> + <key>line</key><integer>462</integer> <key>col</key><integer>35</integer> <key>file</key><integer>0</integer> </dict> @@ -5868,8 +5868,8 @@ <dict> <key>0</key> <array> - <integer>458</integer> - <integer>459</integer> + <integer>461</integer> + <integer>462</integer> </array> </dict> </dict> @@ -5884,12 +5884,12 @@ <key>start</key> <array> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>33</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>33</integer> <key>file</key><integer>0</integer> </dict> @@ -5897,12 +5897,12 @@ <key>end</key> <array> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>39</integer> <key>file</key><integer>0</integer> </dict> @@ -5914,7 +5914,7 @@ <key>kind</key><string>event</string> <key>location</key> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> @@ -5922,12 +5922,12 @@ <array> <array> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>41</integer> <key>file</key><integer>0</integer> </dict> @@ -5943,7 +5943,7 @@ <key>kind</key><string>event</string> <key>location</key> <dict> - <key>line</key><integer>467</integer> + <key>line</key><integer>470</integer> <key>col</key><integer>1</integer> <key>file</key><integer>0</integer> </dict> @@ -5957,7 +5957,7 @@ <key>kind</key><string>event</string> <key>location</key> <dict> - <key>line</key><integer>467</integer> + <key>line</key><integer>470</integer> <key>col</key><integer>1</integer> <key>file</key><integer>0</integer> </dict> @@ -5965,12 +5965,12 @@ <array> <array> <dict> - <key>line</key><integer>467</integer> + <key>line</key><integer>470</integer> <key>col</key><integer>1</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>467</integer> + <key>line</key><integer>470</integer> <key>col</key><integer>11</integer> <key>file</key><integer>0</integer> </dict> @@ -5986,7 +5986,7 @@ <key>kind</key><string>event</string> <key>location</key> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> @@ -5994,12 +5994,12 @@ <array> <array> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>41</integer> <key>file</key><integer>0</integer> </dict> @@ -6019,12 +6019,12 @@ <key>start</key> <array> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>37</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>39</integer> <key>file</key><integer>0</integer> </dict> @@ -6032,12 +6032,12 @@ <key>end</key> <array> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>35</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>35</integer> <key>file</key><integer>0</integer> </dict> @@ -6049,7 +6049,7 @@ <key>kind</key><string>event</string> <key>location</key> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>35</integer> <key>file</key><integer>0</integer> </dict> @@ -6057,12 +6057,12 @@ <array> <array> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>33</integer> <key>file</key><integer>0</integer> </dict> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>41</integer> <key>file</key><integer>0</integer> </dict> @@ -6080,7 +6080,7 @@ <dict> <key>location</key> <dict> - <key>line</key><integer>467</integer> + <key>line</key><integer>470</integer> <key>col</key><integer>1</integer> <key>file</key><integer>0</integer> </dict> @@ -6099,7 +6099,7 @@ <key>issue_hash_function_offset</key><string>0</string> <key>location</key> <dict> - <key>line</key><integer>468</integer> + <key>line</key><integer>471</integer> <key>col</key><integer>35</integer> <key>file</key><integer>0</integer> </dict> @@ -6107,8 +6107,8 @@ <dict> <key>0</key> <array> - <integer>467</integer> - <integer>468</integer> + <integer>470</integer> + <integer>471</integer> </array> </dict> </dict> diff --git a/clang/test/Analysis/plist-macros-with-expansion.cpp b/clang/test/Analysis/plist-macros-with-expansion.cpp index e07747eaec74..a81ba0846905 100644 --- a/clang/test/Analysis/plist-macros-with-expansion.cpp +++ b/clang/test/Analysis/plist-macros-with-expansion.cpp @@ -452,6 +452,9 @@ void recursiveMacroUser() { // expected-warning@-1{{expression result unused}} } +// CHECK: <key>name</key><string>value</string> +// CHECK-NEXT: <key>expansion</key><string>garbage_</string> + #define FOO(x) int foo() { return x; } #define APPLY_ZERO1(function) function(0) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits