[llvm-commits] [llvm-gcc-4.2] r61243 - /llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

[Rafael Espindola]

Author: rafael
Date: Fri Dec 19 10:16:06 2008
New Revision: 61243

URL: http://llvm.org/viewvc/llvm-project?rev=61243&view=rev
Log:
Revert revision 61207.
Fixes bug 3236.


Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=61243&r1=61242&r2=61243&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Fri Dec 19 10:16:06 2008
@@ -325,14 +325,8 @@
   
   // Check to see if the compile unit already has created this type.
   DIType &Slot = TypeCache[type];
-  bool SlotIsFwdDecl = false;
-  if (!Slot.isNull()) {
-    if (Slot.getFlags() == DW_AT_declaration
-        && TYPE_SIZE(type) != 0)
-      SlotIsFwdDecl = true;
-    if (!SlotIsFwdDecl)
-      return Slot;
-  }
+  if (!Slot.isNull())
+    return Slot;
   
   DIType MainTy;
   if (type != TYPE_MAIN_VARIANT(type))
@@ -551,7 +545,7 @@
       expanded_location Loc = GetNodeLocation(TREE_CHAIN(type), false);
       std::string Filename, Directory;
       DirectoryAndFile(Loc.file, Directory, Filename);
-      llvm::DIType FwdDecl = SlotIsFwdDecl ? Slot :
+      llvm::DIType FwdDecl =
         DebugFactory.CreateCompositeType(Tag, Unit, TypeName, Unit, Loc.line, 
                                          0, 0, 0, DW_AT_declaration,
                                          llvm::DIType(), llvm::DIArray(),
@@ -752,4 +746,3 @@
 }
 
 /* LLVM LOCAL end (ENTIRE FILE!)  */
-