aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-05-17 20:27:25 +0000
committerChris Lattner <sabre@nondot.org>2010-05-17 20:27:25 +0000
commit467f6bcfe5ed6aa355d80892363adbba52802d98 (patch)
treeb1958802aed37b09327e96212b162d6f6a75271d /llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
parent0ed75493432d563ce7a2604ffdea6a9e89fd1c92 (diff)
downloadllvm-467f6bcfe5ed6aa355d80892363adbba52802d98.zip
llvm-467f6bcfe5ed6aa355d80892363adbba52802d98.tar.gz
llvm-467f6bcfe5ed6aa355d80892363adbba52802d98.tar.bz2
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
Diffstat (limited to 'llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp')
0 files changed, 0 insertions, 0 deletions