| Daniel Dunbar | a572887 | 2009-12-15 20:14:24 +0000 | [diff] [blame] | 1 | // RUN: %clang_cc1 %s -verify -fsyntax-only |
| Chris Lattner | 34f349d | 2009-12-14 06:16:57 +0000 | [diff] [blame] | 2 | |
| 3 | // Test that we recover gracefully from conflict markers left in input files. |
| 4 | // PR5238 |
| 5 | |
| 6 | // diff3 style |
| Chris Lattner | 3d48899 | 2010-05-17 20:27:25 +0000 | [diff] [blame] | 7 | <<<<<<< .mine // expected-error {{version control conflict marker in file}} |
| Chris Lattner | 34f349d | 2009-12-14 06:16:57 +0000 | [diff] [blame] | 8 | int x = 4; |
| 9 | ||||||| |
| 10 | int x = 123; |
| 11 | ======= |
| 12 | float x = 17; |
| 13 | >>>>>>> .r91107 |
| 14 | |
| 15 | // normal style. |
| Chris Lattner | 3d48899 | 2010-05-17 20:27:25 +0000 | [diff] [blame] | 16 | <<<<<<< .mine // expected-error {{version control conflict marker in file}} |
| Chris Lattner | 34f349d | 2009-12-14 06:16:57 +0000 | [diff] [blame] | 17 | typedef int y; |
| 18 | ======= |
| 19 | typedef struct foo *y; |
| 20 | >>>>>>> .r91107 |
| 21 | |
| 22 | ; |
| 23 | y b; |
| 24 | |
| Chris Lattner | 3d48899 | 2010-05-17 20:27:25 +0000 | [diff] [blame] | 25 | |
| Chris Lattner | 34f349d | 2009-12-14 06:16:57 +0000 | [diff] [blame] | 26 | int foo() { |
| 27 | y a = x; |
| 28 | return x + a; |
| 29 | } |
| 30 | |