maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity
llvm-project/clang/test/Lexer/conflict-marker.c

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

41 lines
780 B
C
Raw Normal View History

Update tests to use %clang_cc1 instead of 'clang-cc' or 'clang -cc1'. - This is designed to make it obvious that %clang_cc1 is a "test variable" which is substituted. It is '%clang_cc1' instead of '%clang -cc1' because it can be useful to redefine what gets run as 'clang -cc1' (for example, to set a default target). llvm-svn: 91446
2009-12-16 04:14:24 +08:00
// RUN: %clang_cc1 %s -verify -fsyntax-only
teach clang to recover gracefully from conflict markers left in source files: PR5238. llvm-svn: 91270
2009-12-14 14:16:57 +08:00
// Test that we recover gracefully from conflict markers left in input files.
// PR5238
Allow -verify directives to be filtered by preprocessing. This is accomplished by making VerifyDiagnosticsConsumer a CommentHandler, which then only reads the -verify directives that are actually in live blocks of code. It also makes it simpler to handle -verify directives that appear in header files, though we still have to manually reparse some files depending on how they are generated. This requires some test changes. In particular, all PCH tests now have their -verify directives outside the "header" portion of the file, using the @line syntax added in r159978. Other tests have been modified mostly to make it clear what is being tested, and to prevent polluting the expected output with the directives themselves. Patch by Andy Gibbs! (with slight modifications) The new Frontend/verify-* tests exercise the functionality of this commit, as well as r159978, r159979, and r160053 (Andy's other -verify enhancements). llvm-svn: 160068
2012-07-12 03:58:23 +08:00
// diff3 style expected-error@+1 {{version control conflict marker in file}}
<<<<<<< .mine
teach clang to recover gracefully from conflict markers left in source files: PR5238. llvm-svn: 91270
2009-12-14 14:16:57 +08:00
int x = 4;
|||||||
int x = 123;
=======
float x = 17;
>>>>>>> .r91107
Allow -verify directives to be filtered by preprocessing. This is accomplished by making VerifyDiagnosticsConsumer a CommentHandler, which then only reads the -verify directives that are actually in live blocks of code. It also makes it simpler to handle -verify directives that appear in header files, though we still have to manually reparse some files depending on how they are generated. This requires some test changes. In particular, all PCH tests now have their -verify directives outside the "header" portion of the file, using the @line syntax added in r159978. Other tests have been modified mostly to make it clear what is being tested, and to prevent polluting the expected output with the directives themselves. Patch by Andy Gibbs! (with slight modifications) The new Frontend/verify-* tests exercise the functionality of this commit, as well as r159978, r159979, and r160053 (Andy's other -verify enhancements). llvm-svn: 160068
2012-07-12 03:58:23 +08:00
// normal style expected-error@+1 {{version control conflict marker in file}}
<<<<<<< .mine
teach clang to recover gracefully from conflict markers left in source files: PR5238. llvm-svn: 91270
2009-12-14 14:16:57 +08:00
typedef int y;
=======
typedef struct foo *y;
>>>>>>> .r91107
Allow -verify directives to be filtered by preprocessing. This is accomplished by making VerifyDiagnosticsConsumer a CommentHandler, which then only reads the -verify directives that are actually in live blocks of code. It also makes it simpler to handle -verify directives that appear in header files, though we still have to manually reparse some files depending on how they are generated. This requires some test changes. In particular, all PCH tests now have their -verify directives outside the "header" portion of the file, using the @line syntax added in r159978. Other tests have been modified mostly to make it clear what is being tested, and to prevent polluting the expected output with the directives themselves. Patch by Andy Gibbs! (with slight modifications) The new Frontend/verify-* tests exercise the functionality of this commit, as well as r159978, r159979, and r160053 (Andy's other -verify enhancements). llvm-svn: 160068
2012-07-12 03:58:23 +08:00
// Perforce style expected-error@+1 {{version control conflict marker in file}}
>>>> ORIGINAL conflict-marker.c#6
Handle Perforce-style conflict markers like normal conflict markers. Perforce swaps over the <<<< and >>>> markers, and uses shorter markers than traditional tools. llvm-svn: 141751
2011-10-12 08:37:51 +08:00
int z = 1;
==== THEIRS conflict-marker.c#7
int z = 0;
==== YOURS conflict-marker.c
int z = 2;
<<<<
teach clang to recover gracefully from conflict markers left in source files: PR5238. llvm-svn: 91270
2009-12-14 14:16:57 +08:00
;
y b;
robustify the conflict marker stuff. Don't add 7 twice, which would make it miss (invalid) things like: <<<<<<< >>>>>>> and crash if <<<<<<< was at the end of the line. When we find a >>>>>>> that is not at the end of the line, make sure to reset Pos so we don't crash on something like: <<<<<<< >>>>>>> This isn't worth making testcases for, since each would require a new file. rdar://7987078 - signal 11 compiling "<<<<<<<<<<" llvm-svn: 103968
2010-05-18 04:27:25 +08:00
teach clang to recover gracefully from conflict markers left in source files: PR5238. llvm-svn: 91270
2009-12-14 14:16:57 +08:00
int foo() {
y a = x;
Handle Perforce-style conflict markers like normal conflict markers. Perforce swaps over the <<<< and >>>> markers, and uses shorter markers than traditional tools. llvm-svn: 141751
2011-10-12 08:37:51 +08:00
return x + a - z;
teach clang to recover gracefully from conflict markers left in source files: PR5238. llvm-svn: 91270
2009-12-14 14:16:57 +08:00
}
Lex: Don't crash if both conflict markers are on the same line We would check if the terminator marker is on a newline. However, the logic would end up out-of-bounds if the terminator marker immediately follows the start marker. This fixes PR21820. llvm-svn: 224210
2014-12-14 12:53:11 +08:00
<<<<<<<>>>>>>> // expected-error {{expected identifier}}