diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-12-14 06:16:57 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-12-14 06:16:57 +0000 |
| commit | 7c027ee4c2729d918f49c68a0861663c61deaf6b (patch) | |
| tree | 27f5194d6f0eab21a3dd209d0c6f6b25d0345a8b /clang/test/Lexer | |
| parent | 67dfd4236aefc2228b2873fad63bfd71acf75bda (diff) | |
| download | bcm5719-llvm-7c027ee4c2729d918f49c68a0861663c61deaf6b.tar.gz bcm5719-llvm-7c027ee4c2729d918f49c68a0861663c61deaf6b.zip | |
teach clang to recover gracefully from conflict markers left in source
files: PR5238.
llvm-svn: 91270
Diffstat (limited to 'clang/test/Lexer')
| -rw-r--r-- | clang/test/Lexer/conflict-marker.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/clang/test/Lexer/conflict-marker.c b/clang/test/Lexer/conflict-marker.c new file mode 100644 index 00000000000..be2672b033b --- /dev/null +++ b/clang/test/Lexer/conflict-marker.c @@ -0,0 +1,29 @@ +// RUN: clang-cc %s -verify -fsyntax-only + +// Test that we recover gracefully from conflict markers left in input files. +// PR5238 + +// diff3 style +<<<<<<< .mine // expected-error {{version control conflict marker in file}} +int x = 4; +||||||| +int x = 123; +======= +float x = 17; +>>>>>>> .r91107 + +// normal style. +<<<<<<< .mine // expected-error {{version control conflict marker in file}} +typedef int y; +======= +typedef struct foo *y; +>>>>>>> .r91107 + +; +y b; + +int foo() { + y a = x; + return x + a; +} + |
