Allow multiple -debug-only args

Debug output is shown if any of the -debug-only arguments match.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222547 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Matthias Braun 2014-11-21 18:06:09 +00:00
parent d1510d968c
commit 1f69d31727

View File

@ -51,14 +51,16 @@ DebugBufferSize("debug-buffer-size",
cl::Hidden,
cl::init(0));
static ManagedStatic<std::string> CurrentDebugType;
static ManagedStatic<std::vector<std::string> > CurrentDebugType;
namespace {
struct DebugOnlyOpt {
void operator=(const std::string &Val) const {
DebugFlag |= !Val.empty();
*CurrentDebugType = Val;
if (Val.empty())
return;
DebugFlag = true;
CurrentDebugType->push_back(Val);
}
};
@ -68,7 +70,7 @@ static DebugOnlyOpt DebugOnlyOptLoc;
static cl::opt<DebugOnlyOpt, true, cl::parser<std::string> >
DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"),
cl::Hidden, cl::value_desc("debug string"),
cl::Hidden, cl::ZeroOrMore, cl::value_desc("debug string"),
cl::location(DebugOnlyOptLoc), cl::ValueRequired);
// Signal handlers - dump debug output on termination.
@ -87,7 +89,15 @@ static void debug_user_sig_handler(void *Cookie) {
// with the -debug-only=X option.
//
bool llvm::isCurrentDebugType(const char *DebugType) {
return CurrentDebugType->empty() || DebugType == *CurrentDebugType;
if (CurrentDebugType->empty())
return true;
// see if DebugType is in list. Note: do not use find() as that forces us to
// unnecessarily create an std::string instance.
for (auto d : *CurrentDebugType) {
if (d == DebugType)
return true;
}
return false;
}
/// setCurrentDebugType - Set the current debug type, as if the -debug-only=X
@ -95,7 +105,8 @@ bool llvm::isCurrentDebugType(const char *DebugType) {
/// debug output to be produced.
///
void llvm::setCurrentDebugType(const char *Type) {
*CurrentDebugType = Type;
CurrentDebugType->clear();
CurrentDebugType->push_back(Type);
}
/// dbgs - Return a circular-buffered debug stream.