Skip to content

[Support] Use macro var args to allow templates within DEBUG_WITH_TYPE #117614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 5, 2024
Merged

[Support] Use macro var args to allow templates within DEBUG_WITH_TYPE #117614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c40a09
[Debug] Use macro var args to allow templates within a DEBUG_WITH_TYP…
TylerNowicki Nov 25, 2024
6cebcaa
SWDEV-303548 - Clang format
TylerNowicki Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions llvm/include/llvm/Support/Debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,20 @@ void setCurrentDebugTypes(const char **Types, unsigned Count);
///
/// This will emit the debug information if -debug is present, and -debug-only
/// is not specified, or is specified as "bitset".
#define DEBUG_WITH_TYPE(TYPE, X) \
do { if (::llvm::DebugFlag && ::llvm::isCurrentDebugType(TYPE)) { X; } \
#define DEBUG_WITH_TYPE(TYPE, ...) \
do { \
if (::llvm::DebugFlag && ::llvm::isCurrentDebugType(TYPE)) { \
__VA_ARGS__; \
} \
} while (false)

#else
#define isCurrentDebugType(X) (false)
#define setCurrentDebugType(X) do { (void)(X); } while (false)
#define setCurrentDebugTypes(X, N) do { (void)(X); (void)(N); } while (false)
#define DEBUG_WITH_TYPE(TYPE, X) do { } while (false)
#define DEBUG_WITH_TYPE(TYPE, ...) \
do { \
} while (false)
#endif

/// This boolean is set to true if the '-debug' command line option
Expand Down Expand Up @@ -98,7 +103,7 @@ raw_ostream &dbgs();
//
// LLVM_DEBUG(dbgs() << "Bitset contains: " << Bitset << "\n");
//
#define LLVM_DEBUG(X) DEBUG_WITH_TYPE(DEBUG_TYPE, X)
#define LLVM_DEBUG(...) DEBUG_WITH_TYPE(DEBUG_TYPE, __VA_ARGS__)

} // end namespace llvm

Expand Down
20 changes: 20 additions & 0 deletions llvm/unittests/Support/DebugTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
//===----------------------------------------------------------------------===//

#include "llvm/Support/Debug.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/raw_ostream.h"
#include "gtest/gtest.h"

Expand All @@ -30,4 +32,22 @@ TEST(DebugTest, Basic) {
DEBUG_WITH_TYPE("B", os2 << "B");
EXPECT_EQ("A", os2.str());
}

TEST(DebugTest, CommaInDebugBlock) {
std::string s1, s2;
raw_string_ostream os1(s1), os2(s2);
static const char *DT[] = {"A", "B"};
static const char Letters[] = {'X', 'Y', 'Z'};

llvm::DebugFlag = true;
setCurrentDebugTypes(DT, 2);
DEBUG_WITH_TYPE("A", {
SmallMapVector<int, char, 4> map;
for (int i = 0; i < 3; i++)
map[i] = Letters[i];
for (int i = 2; i >= 0; i--)
os1 << map[i];
});
EXPECT_EQ("ZYX", os1.str());
}
#endif
Loading