Revert r196270, "Generalize debug info / EH emission in AsmPrinter"

It broke CodeGen/R600 tests with +Asserts.

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

1 files changed, 4 insertions, 13 deletions

diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h
index 24e2145e4a..d117cfddb6 100644
--- a/include/llvm/CodeGen/AsmPrinter.h
+++ b/include/llvm/CodeGen/AsmPrinter.h
@@ -22,7 +22,6 @@
 #include "llvm/Support/ErrorHandling.h"
 
 namespace llvm {
-  class AsmPrinterHandler;
   class BlockAddress;
   class GCStrategy;
   class Constant;
@@ -111,21 +110,13 @@ namespace llvm {
     /// function.
     MachineLoopInfo *LI;
 
-    struct HandlerInfo {
-      AsmPrinterHandler *Handler;
-      const char *TimerName, *TimerGroupName;
-      HandlerInfo(AsmPrinterHandler *Handler, const char *TimerName,
-                  const char *TimerGroupName)
-          : Handler(Handler), TimerName(TimerName),
-            TimerGroupName(TimerGroupName) {}
-    };
-    /// Handlers - a vector of all debug/EH info emitters we should use.
-    /// This vector maintains ownership of the emitters.
-    SmallVector<HandlerInfo, 1> Handlers;
-
     /// DD - If the target supports dwarf debug info, this pointer is non-null.
     DwarfDebug *DD;
 
+    /// DE - If the target supports dwarf exception info, this pointer is
+    /// non-null.
+    DwarfException *DE;
+
   protected:
     explicit AsmPrinter(TargetMachine &TM, MCStreamer &Streamer);