diff options
author | Manuel Klimek <klimek@google.com> | 2021-12-01 11:19:19 +0100 |
---|---|---|
committer | Manuel Klimek <klimek@google.com> | 2021-12-01 11:23:04 +0100 |
commit | 59788422609433c50c3d3c16ca531fa56b9acb4f (patch) | |
tree | 610597743880d959806e7cfc2499ed7591bd389f /llvm/lib/Support/TargetParser.cpp | |
parent | a4fbae268f67a6737b86c47f555f95a4a44462d2 (diff) | |
download | llvm-59788422609433c50c3d3c16ca531fa56b9acb4f.zip llvm-59788422609433c50c3d3c16ca531fa56b9acb4f.tar.gz llvm-59788422609433c50c3d3c16ca531fa56b9acb4f.tar.bz2 |
Fix clang-format bug when handling conflict markers.
Previously, clang-format would not correctly identify preprocessor
directives directly following a conflict marker, which would result in
violating the formatter's invariants.
The provided test fails in assert mode before this change.
Diffstat (limited to 'llvm/lib/Support/TargetParser.cpp')
0 files changed, 0 insertions, 0 deletions