Mercurial > hg > truffle
diff src/share/vm/runtime/vm_version.cpp @ 4970:33df1aeaebbf
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 13:10:13 +0100 |
parents | 723df37192d6 c77d473e71f7 |
children | e522a00b91aa |
line wrap: on
line diff
--- a/src/share/vm/runtime/vm_version.cpp Fri Feb 24 18:30:42 2012 -0800 +++ b/src/share/vm/runtime/vm_version.cpp Mon Feb 27 13:10:13 2012 +0100 @@ -169,6 +169,13 @@ return VM_RELEASE; } +// NOTE: do *not* use stringStream. this function is called by +// fatal error handlers. if the crash is in native thread, +// stringStream cannot get resource allocated and will SEGV. +const char* Abstract_VM_Version::jre_release_version() { + return JRE_RELEASE_VERSION; +} + #define OS LINUX_ONLY("linux") \ WINDOWS_ONLY("windows") \ SOLARIS_ONLY("solaris") \