summaryrefslogtreecommitdiffstats
path: root/clang/test/Lexer/conflict-marker.c
Commit message (Collapse)AuthorAgeFilesLines
* Lex: Don't crash if both conflict markers are on the same lineDavid Majnemer2014-12-141-0/+2
| | | | | | | | | | 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
* Allow -verify directives to be filtered by preprocessing.Jordan Rose2012-07-111-6/+6
| | | | | | | | | | | | | | | | | | | | | 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
* Handle Perforce-style conflict markers like normal conflict markers. PerforceRichard Smith2011-10-121-2/+10
| | | | | | | swaps over the <<<< and >>>> markers, and uses shorter markers than traditional tools. llvm-svn: 141751
* robustify the conflict marker stuff. Don't add 7 twice, which wouldChris Lattner2010-05-171-2/+3
| | | | | | | | | | | | | | | | | | | | | 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
* Update tests to use %clang_cc1 instead of 'clang-cc' or 'clang -cc1'.Daniel Dunbar2009-12-151-1/+1
| | | | | | | | | - 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
* teach clang to recover gracefully from conflict markers left in sourceChris Lattner2009-12-141-0/+29
files: PR5238. llvm-svn: 91270
OpenPOWER on IntegriCloud