Revert r334649 "[Timers] Use the pass argument name for JSON keys in time-passes"

This reverts commit r334649.

This breaks a test.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@334651 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 1 insertions, 19 deletions

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 }