diff -r aae7db185576 -r a6ab7217b5cc hotspot/src/share/vm/runtime/os.hpp
--- a/hotspot/src/share/vm/runtime/os.hpp	Mon Jun 15 14:33:51 2015 -0700
+++ b/hotspot/src/share/vm/runtime/os.hpp	Tue Jun 16 11:58:25 2015 +0200
@@ -539,7 +539,8 @@
   // If function name is not found, buf[0] is set to '\0' and offset is
   // set to -1 (if offset is non-NULL).
   static bool dll_address_to_function_name(address addr, char* buf,
-                                           int buflen, int* offset);
+                                           int buflen, int* offset,
+                                           bool demangle = true);
 
   // Locate DLL/DSO. On success, full path of the library is copied to
   // buf, and offset is optionally set to be the distance between addr