From 11b5edffb3ca92da24412d08bbf07e852caec83d Mon Sep 17 00:00:00 2001
From: Francis Visoiu Mistrih <francisvm@yahoo.com>
Date: Wed, 13 Jun 2018 20:44:02 +0000
Subject: [PATCH] Revert r334649 "[Timers] Use the pass argument name for JSON
 keys in time-passes"

This reverts commit r334649.

This breaks a test.

llvm-svn: 334651
---
 lib/IR/LegacyPassManager.cpp               |  6 +-----
 test/CodeGen/X86/time-passes-json-stats.ll | 14 --------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 test/CodeGen/X86/time-passes-json-stats.ll

diff --git a/lib/IR/LegacyPassManager.cpp b/lib/IR/LegacyPassManager.cpp
index 46bfba7f5a0..b04787cb30e 100644
--- a/lib/IR/LegacyPassManager.cpp
+++ b/lib/IR/LegacyPassManager.cpp
@@ -545,11 +545,7 @@ public:
     Timer *&T = TimingData[P];
     if (!T) {
       StringRef PassName = P->getPassName();
-      StringRef PassArgument;
-      if (const PassInfo *PI = Pass::lookupPassInfo(P->getPassID()))
-        PassArgument = PI->getPassArgument();
-      T = new Timer(PassArgument.empty() ? PassName : PassArgument, PassName,
-                    TG);
+      T = new Timer(PassName, PassName, TG);
     }
     return T;
   }
diff --git a/test/CodeGen/X86/time-passes-json-stats.ll b/test/CodeGen/X86/time-passes-json-stats.ll
deleted file mode 100644
index 70049b2363e..00000000000
--- a/test/CodeGen/X86/time-passes-json-stats.ll
+++ /dev/null
@@ -1,14 +0,0 @@
-; RUN: llc -mtriple=x86_64-- -stats-json=true -stats -time-passes %s -o /dev/null 2>&1 | FileCheck %s
-
-; Verify that we use the argument pass name instead of the full name as a json
-; key for timers.
-;
-; CHECK: {
-; CHECK-NEXT: "asm-printer.EmittedInsts":
-; CHECK-NOT: Virtual Register Map
-; CHECK: "time.pass.virtregmap.wall":
-; CHECK: "time.pass.virtregmap.user":
-; CHECK: "time.pass.virtregmap.sys":
-; CHECK: Virtual Register Map
-
-define void @test_stats() { ret void }