From b70e35686b18a23d7fffa3060ef37a2279306155 Mon Sep 17 00:00:00 2001
From: Vedant Kumar <vsk@apple.com>
Date: Thu, 24 May 2018 23:00:22 +0000
Subject: [PATCH] [Debugify] Avoid printing unnecessary square braces, NFC

llvm-svn: 333236
---
 llvm/test/DebugInfo/debugify.ll                      | 4 ++--
 llvm/test/Transforms/Mem2Reg/PromoteMemToRegister.ll | 2 +-
 llvm/tools/opt/Debugify.cpp                          | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/llvm/test/DebugInfo/debugify.ll b/llvm/test/DebugInfo/debugify.ll
index fd265378a4e3..91e2371e16a2 100644
--- a/llvm/test/DebugInfo/debugify.ll
+++ b/llvm/test/DebugInfo/debugify.ll
@@ -84,6 +84,6 @@ define weak_odr zeroext i1 @baz() {
 ; CHECK-FAIL: WARNING: Missing line 3
 ; CHECK-FAIL: WARNING: Missing line 4
 ; CHECK-FAIL: ERROR: Missing variable 1
-; CHECK-FAIL: CheckModuleDebugify [{{.*}}]: FAIL
+; CHECK-FAIL: CheckModuleDebugify: FAIL
 
-; PASS: CheckModuleDebugify [{{.*}}]: PASS
+; PASS: CheckModuleDebugify: PASS
diff --git a/llvm/test/Transforms/Mem2Reg/PromoteMemToRegister.ll b/llvm/test/Transforms/Mem2Reg/PromoteMemToRegister.ll
index 08221907596b..202b206d7498 100644
--- a/llvm/test/Transforms/Mem2Reg/PromoteMemToRegister.ll
+++ b/llvm/test/Transforms/Mem2Reg/PromoteMemToRegister.ll
@@ -2,7 +2,7 @@
 ; RUN: opt < %s -debugify -mem2reg -check-debugify -S 2>&1 | FileCheck %s
 
 ; CHECK-NOT: alloca
-; CHECK: CheckModuleDebugify [{{.*}}]: PASS
+; CHECK: CheckModuleDebugify: PASS
 
 define double @testfunc(i32 %i, double %j) {
 	%I = alloca i32		; <i32*> [#uses=4]
diff --git a/llvm/tools/opt/Debugify.cpp b/llvm/tools/opt/Debugify.cpp
index 39bbaa813161..fb810da231f2 100644
--- a/llvm/tools/opt/Debugify.cpp
+++ b/llvm/tools/opt/Debugify.cpp
@@ -191,8 +191,10 @@ bool checkDebugifyMetadata(Module &M,
     errs() << "ERROR: Missing variable " << Idx + 1 << "\n";
   HasErrors |= MissingVars.count() > 0;
 
-  errs() << Banner << " [" << NameOfWrappedPass << "]: "
-         << (HasErrors ? "FAIL" : "PASS") << '\n';
+  errs() << Banner;
+  if (!NameOfWrappedPass.empty())
+    errs() << " [" << NameOfWrappedPass << "]";
+  errs() << ": " << (HasErrors ? "FAIL" : "PASS") << '\n';
   if (HasErrors) {
     errs() << "Module IR Dump\n";
     M.print(errs(), nullptr, false);