[all-commits] [llvm/llvm-project] 070315: Revert "Allow signposts to take advantage of defer...

[Jonas Devlieghere via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 070315d04c6bb259ab058bd15a851124a7c7f6e6
      https://github.com/llvm/llvm-project/commit/070315d04c6bb259ab058bd15a851124a7c7f6e6
  Author: Jonas Devlieghere <jonas at devlieghere.com>
  Date:   2021-10-11 (Mon, 11 Oct 2021)

  Changed paths:
    M lldb/include/lldb/Utility/Timer.h
    M lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
    M lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
    M lldb/source/Utility/Timer.cpp
    M llvm/include/llvm/Config/config.h.cmake
    M llvm/include/llvm/Config/llvm-config.h.cmake
    M llvm/include/llvm/Support/Signposts.h
    M llvm/lib/Support/Signposts.cpp
    M llvm/lib/Support/Timer.cpp

  Log Message:
  -----------
  Revert "Allow signposts to take advantage of deferred string substitution"

This reverts commits f9aba9a5afe09788eceb9879aa5c3ad345e0f1e9 and
035217ff515b8ecdc871e39fa840f3cba1b9cec7.

As explained in the original commit message, this didn't have the
intended effect of improving the common LLDB use case, but still
provided a marginal improvement for the places where LLDB creates a
scoped time with a string literal.

The reason for the revert is that this change pulls in the os/signpost.h
header in Signposts.h. The former transitively includes loader.h, which
contains a series of macro defines that conflict with MachO.h. There are
ways to work around that, but Adrian and I concluded that  none of them
are worth the trade-off in complicating Signposts.h even further.