--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp	Tue Feb 13 23:38:34 2018 +0100
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp	Wed Feb 14 08:23:53 2018 +0100
@@ -2056,9 +2056,14 @@
 }
 
 void MacroAssembler::unimplemented(const char* what) {
-  char* b = new char[1024];
-  jio_snprintf(b, 1024, "unimplemented: %s", what);
-  stop(b);
+  const char* buf = NULL;
+  {
+    ResourceMark rm;
+    stringStream ss;
+    ss.print("unimplemented: %s", what);
+    buf = code_string(ss.as_string());
+  }
+  stop(buf);
 }
 
 // If a constant does not fit in an immediate field, generate some

--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp	Tue Feb 13 23:38:34 2018 +0100
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp	Wed Feb 14 08:23:53 2018 +0100
@@ -1411,9 +1411,14 @@
 
 
 void MacroAssembler::unimplemented(const char* what) {
-  char* b = new char[1024];
-  jio_snprintf(b, 1024, "unimplemented: %s", what);
-  stop(b);
+  const char* buf = NULL;
+  {
+    ResourceMark rm;
+    stringStream ss;
+    ss.print("unimplemented: %s", what);
+    buf = code_string(ss.as_string());
+  }
+  stop(buf);
 }
 
 

--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp	Tue Feb 13 23:38:34 2018 +0100
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp	Wed Feb 14 08:23:53 2018 +0100
@@ -3660,9 +3660,14 @@
 }
 
 void MacroAssembler::unimplemented(const char* what) {
-  char* b = new char[1024];
-  jio_snprintf(b, 1024, "unimplemented: %s", what);
-  stop(b);
+  const char* buf = NULL;
+  {
+    ResourceMark rm;
+    stringStream ss;
+    ss.print("unimplemented: %s", what);
+    buf = code_string(ss.as_string());
+  }
+  stop(buf);
 }
 
 #ifdef _LP64