--- a/hotspot/src/os/aix/vm/decoder_aix.hpp	Sat Jan 16 00:28:28 2016 +0000
+++ b/hotspot/src/os/aix/vm/decoder_aix.hpp	Wed Jan 13 17:55:57 2016 +0100
@@ -36,13 +36,15 @@
 
   virtual bool can_decode_C_frame_in_vm() const { return true; }
 
-  virtual bool demangle(const char* symbol, char* buf, int buflen) { return false; } // demangled by getFuncName
+  virtual bool demangle(const char* symbol, char* buf, int buflen) { return false; } // use AixSymbols::get_function_name to demangle
 
   virtual bool decode(address addr, char* buf, int buflen, int* offset, const char* modulepath, bool demangle) {
-    return (::getFuncName((codeptr_t)addr, buf, buflen, offset, 0, 0, 0, demangle) == 0);
+    return AixSymbols::get_function_name(addr, buf, buflen, offset, 0, demangle);
   }
   virtual bool decode(address addr, char *buf, int buflen, int* offset, const void *base) {
     ShouldNotReachHere();
     return false;
   }
+
 };
+