From 025191d42feb2636026efeb93d9f5b05de0571ea Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Thu, 21 Apr 2016 22:19:24 +0000 Subject: Improve error message reporting for MachineFunctionProperties When printing the properties required by a pass, only print the properties that are set, and not those that are clear (only properties that are set are verified, clear properties are "don't-care"). llvm-svn: 267070 --- llvm/lib/CodeGen/MachineFunction.cpp | 4 +++- llvm/lib/CodeGen/MachineFunctionPass.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'llvm/lib') diff --git a/llvm/lib/CodeGen/MachineFunction.cpp b/llvm/lib/CodeGen/MachineFunction.cpp index da6b778cc6c..641ec74fc99 100644 --- a/llvm/lib/CodeGen/MachineFunction.cpp +++ b/llvm/lib/CodeGen/MachineFunction.cpp @@ -54,11 +54,13 @@ static cl::opt void MachineFunctionInitializer::anchor() {} -void MachineFunctionProperties::print(raw_ostream &ROS) const { +void MachineFunctionProperties::print(raw_ostream &ROS, bool OnlySet) const { // Leave this function even in NDEBUG as an out-of-line anchor. #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP) for (BitVector::size_type i = 0; i < Properties.size(); ++i) { bool HasProperty = Properties[i]; + if (OnlySet && !HasProperty) + continue; switch(static_cast(i)) { case Property::IsSSA: ROS << (HasProperty ? "SSA, " : "Post SSA, "); diff --git a/llvm/lib/CodeGen/MachineFunctionPass.cpp b/llvm/lib/CodeGen/MachineFunctionPass.cpp index f6cb36e1a20..16aecb9dff4 100644 --- a/llvm/lib/CodeGen/MachineFunctionPass.cpp +++ b/llvm/lib/CodeGen/MachineFunctionPass.cpp @@ -49,7 +49,7 @@ bool MachineFunctionPass::runOnFunction(Function &F) { errs() << "MachineFunctionProperties required by " << getPassName() << " pass are not met by function " << F.getName() << ".\n" << "Required properties: "; - RequiredProperties.print(errs()); + RequiredProperties.print(errs(), /*OnlySet=*/true); errs() << "\nCurrent properties: "; MFProps.print(errs()); errs() << "\n"; -- cgit v1.2.3