From a2cd6a504ccb29dee04dd7d8cd1caf355638f355 Mon Sep 17 00:00:00 2001 From: Frederic Riss Date: Sat, 28 Feb 2015 00:29:01 +0000 Subject: [PATCH] [dsymutil] Create warn() global helper... ...and reimplement DwarfLinker::reportWarning in terms of it. Other compenents than the DwarfLinker will need to report warnings, and I'm about to add a similar "error()" helper at the same global level so make that consistent. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230820 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/dsymutil/DwarfLinker.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp index 3c0bc0b85af..71af214e434 100644 --- a/tools/dsymutil/DwarfLinker.cpp +++ b/tools/dsymutil/DwarfLinker.cpp @@ -23,6 +23,11 @@ namespace dsymutil { namespace { +void warn(const Twine &Warning, const Twine &Context) { + errs() << Twine("while processing ") + Context + ":\n"; + errs() << Twine("warning: ") + Warning + "\n"; +} + /// \brief Stores all information relating to a compile unit, be it in /// its original instance in the object file to its brand new cloned /// and linked DIE tree. @@ -219,10 +224,10 @@ const DWARFDebugInfoEntryMinimal *DwarfLinker::resolveDIEReference( /// information about a specific \p DIE related to the warning. void DwarfLinker::reportWarning(const Twine &Warning, const DWARFUnit *Unit, const DWARFDebugInfoEntryMinimal *DIE) { + StringRef Context = ""; if (CurrentDebugObject) - errs() << Twine("while processing ") + - CurrentDebugObject->getObjectFilename() + ":\n"; - errs() << Twine("warning: ") + Warning + "\n"; + Context = CurrentDebugObject->getObjectFilename(); + warn(Warning, Context); if (!Verbose || !DIE) return; -- 2.34.1