[all-commits] [llvm/llvm-project] 82bc33: [BOLT] Fix unconditional output of boltedcollectio...

[Amir Ayupov via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 82bc33ea3f1a539be50ed46919dc53fc6b685da9
      https://github.com/llvm/llvm-project/commit/82bc33ea3f1a539be50ed46919dc53fc6b685da9
  Author: Amir Ayupov <aaupov at fb.com>
  Date:   2024-01-18 (Thu, 18 Jan 2024)

  Changed paths:
    M bolt/lib/Core/BinaryEmitter.cpp
    M bolt/test/X86/merge-fdata-bat-mode.test
    A bolt/test/X86/merge-fdata-nobat-mode.test
    M bolt/tools/merge-fdata/merge-fdata.cpp
    M clang/include/clang/Driver/Options.td
    M clang/lib/Driver/ToolChains/Gnu.cpp
    M cross-project-tests/lit.cfg.py
    M cross-project-tests/lit.site.cfg.py.in
    M lldb/test/API/lit.cfg.py
    M lldb/test/API/lit.site.cfg.py.in
    M lldb/test/Shell/helper/toolchain.py
    M lldb/test/Shell/lit.site.cfg.py.in
    M llvm/CMakeLists.txt
    M llvm/include/llvm/MC/MCFragment.h
    M llvm/include/llvm/MC/MCObjectStreamer.h
    M llvm/include/llvm/MC/MCStreamer.h
    M llvm/lib/MC/MCAssembler.cpp
    M llvm/lib/MC/MCFragment.cpp
    M llvm/lib/MC/MCObjectStreamer.cpp
    M llvm/lib/MC/MCStreamer.cpp
    M llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
    A llvm/test/MC/X86/directive-avoid_end_align.s

  Log Message:
  -----------
  [BOLT] Fix unconditional output of boltedcollection in merge-fdata (#78653)

Fix the bug where merge-fdata unconditionally outputs boltedcollection 
line, regardless of whether input files have it set.

Test Plan:
Added bolt/test/X86/merge-fdata-nobat-mode.test which fails without this
fix.