--- a/src/hotspot/share/compiler/disassembler.cpp	Tue Jun 11 07:31:47 2019 -0400
+++ b/src/hotspot/share/compiler/disassembler.cpp	Mon Jun 10 10:11:42 2019 +0100
@@ -147,7 +147,10 @@
 
     if (AbstractDisassembler::show_comment()) {
       if ((_nm != NULL) && _nm->has_code_comment(pc0, pc)) {
-        _nm->print_code_comment_on(st, _post_decode_alignment, pc0, pc);
+        _nm->print_code_comment_on
+               (st,
+                _post_decode_alignment ? _post_decode_alignment : COMMENT_COLUMN,
+                pc0, pc);
         // this calls reloc_string_for which calls oop::print_value_on
       }
       print_hook_comments(pc0, _nm != NULL);