[llvm-branch-commits] [llvm-gcc-branch] r93740 - /llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp

[Bill Wendling]

Author: void
Date: Mon Jan 18 12:20:53 2010
New Revision: 93740

URL: http://llvm.org/viewvc/llvm-project?rev=93740&view=rev
Log:
$ svn merge -c 93620 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r93620 into '.':
U    gcc/llvm-debug.cpp


Modified:
    llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp?rev=93740&r1=93739&r2=93740&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-debug.cpp Mon Jan 18 12:20:53 2010
@@ -263,20 +263,21 @@
     Virtuality = dwarf::DW_VIRTUALITY_virtual;
     ContainingType = getOrCreateType(DECL_CONTEXT (FnDecl));
   }
-  bool UseModuleContext = false;
+
+  bool ArtificialFnWithAbstractOrigin = false;
   // If this artificial function has abstract origin then put this function
   // at module scope. The abstract copy will be placed in appropriate region.
-  if (DECL_ABSTRACT_ORIGIN (FnDecl) != FnDecl
-      && DECL_ARTIFICIAL(FnDecl))
-    UseModuleContext = true;
-  
+  if (DECL_ARTIFICIAL (FnDecl)
+      && DECL_ABSTRACT_ORIGIN (FnDecl)
+      && DECL_ABSTRACT_ORIGIN (FnDecl) != FnDecl)
+    ArtificialFnWithAbstractOrigin = true;
+
   const char *FnName = lang_hooks.dwarf_name(FnDecl, 0);
   DISubprogram SP = 
-    DebugFactory.CreateSubprogram((UseModuleContext ?
-                                   getOrCreateCompileUnit(main_input_filename) :
-                                   findRegion(DECL_CONTEXT(FnDecl))),
-                                  (UseModuleContext ? FnName : StringRef()), 
-                                  (UseModuleContext ? FnName : StringRef()), 
+    DebugFactory.CreateSubprogram(ArtificialFnWithAbstractOrigin ?
+                                  getOrCreateCompileUnit(main_input_filename) :
+                                  findRegion (DECL_CONTEXT(FnDecl)),
+                                  FnName, FnName,
                                   LinkageName,
                                   getOrCreateCompileUnit(Loc.file), lineno,
                                   FNType,