Mercurial > hg > release > icedtea6-1.7
changeset 1715:081f65658c7e
2009-09-17 Xerxes R?nby <xerxes@zafena.se>
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
(SharkBuilder::CreateDump):
Make Shark debug code LLVM 2.6 API compatible.
| author | Xerxes R?nby <xerxes@zafena.se> |
|---|---|
| date | Thu, 17 Sep 2009 13:18:45 +0200 |
| parents | e3b3dd42d933 |
| children | b9a444f3081b |
| files | ChangeLog ports/hotspot/src/share/vm/shark/sharkBuilder.cpp |
| diffstat | 2 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 Xerxes Rånby <xerxes@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@redhat.com> * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.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 @@ 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";