/hg/icedtea6: 2009-09-17 Xerxes R?nby <xerxes at zafena.se>

[xranby at icedtea.classpath.org]

changeset 081f65658c7e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=081f65658c7e
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Sep 17 13:18:45 2009 +0200

	2009-09-17 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
	(SharkBuilder::CreateDump): Make Shark debug code LLVM 2.6
	API compatible.


diffstat:

2 files changed, 10 insertions(+)
ChangeLog                                         |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp |    4 ++++

diffs (28 lines):

diff -r e3b3dd42d933 -r 081f65658c7e ChangeLog
--- a/ChangeLog	Thu Sep 17 05:20:03 2009 -0400
+++ b/ChangeLog	Thu Sep 17 13:18:45 2009 +0200
@@ -1,3 +1,9 @@ 2009-09-17  Gary Benson  <gbenson at redhat
+2009-09-17  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::CreateDump):
+	Make Shark debug code LLVM 2.6 API compatible.
+
 2009-09-17  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp:
diff -r e3b3dd42d933 -r 081f65658c7e ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Thu Sep 17 05:20:03 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Thu Sep 17 13:18:45 2009 +0200
@@ -520,7 +520,11 @@ CallInst* SharkBuilder::CreateDump(Value
   const char *name;
   if (value->hasName())
     // XXX this leaks, but it's only debug code
+#if SHARK_LLVM_VERSION >= 26
+    name = strdup(value->getName().str().c_str());
+#else
     name = strdup(value->getName().c_str());
+#endif
   else
     name = "unnamed_value";