[llvm-commits] [dragonegg] r88799 - in /dragonegg/trunk: llvm-convert.cpp llvm-debug.cpp llvm-debug.h

[Duncan Sands]

Author: baldrick
Date: Sat Nov 14 10:42:47 2009
New Revision: 88799

URL: http://llvm.org/viewvc/llvm-project?rev=88799&view=rev
Log:
Complete sync with llvm-gcc revision 88701: port some
llvm-gcc changes that I missed somehow.

Modified:
    dragonegg/trunk/llvm-convert.cpp
    dragonegg/trunk/llvm-debug.cpp
    dragonegg/trunk/llvm-debug.h

Modified: dragonegg/trunk/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-convert.cpp?rev=88799&r1=88798&r2=88799&view=diff

==============================================================================
--- dragonegg/trunk/llvm-convert.cpp (original)
+++ dragonegg/trunk/llvm-convert.cpp Sat Nov 14 10:42:47 2009
@@ -1827,11 +1827,11 @@
   if (TheDebugInfo) {
     if (DECL_NAME(decl)) {
       TheDebugInfo->EmitDeclare(decl, dwarf::DW_TAG_auto_variable,
-                                AI->getName(), TREE_TYPE(decl), AI,
+                                AI->getNameStr().c_str(), TREE_TYPE(decl), AI,
                                 Builder);
     } else if (TREE_CODE(decl) == RESULT_DECL) {
       TheDebugInfo->EmitDeclare(decl, dwarf::DW_TAG_return_variable,
-                                AI->getName(), TREE_TYPE(decl), AI,
+                                AI->getNameStr().c_str(), TREE_TYPE(decl), AI,
                                 Builder);
     }
   }

Modified: dragonegg/trunk/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-debug.cpp?rev=88799&r1=88798&r2=88799&view=diff

==============================================================================
--- dragonegg/trunk/llvm-debug.cpp (original)
+++ dragonegg/trunk/llvm-debug.cpp Sat Nov 14 10:42:47 2009
@@ -295,7 +295,7 @@
 
 /// EmitDeclare - Constructs the debug code for allocation of a new variable.
 /// region - "llvm.dbg.declare."
-void DebugInfo::EmitDeclare(tree decl, unsigned Tag, StringRef Name,
+void DebugInfo::EmitDeclare(tree decl, unsigned Tag, const char *Name,
                             tree type, Value *AI,
                             LLVMBuilder &Builder) {
 

Modified: dragonegg/trunk/llvm-debug.h
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-debug.h?rev=88799&r1=88798&r2=88799&view=diff

==============================================================================
--- dragonegg/trunk/llvm-debug.h (original)
+++ dragonegg/trunk/llvm-debug.h Sat Nov 14 10:42:47 2009
@@ -87,7 +87,7 @@
 
   /// EmitDeclare - Constructs the debug code for allocation of a new variable.
   /// region - "llvm.dbg.declare."
-  void EmitDeclare(tree_node *decl, unsigned Tag, StringRef Name,
+  void EmitDeclare(tree_node *decl, unsigned Tag, const char *Name,
                    tree_node *type, Value *AI, LLVMBuilder &Builder);
 
   /// EmitStopPoint - Emit a call to llvm.dbg.stoppoint to indicate a change of