Add isClosure() predicate. This is used to add DW_AT_APPLE_block attribute.

Patch by Caroline Tice.

llvm-svn: 80061

2 files changed, 6 insertions, 5 deletions

diff --git a/llvm/include/llvm/Analysis/DebugInfo.h b/llvm/include/llvm/Analysis/DebugInfo.h
index 4f86f50aec5..aabddb01a5b 100644
--- a/llvm/include/llvm/Analysis/DebugInfo.h
+++ b/llvm/include/llvm/Analysis/DebugInfo.h
@@ -173,7 +173,8 @@ namespace llvm {
     enum {
       FlagPrivate   = 1 << 0,
       FlagProtected = 1 << 1,
-      FlagFwdDecl   = 1 << 2
+      FlagFwdDecl   = 1 << 2,
+      FlagClosure   = 1 << 3
     };
 
   protected:
@@ -226,6 +227,9 @@ namespace llvm {
     bool isForwardDecl() const          {
         return (getFlags() & FlagFwdDecl) != 0; 
     }
+    bool isClosure() const          {
+        return (getFlags() & FlagClosure) != 0; 
+    }
 
     /// dump - print type.
     void dump() const;
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 067db8b848e..e053597ab1c 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -695,10 +695,7 @@ void DwarfDebug::ConstructTypeDIE(CompileUnit *DW_Unit, DIE &Buffer,
       Buffer.AddChild(ElemDie);
     }
 
-    // FIXME: We'd like an API to register additional attributes for the
-    // frontend to use while synthesizing, and then we'd use that api in clang
-    // instead of this.
-    if (Name == "__block_literal_generic")
+    if (CTy.isClosure())
       AddUInt(&Buffer, dwarf::DW_AT_APPLE_block, dwarf::DW_FORM_flag, 1);
 
     unsigned RLang = CTy.getRunTimeLang();