search

apple / llvm-project

The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. This fork is used to manage Apple’s stable releases of Clang as well as support the Swift project.
https://llvm.org
Other
1.1k stars 320 forks source link

[lldb] Fix macros in noasserts after #8793 #8817

Closed drodriguez closed 1 month ago

drodriguez commented 1 month ago

In #8793 the macro in the modified file is changed to remove the last parameter, but the original change fails to realize that the macro is only the asserts/NDEBUG version of the macro, and the code will fail to compile when building in noasserts mode.

Remove the last argument in the other macro, and use the same default when invoking the FALLBACK macro.

drodriguez commented 1 month ago

@swift-ci please test llvm

drodriguez commented 1 month ago

@swift-ci please smoke test

drodriguez commented 1 month ago

@swift-ci please test macOS platform

drodriguez commented 1 month ago

@swift-ci please test Linux platform

drodriguez commented 1 month ago

The failures in LLVM Test are the following:

  Clang :: Driver/lanai-unknown-unknown.cpp
  Clang :: Driver/mipsel-nacl-defines.cpp
  Clang :: Driver/wasm32-unknown-unknown.cpp
  Clang :: Driver/wasm64-unknown-unknown.cpp
  Clang :: Driver/x86_64-nacl-defines.cpp
  Clang :: FixIt/format.cpp

For FixIt/format.cpp I left a comment a month ago in https://github.com/apple/llvm-project/pull/8638#discussion_r1587848262

For the Driver/ ones is probably because #8668 is in stable/20230725, but not in swift/release/6.0.

drodriguez commented 1 month ago

@ravimad: if you don't mind reviewing this small fix

drodriguez commented 1 month ago

Same fix done by @adrian-prantl in #8829 . Closing this one.