1890887 - [clang-trunk] Perma 2 out of 5 hunks FAILED -- saving rejects to file clang/include/clang/InstallAPI/DylibVerifier.h.rej

Status: RESOLVED FIXED

(Firefox Build System :: Toolchains, defect)

Description

[Mike Hommey [:glandium]]

llvm-symbolizer-trunk tasks fail with:

[task 2024-04-10T20:40:36.908Z] patching file clang/test/InstallAPI/diagnostics-dsym.test
[task 2024-04-10T20:40:36.908Z] + read p
[task 2024-04-10T20:40:36.909Z] + dirname build/build-clang/llvm-symbolizer-trunk.json
[task 2024-04-10T20:40:36.909Z] + patch -d /builds/worker/fetches/llvm-project -p1
[task 2024-04-10T20:40:36.910Z] patching file clang/include/clang/InstallAPI/DylibVerifier.h
[task 2024-04-10T20:40:36.910Z] Hunk #1 succeeded at 35 (offset 4 lines).
[task 2024-04-10T20:40:36.910Z] Hunk #2 succeeded at 58 (offset 4 lines).
[task 2024-04-10T20:40:36.910Z] Hunk #3 FAILED at 63.
[task 2024-04-10T20:40:36.910Z] Hunk #4 succeeded at 157 (offset 13 lines).
[task 2024-04-10T20:40:36.910Z] Hunk #5 FAILED at 153.
[task 2024-04-10T20:40:36.910Z] 2 out of 5 hunks FAILED -- saving rejects to file clang/include/clang/InstallAPI/DylibVerifier.h.rej
[task 2024-04-10T20:40:36.910Z] patching file clang/include/clang/InstallAPI/MachO.h
[task 2024-04-10T20:40:36.910Z] Hunk #1 succeeded at 36 (offset 2 lines).
[task 2024-04-10T20:40:36.910Z] patching file clang/lib/InstallAPI/CMakeLists.txt
[task 2024-04-10T20:40:36.910Z] patching file clang/lib/InstallAPI/DylibVerifier.cpp
[task 2024-04-10T20:40:36.910Z] Hunk #1 succeeded at 11 (offset 1 line).
[task 2024-04-10T20:40:36.910Z] Hunk #2 succeeded at 36 (offset 1 line).
[task 2024-04-10T20:40:36.910Z] Hunk #3 succeeded at 532 (offset 21 lines).
[task 2024-04-10T20:40:36.910Z] Hunk #4 succeeded at 582 (offset 21 lines).
[task 2024-04-10T20:40:36.910Z] Hunk #5 succeeded at 609 (offset 21 lines).
[task 2024-04-10T20:40:36.910Z] Hunk #6 succeeded at 643 (offset 21 lines).
[task 2024-04-10T20:40:36.910Z] Hunk #7 succeeded at 676 (offset 21 lines).
[task 2024-04-10T20:40:36.910Z] patching file clang/test/InstallAPI/diagnostics-dsym.test
[task 2024-04-10T20:40:36.910Z] patching file clang/tools/clang-installapi/InstallAPIOpts.td
[task 2024-04-10T20:40:36.910Z] Hunk #1 succeeded at 41 with fuzz 2 (offset 12 lines).
[task 2024-04-10T20:40:36.910Z] patching file clang/tools/clang-installapi/Options.cpp
[task 2024-04-10T20:40:36.910Z] Reversed (or previously applied) patch detected!  Assume -R? [n] 
[task 2024-04-10T20:40:36.910Z] Apply anyway? [n] 
[task 2024-04-10T20:40:36.911Z] Skipping patch.
[task 2024-04-10T20:40:36.911Z] 2 out of 2 hunks ignored -- saving rejects to file clang/tools/clang-installapi/Options.cpp.rej
[task 2024-04-10T20:40:36.911Z] patching file clang/tools/clang-installapi/Options.h
[task 2024-04-10T20:40:36.911Z] Hunk #1 succeeded at 66 (offset -1 lines).
[task 2024-04-10T20:40:36.911Z] patching file llvm/include/llvm/TextAPI/DylibReader.h
[task 2024-04-10T20:40:36.911Z] patching file llvm/include/llvm/TextAPI/Record.h
[task 2024-04-10T20:40:36.911Z] patching file llvm/lib/TextAPI/BinaryReader/CMakeLists.txt
[task 2024-04-10T20:40:36.911Z] patching file llvm/lib/TextAPI/BinaryReader/DylibReader.cpp

Comment 1

[Mike Hommey [:glandium]]

Attachment: Bug 1890887 - Revert more patches that conflict with previous reverts.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/547363a98ae6
Revert more patches that conflict with previous reverts. r=firefox-build-system-reviewers,sergesanspaille

Comment 3

[Aron Cseh]

https://hg.mozilla.org/mozilla-central/rev/547363a98ae6