--- old/src/share/vm/compiler/disassembler.cpp	2016-11-03 14:16:28.000000000 -0700
+++ new/src/share/vm/compiler/disassembler.cpp	2016-11-03 14:16:28.000000000 -0700
@@ -505,7 +505,21 @@
   }
   decode_env env(cb, st);
   env.output()->print_cr("----------------------------------------------------------------------");
-  env.output()->print_cr("%s", cb->name());
+  if (cb->is_aot()) {
+    env.output()->print("A ");
+    if (cb->is_compiled()) {
+      CompiledMethod* cm = (CompiledMethod*)cb;
+      env.output()->print("%d ",cm->compile_id());
+      cm->method()->method_holder()->name()->print_symbol_on(env.output());
+      env.output()->print(".");
+      cm->method()->name()->print_symbol_on(env.output());
+      cm->method()->signature()->print_symbol_on(env.output());
+    } else {
+      env.output()->print_cr("%s", cb->name());
+    }
+  } else {
+    env.output()->print_cr("%s", cb->name());
+  }
   env.output()->print_cr(" at  [" PTR_FORMAT ", " PTR_FORMAT "]  " JLONG_FORMAT " bytes", p2i(cb->code_begin()), p2i(cb->code_end()), ((jlong)(cb->code_end() - cb->code_begin())) * sizeof(unsigned char*));
   env.decode_instructions(cb->code_begin(), cb->code_end());
 }