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

[Devang Patel]

Author: dpatel
Date: Mon Nov 16 15:44:21 2009
New Revision: 88970

URL: http://llvm.org/viewvc/llvm-project?rev=88970&view=rev
Log:
Fix context for static variable.

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=88970&r1=88969&r2=88970&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Mon Nov 16 15:44:21 2009
@@ -276,8 +276,6 @@
       context = TYPE_MAIN_VARIANT
         (TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (decl)))));
     
-    if (context && !TYPE_P (context))
-      context = NULL_TREE;
     if (context != NULL_TREE)
       return findRegion(context);
   }
@@ -405,7 +403,7 @@
       DispName = IDENTIFIER_POINTER(DECL_NAME(decl));
   }
     
-  DebugFactory.CreateGlobalVariable(getOrCreateCompileUnit(Loc.file), 
+  DebugFactory.CreateGlobalVariable(findRegion(decl),
                                     DispName, DispName,
                                     getLinkageName(decl), 
                                     getOrCreateCompileUnit(Loc.file), Loc.line,