[llvm-branch-commits] [llvm-gcc-branch] r100053 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/llvm-debug.cpp gcc/llvm-linker-hack.cpp

[Devang Patel]

Author: dpatel
Date: Wed Mar 31 16:50:51 2010
New Revision: 100053

URL: http://llvm.org/viewvc/llvm-project?rev=100053&view=rev
Log:
Merge debug info speedup and cleanup patches, mostly done by Chris, from mainline.


Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-linker-hack.cpp

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 31 16:50:51 2010
@@ -1 +1 @@
-/llvm-gcc-4.2/trunk:98728,98841,98893,99305,99592-99593
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp?rev=100053&r1=100052&r2=100053&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp Wed Mar 31 16:50:51 2010
@@ -475,7 +475,7 @@
   llvm::DILocation DL = 
     DebugFactory.CreateLocation(CurLineNo, 0 /* column */, VarScope, DO);
   
-  Call->setMetadata("dbg", DL.getNode());
+  Call->setDbgMetadata(DL.getNode());
 }
 
 

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-linker-hack.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-linker-hack.cpp?rev=100053&r1=100052&r2=100053&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-linker-hack.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-linker-hack.cpp Wed Mar 31 16:50:51 2010
@@ -33,6 +33,7 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/PrettyStackTrace.h"
+#include "llvm/Support/IRBuilder.h"
 #include "llvm/Support/raw_os_ostream.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetRegistry.h"
@@ -97,6 +98,9 @@
   llvm::DIFactory::DIFactory(*static_cast<llvm::Module *>(0));
   std::string Err;
   llvm::TargetRegistry::lookupTarget("", Err);
+
+  llvm::IRBuilder<> * volatile X;
+  X->getCurrentFunctionReturnType();
 }
 
 /* LLVM LOCAL end (ENTIRE FILE!)  */