diff options
| author | Erich Keane <erich.keane@intel.com> | 2017-08-24 18:36:07 +0000 |
|---|---|---|
| committer | Erich Keane <erich.keane@intel.com> | 2017-08-24 18:36:07 +0000 |
| commit | 6d8609db4d42605a8a0e2e2620e9e38bf1b29d3c (patch) | |
| tree | 7ebbae4623204716daefc14964eb4a2f085b0075 /test/Frontend | |
| parent | 2fee69a47a6ee02a24132d30c2c479d861a68b93 (diff) | |
[Preprocessor] Correct internal token parsing of newline characters in CRLF
Discovered due to a goofy git setup, the test system-headerline-directive.c
(and a few others) failed because the token-consumption will consume only the
'\r' in CRLF, making the preprocessor's printed value give the wrong line number
when returning from an include. For example:
(line 1):#include <noline.h>\r\n
The "file exit" code causes the printer to try to print the 'returned to the
main file' line. It looks up what the current line number is. However, since the
current 'token' is the '\n' (since only the \r was consumed), it will give the
line number as '1", not '2'. This results in a few failed tests, but more
importantly, results in error messages being incorrect when compiling a
previously preprocessed file.
Differential Revision: https://reviews.llvm.org/D37079
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@311683 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Frontend')
| -rw-r--r-- | test/Frontend/.gitattributes | 2 | ||||
| -rw-r--r-- | test/Frontend/system-header-line-directive-ms-lineendings.c | 21 |
2 files changed, 23 insertions, 0 deletions
diff --git a/test/Frontend/.gitattributes b/test/Frontend/.gitattributes new file mode 100644 index 0000000000..03f5ad0e0c --- /dev/null +++ b/test/Frontend/.gitattributes @@ -0,0 +1,2 @@ +# Below test validates crlf line endings, so it should stay crlf. +system-header-line-directive-ms-lineendings.c text eol=crlf diff --git a/test/Frontend/system-header-line-directive-ms-lineendings.c b/test/Frontend/system-header-line-directive-ms-lineendings.c new file mode 100644 index 0000000000..34a7ec94b0 --- /dev/null +++ b/test/Frontend/system-header-line-directive-ms-lineendings.c @@ -0,0 +1,21 @@ +// RUN: %clang_cc1 %s -E -o - -I %S/Inputs -isystem %S/Inputs/SystemHeaderPrefix | FileCheck %s
+#include <noline.h>
+#include <line-directive-in-system.h>
+
+#include "line-directive.h"
+
+// This tests that the line numbers for the current file are correctly outputted
+// for the include-file-completed test case.
+
+// CHECK: # 1 "{{.*}}system-header-line-directive-ms-lineendings.c" 2
+// CHECK: # 1 "{{.*}}noline.h" 1 3
+// CHECK: foo();
+// CHECK: # 3 "{{.*}}system-header-line-directive-ms-lineendings.c" 2
+// CHECK: # 1 "{{.*}}line-directive-in-system.h" 1 3
+// The "3" below indicates that "foo.h" is considered a system header.
+// CHECK: # 1 "foo.h" 3
+// CHECK: foo();
+// CHECK: # 4 "{{.*}}system-header-line-directive-ms-lineendings.c" 2
+// CHECK: # 1 "{{.*}}line-directive.h" 1
+// CHECK: # 10 "foo.h"{{$}}
+// CHECK: # 6 "{{.*}}system-header-line-directive-ms-lineendings.c" 2
|