Author: d0k
Date: Tue Jan 15 09:20:04 2019
New Revision: 351208
URL: http://llvm.org/viewvc/llvm-project?rev=351208&view=rev
Log:
Revert "Update clang-tools-extra for r350891 from Clang."
This reverts commit r350892.
Modified:
clang-tools-extra/trunk/test/modularize/ProblemsInconsistent.modularize
clang-tools-extra/trunk/test/pp-trace/pp-trace-conditional.cpp
clang-tools-extra/trunk/test/pp-trace/pp-trace-macro.cpp
Modified:
clang-tools-extra/trunk/test/modularize/ProblemsInconsistent.modularize
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/ProblemsInconsistent.modularize?rev=351208&r1=351207&r2=351208&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/modularize/ProblemsInconsistent.modularize
(original)
+++ clang-tools-extra/trunk/test/modularize/ProblemsInconsistent.modularize Tue
Jan 15 09:20:04 2019
@@ -60,6 +60,16 @@ Inputs/InconsistentHeader2.h
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentHeader2.h
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h
# CHECK-NEXT: (no macro definition)
+# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:11:2
+# CHECK-NEXT: #if SYMBOL == 1
+# CHECK-NEXT: ^
+# CHECK-NEXT: error: Conditional expression instance 'SYMBOL == 1' has
different values in this header, depending on how it was included.
+# CHECK-NEXT: 'SYMBOL == 1' expanded to: 'true' with respect to these
inclusion paths:
+# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentHeader1.h
+# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h
+# CHECK-NEXT: 'SYMBOL == 1' expanded to: 'false' with respect to these
inclusion paths:
+# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentHeader2.h
+# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:2:2
# CHECK-NEXT: #ifdef SYMBOL1
# CHECK-NEXT: ^
Modified: clang-tools-extra/trunk/test/pp-trace/pp-trace-conditional.cpp
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/pp-trace-conditional.cpp?rev=351208&r1=351207&r2=351208&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/pp-trace/pp-trace-conditional.cpp (original)
+++ clang-tools-extra/trunk/test/pp-trace/pp-trace-conditional.cpp Tue Jan 15
09:20:04 2019
@@ -79,14 +79,14 @@
// CHECK-NEXT: MacroDirective: MD_Define
// CHECK: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:3:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:3:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:3:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:3:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:4:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: - Callback: Endif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:4:2"
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:3:2"
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:6:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:6:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:6:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:6:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:7:1"]
// CHECK-NEXT: ConditionValue: CVK_False
// CHECK-NEXT: - Callback: Endif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:7:2"
@@ -95,7 +95,7 @@
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:6:1",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:7:2"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:9:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:9:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:9:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:9:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:10:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: - Callback: Else
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:10:2"
@@ -107,7 +107,7 @@
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:10:1",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:11:2"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:13:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:13:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:13:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:13:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:14:1"]
// CHECK-NEXT: ConditionValue: CVK_False
// CHECK-NEXT: - Callback: Else
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:14:2"
@@ -119,11 +119,11 @@
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:13:2"
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:17:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:17:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:17:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:17:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:18:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: - Callback: Elif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:18:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:18:7",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:18:8"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:18:6",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:19:1"]
// CHECK-NEXT: ConditionValue: CVK_NotEvaluated
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:17:2"
// CHECK-NEXT: - Callback: Endif
@@ -133,11 +133,11 @@
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:18:1",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:19:2"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:20:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:20:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:20:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:20:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:21:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: - Callback: Elif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:21:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:21:7",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:21:8"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:21:6",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:22:1"]
// CHECK-NEXT: ConditionValue: CVK_NotEvaluated
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:20:2"
// CHECK-NEXT: - Callback: Endif
@@ -147,11 +147,11 @@
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:21:1",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:22:2"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:24:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:24:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:24:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:24:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:25:1"]
// CHECK-NEXT: ConditionValue: CVK_False
// CHECK-NEXT: - Callback: Elif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:25:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:25:7",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:25:7"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:25:6",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:26:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:24:2"
// CHECK-NEXT: - Callback: SourceRangeSkipped
@@ -161,11 +161,11 @@
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:24:2"
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:27:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:27:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:27:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:27:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:28:1"]
// CHECK-NEXT: ConditionValue: CVK_False
// CHECK-NEXT: - Callback: Elif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:28:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:28:7",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:28:7"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:28:6",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:29:1"]
// CHECK-NEXT: ConditionValue: CVK_False
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:27:2"
// CHECK-NEXT: - Callback: Endif
@@ -175,11 +175,11 @@
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:27:1",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:29:2"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:30:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:30:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:30:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:30:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:31:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: - Callback: Elif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:31:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:31:7",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:31:8"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:31:6",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:32:1"]
// CHECK-NEXT: ConditionValue: CVK_NotEvaluated
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:30:2"
// CHECK-NEXT: - Callback: Endif
@@ -189,11 +189,11 @@
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:31:1",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:32:2"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:33:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:33:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:33:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:33:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:34:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: - Callback: Elif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:34:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:34:7",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:34:8"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:34:6",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:35:1"]
// CHECK-NEXT: ConditionValue: CVK_NotEvaluated
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:33:2"
// CHECK-NEXT: - Callback: Endif
@@ -203,11 +203,11 @@
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:34:1",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:35:2"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:37:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:37:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:37:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:37:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:38:1"]
// CHECK-NEXT: ConditionValue: CVK_False
// CHECK-NEXT: - Callback: Elif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:38:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:38:7",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:38:7"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:38:6",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:39:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:37:2"
// CHECK-NEXT: - Callback: SourceRangeSkipped
@@ -222,11 +222,11 @@
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:39:1",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:40:2"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:41:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:41:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:41:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:41:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:42:1"]
// CHECK-NEXT: ConditionValue: CVK_False
// CHECK-NEXT: - Callback: Elif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:42:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:42:7",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:42:7"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:42:6",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:43:1"]
// CHECK-NEXT: ConditionValue: CVK_False
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:41:2"
// CHECK-NEXT: - Callback: Else
@@ -239,11 +239,11 @@
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:41:2"
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:45:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:45:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:45:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:45:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:46:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: - Callback: Elif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:46:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:46:7",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:46:8"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:46:6",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:47:1"]
// CHECK-NEXT: ConditionValue: CVK_NotEvaluated
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:45:2"
// CHECK-NEXT: - Callback: Endif
@@ -253,11 +253,11 @@
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:46:1",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:48:2"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:49:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:49:5",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:49:5"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:49:4",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:50:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: - Callback: Elif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:50:2"
-// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:50:7",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:50:8"]
+// CHECK-NEXT: ConditionRange:
["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:50:6",
"{{.*}}{{[/\\]}}pp-trace-conditional.cpp:51:1"]
// CHECK-NEXT: ConditionValue: CVK_NotEvaluated
// CHECK-NEXT: IfLoc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:49:2"
// CHECK-NEXT: - Callback: Endif
Modified: clang-tools-extra/trunk/test/pp-trace/pp-trace-macro.cpp
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/pp-trace-macro.cpp?rev=351208&r1=351207&r2=351208&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/pp-trace/pp-trace-macro.cpp (original)
+++ clang-tools-extra/trunk/test/pp-trace/pp-trace-macro.cpp Tue Jan 15
09:20:04 2019
@@ -44,7 +44,7 @@ X
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-macro.cpp:5:5",
"{{.*}}{{[/\\]}}pp-trace-macro.cpp:5:19"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-macro.cpp:5:2"
-// CHECK-NEXT: ConditionRange: ["{{.*}}{{[/\\]}}pp-trace-macro.cpp:5:5",
"{{.*}}{{[/\\]}}pp-trace-macro.cpp:5:19"]
+// CHECK-NEXT: ConditionRange: ["{{.*}}{{[/\\]}}pp-trace-macro.cpp:5:4",
"{{.*}}{{[/\\]}}pp-trace-macro.cpp:6:1"]
// CHECK-NEXT: ConditionValue: CVK_True
// CHECK-NEXT: - Callback: Endif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-macro.cpp:6:2"
@@ -58,7 +58,7 @@ X
// CHECK-NEXT: Range: ["{{.*}}{{[/\\]}}pp-trace-macro.cpp:8:5",
"{{.*}}{{[/\\]}}pp-trace-macro.cpp:8:19"]
// CHECK-NEXT: - Callback: If
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-macro.cpp:8:2"
-// CHECK-NEXT: ConditionRange: ["{{.*}}{{[/\\]}}pp-trace-macro.cpp:8:5",
"{{.*}}{{[/\\]}}pp-trace-macro.cpp:8:19"]
+// CHECK-NEXT: ConditionRange: ["{{.*}}{{[/\\]}}pp-trace-macro.cpp:8:4",
"{{.*}}{{[/\\]}}pp-trace-macro.cpp:9:1"]
// CHECK-NEXT: ConditionValue: CVK_False
// CHECK-NEXT: - Callback: Endif
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-macro.cpp:9:2"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
