2 files changed, 31 insertions, 10 deletions
diff --git a/llvm/include/llvm/CodeGen/DIE.h b/llvm/include/llvm/CodeGen/DIE.h
index fcf70977365..b1424585682 100644
--- a/llvm/include/llvm/CodeGen/DIE.h
+++ b/llvm/include/llvm/CodeGen/DIE.h
@@ -111,16 +111,8 @@ public:
 class DIEValue {
 public:
   enum Type {
-    isInteger,
-    isString,
-    isExpr,
-    isLabel,
-    isDelta,
-    isEntry,
-    isTypeSignature,
-    isBlock,
-    isLoc,
-    isLocList,
+#define HANDLE_DIEVALUE(T) is##T,
+#include "llvm/CodeGen/DIEValue.def"
   };
 
 private:
diff --git a/llvm/include/llvm/CodeGen/DIEValue.def b/llvm/include/llvm/CodeGen/DIEValue.def
new file mode 100644
index 00000000000..5d7ae2103b4
--- /dev/null
+++ b/llvm/include/llvm/CodeGen/DIEValue.def
@@ -0,0 +1,29 @@
+//===- llvm/CodeGen/DIEValue.def - DIEValue types ---------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Macros for running through all types of DIEValue.
+//
+//===----------------------------------------------------------------------===//
+
+#if !(defined HANDLE_DIEVALUE)
+#error "Missing macro definition of HANDLE_DIEVALUE"
+#endif
+
+HANDLE_DIEVALUE(Integer)
+HANDLE_DIEVALUE(String)
+HANDLE_DIEVALUE(Expr)
+HANDLE_DIEVALUE(Label)
+HANDLE_DIEVALUE(Delta)
+HANDLE_DIEVALUE(Entry)
+HANDLE_DIEVALUE(TypeSignature)
+HANDLE_DIEVALUE(Block)
+HANDLE_DIEVALUE(Loc)
+HANDLE_DIEVALUE(LocList)
+
+#undef HANDLE_DIEVALUE