From 23fd0c8116e8b7db299e44c4940f473da2bd5567 Mon Sep 17 00:00:00 2001
From: kai <kai@redstar.de>
Date: Sun, 16 Jun 2013 20:21:53 +0200
Subject: [PATCH] Add debug info for enums.

Previously enums were reduced to the underlying type.
Now the symbolic constants can be used.

This is a bug-fixed version of commit 001a3964.
---
 gen/todebug.cpp | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/gen/todebug.cpp b/gen/todebug.cpp
index de10353b..62c2e5df 100644
--- a/gen/todebug.cpp
+++ b/gen/todebug.cpp
@@ -149,11 +149,35 @@ static llvm::DIType dwarfBasicType(Type* type)
 static llvm::DIType dwarfEnumType(Type *type)
 {
     llvm::Type *T = DtoType(type);
-    Type *t = type->toBasetype();
 
-    // FIXME
+    assert(type->ty == Tenum && "only enums allowed for debug info in dwarfEnumType");
+    TypeEnum *te = static_cast<TypeEnum *>(type);
+    llvm::SmallVector<llvm::Value *, 8> subscripts;
+    for (ArrayIter<Dsymbol> it(te->sym->members); it.more(); it.next())
+    {
+        EnumMember *em = it->isEnumMember();
+        llvm::StringRef Name(em->toChars() /*em->ident->string*/);
+        uint64_t Val = em->value->toInteger();
+        llvm::Value *Subscript = gIR->dibuilder.createEnumerator(Name, Val);
+        subscripts.push_back(Subscript);
+    }
 
-    return llvm::DIType(NULL);
+    llvm::StringRef Name = te->toChars();
+    unsigned LineNumber = te->sym->loc.linnum;
+    llvm::DIFile File = DtoDwarfFile(te->sym->loc);
+
+    return gIR->dibuilder.createEnumerationType(
+        llvm::DIDescriptor(File),
+        Name,
+        File,
+        LineNumber,
+        getTypeBitSize(T), // size (bits)
+        getABITypeAlign(T)*8, // align (bits)
+        gIR->dibuilder.getOrCreateArray(subscripts) // subscripts
+#if LDC_LLVM_VER >= 302
+        , dwarfTypeDescription_impl(te->sym->memtype, NULL)
+#endif
+    );
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -463,12 +487,14 @@ static llvm::DIType dwarfTypeDescription_impl(Type* type, const char* c_name)
     Type* t = type->toBasetype();
     if (t->ty == Tvoid)
         return llvm::DIType(NULL);
-    else if (t->ty == Tvector)
-        return dwarfVectorType(type);
-    else if (t->ty == Tenum)
-        return dwarfEnumType(type);
     else if (t->isintegral() || t->isfloating())
+    {
+        if (t->ty == Tvector)
+            return dwarfVectorType(type);
+        if (type->ty == Tenum)
+            return dwarfEnumType(type);
         return dwarfBasicType(type);
+    }
     else if (t->ty == Tpointer)
         return dwarfPointerType(type);
     else if (t->ty == Tarray)