Fix DEBUGLOG_WITH_STREAM_TYPE_AND_FILE broken in #150750
#150920
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-llvm-support Author: Ingo Müller (ingomueller-net) ChangesThis PR fixes the Full diff: https://github.com/llvm/llvm-project/pull/150920.diff 1 Files Affected:
diff --git a/llvm/include/llvm/Support/DebugLog.h b/llvm/include/llvm/Support/DebugLog.h
index 19d309865bbd4..5e308eb993036 100644
--- a/llvm/include/llvm/Support/DebugLog.h
+++ b/llvm/include/llvm/Support/DebugLog.h
@@ -40,8 +40,8 @@ namespace llvm {
DEBUGLOG_WITH_STREAM_TYPE_AND_FILE(STREAM, TYPE, __SHORT_FILE__)
#else
#define DEBUGLOG_WITH_STREAM_AND_TYPE(STREAM, TYPE) \
- DEBUGLOG_WITH_STREAM_TYPE_AND_FILE( \
- STREAM, TYPE, ::llvm::impl::LogWithNewline::getShortFileName(__FILE__))
+ DEBUGLOG_WITH_STREAM_TYPE_AND_FILE(STREAM, TYPE, \
+ ::llvm::impl::getShortFileName(__FILE__))
#endif
namespace impl {
|
joker-eph
approved these changes
Jul 28, 2025
There was a problem hiding this comment.
Thanks!
We don't exercise this code path upstream right now.
What about adding this diff to your PR:
diff --git a/llvm/unittests/Support/DebugLogTest.cpp b/llvm/unittests/Support/DebugLogTest.cpp
index 8356ae856be2..3c82376734b9 100644
--- a/llvm/unittests/Support/DebugLogTest.cpp
+++ b/llvm/unittests/Support/DebugLogTest.cpp
@@ -6,6 +6,11 @@
//
//===----------------------------------------------------------------------===//
+// This macro is defined in the LLVM build system, but we undefine it here
+// so that we test at least once in-tree the case where __SHORT_FILE__ is not
+// defined.
+#undef __SHORT_FILE__
+
#include "llvm/Support/DebugLog.h"
#include "llvm/ADT/Sequence.h"
#include "llvm/Support/raw_ostream.h"
|
Sounds good! Will update the PR shortly. |
ingomueller-net
force-pushed
the
fix-ldbg-macro
branch
from
fe079da to
c51eb1f
Compare
This PR fixes the `DEBUGLOG_WITH_STREAM_TYPE_AND_FILE` macro that got broken in llvm#150750. That PR introduces a more sophisitaced version of that macro and refactored some code in that process, making the `getShortFileName` a free function instead of a class member function, but did not adapt this macro to the refactored code. Signed-off-by: Ingo Müller <[email protected]>
As suggested by @joker-ehp, this commit undefines `__SHORTFILE__` in `DebugLogTest.cpp` order to make the previously broken variant of `DEBUGLOG_WITH_STREAM_AND_TYPE` being tested at least in this one test, as it is otherwise never used in CI. Signed-off-by: Ingo Müller <[email protected]>
ingomueller-net
force-pushed
the
fix-ldbg-macro
branch
from
c51eb1f to
9029837
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the
DEBUGLOG_WITH_STREAM_TYPE_AND_FILEmacro that got broken in #150750. That PR introduces a more sophisitaced version of that macro and refactored some code in that process, making thegetShortFileNamea free function instead of a class member function, but did not adapt this macro to the refactored code.