Closed Quuxplusone closed 8 years ago
Attached tmp.cc
(3562 bytes, text/x-c++src): repro
thakis@thakis:~/src/llvm-rw$ svn merge -c -281337 .
--- Reverse-merging r281337 into '.':
U lib/MC/MCParser/MCAsmParser.cpp
--- Recording mergeinfo for reverse merge of r281337 into '.':
U .
thakis@thakis:~/src/llvm-rw$ svn merge -c -281336 .
--- Reverse-merging r281336 into '.':
U lib/Target/X86/AsmParser/X86AsmParser.cpp
U lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
U lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
U lib/Target/Mips/AsmParser/MipsAsmParser.cpp
U lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
U lib/Target/SystemZ/AsmParser/SystemZAsmParser.cppthakis@thakis:~/src/llvm-
rw$ svn commit -m 'Revert r281336 (and r281337), it caused PR30372.'
Sending include/llvm/MC/MCParser/MCAsmLexer.h
Sending include/llvm/MC/MCParser/MCAsmParser.h
Sending include/llvm/Support/SMLoc.h
Sending lib/MC/MCParser/AsmParser.cpp
Sending lib/MC/MCParser/MCAsmLexer.cpp
Sending lib/MC/MCParser/MCAsmParser.cpp
Sending lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
Sending lib/Target/ARM/AsmParser/ARMAsmParser.cpp
Sending lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
Sending lib/Target/Mips/AsmParser/MipsAsmParser.cpp
Sending lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
Sending lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp
Sending lib/Target/X86/AsmParser/X86AsmParser.cpp
Sending test/MC/AArch64/armv8.1a-rdma.s
Sending test/MC/AArch64/inst-directive-diagnostic.s
Sending test/MC/AArch64/neon-diagnostics.s
Transmitting file data ................
Committed revision 281361.
U lib/Target/ARM/AsmParser/ARMAsmParser.cpp
U lib/MC/MCParser/AsmParser.cpp
G lib/MC/MCParser/MCAsmParser.cpp
U lib/MC/MCParser/MCAsmLexer.cpp
U test/MC/AArch64/neon-diagnostics.s
U test/MC/AArch64/inst-directive-diagnostic.s
U test/MC/AArch64/armv8.1a-rdma.s
U include/llvm/Support/SMLoc.h
U include/llvm/MC/MCParser/MCAsmParser.h
U include/llvm/MC/MCParser/MCAsmLexer.h
--- Recording mergeinfo for reverse merge of r281336 into '.':
U .
Sorry, pasteboard malfunction. The revert commit message got pasted in the middle of the reverse-merge output.
Fix committed in 281762.
tmp.cc
(3562 bytes, text/x-c++src)