Mercurial > hg > release > icedtea7-2.6
changeset 2021:1e9e68b48fbb
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 | 4442abcf2ff5 |
| children | e883c3f9b582 |
| 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 Fri Sep 04 07:14:31 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-04 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Fri Sep 04 07:14:31 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";