FIX: classfile/verifier.cpp

Verified by manually inserting an invalid opcode into a classfile.

Replaced an opcode with the 'cf' opcode, which is invalid. The opcodes
'cb'-'fd' are unassigned and reserved for future use.

Caused by: java.lang.VerifyError: Bad instruction: cf
Exception Details:
  Location:
    MediumHarvestChurn.main([Ljava/lang/String;)V @56: fast_fgetfield
  Reason:
    Error exists in the bytecode
  Bytecode:
    0000000: 2a03 32b8 0007 b600 0d3c bb00 1159 b700
    0000010: 134e 1b9a 0006 a700 6a2d 1064 b200 1468
    0000020: bc08 b600 1a57 a7ff ec3a 0403 3605 1505
    0000030: 1020 a200 2803 3606 cf06 b200 20a2 0017
    0000040: 2d15 05b2 0020 6815 0660 b600 2357 8406
    0000050: 01a7 ffe7 8405 01a7 ffd7 b800 2706 b200
    0000060: 2c68 bc08 4dbb 0011 59b7 0013 4e01 4db8
    0000070: 0027 8401 ffb2 002f 1233 b600 35a7 ff95
    0000080: b1
  Exception Handler Table:
    bci [25, 38] => handler: 41
  Stackmap Table:
    append_frame(@18,Integer,Top,Object[openjdk#17])
    same_frame(@25)
    same_locals_1_stack_item_frame(@41,Object[openjdk#30])
    append_frame(@46,Object[openjdk#30],Integer)
    append_frame(@56,Integer)
    chop_frame(@84,1)
    chop_frame(@90,1)
    chop_frame(@128,1)

Author: jsikstro

src/hotspot/share/classfile/verifier.cpp

@@ -446,10 +446,10 @@ void ErrorContext::details(outputStream* ss, const Method* method) const {
 }
 
 void ErrorContext::reason_details(outputStream* ss) const {
-  streamIndentor si(ss);
-  ss->indent().print_cr("Reason:");
-  streamIndentor si2(ss);
-  ss->indent().print("%s", "");
+  StreamAutoIndentor sai(ss, 2);
+  ss->print_cr("Reason:");
+
+  StreamAutoIndentor sai2(ss, 2);
   switch (_fault) {
     case INVALID_BYTECODE:
       ss->print("Error exists in the bytecode");
@@ -507,7 +507,6 @@ void ErrorContext::reason_details(outputStream* ss) const {
 
 void ErrorContext::location_details(outputStream* ss, const Method* method) const {
   if (_bci != -1 && method != nullptr) {
-    streamIndentor si(ss);
     const char* bytecode_name = "<invalid>";
     if (method->validate_bci(_bci) != -1) {
       Bytecodes::Code code = Bytecodes::code_or_bp_at(method->bcp_from(_bci));
@@ -518,46 +517,51 @@ void ErrorContext::location_details(outputStream* ss, const Method* method) cons
       }
     }
     InstanceKlass* ik = method->method_holder();
-    ss->indent().print_cr("Location:");
-    streamIndentor si2(ss);
-    ss->indent().print_cr("%s.%s%s @%d: %s",
+
+    StreamAutoIndentor sai(ss, 2);
+    ss->print_cr("Location:");
+
+    StreamAutoIndentor sai2(ss, 2);
+    ss->print_cr("%s.%s%s @%d: %s",
         ik->name()->as_C_string(), method->name()->as_C_string(),
         method->signature()->as_C_string(), _bci, bytecode_name);
   }
 }
 
 void ErrorContext::frame_details(outputStream* ss) const {
-  streamIndentor si(ss);
+  StreamAutoIndentor sai(ss, 2);
   if (_type.is_valid() && _type.frame() != nullptr) {
-    ss->indent().print_cr("Current Frame:");
-    streamIndentor si2(ss);
+    ss->print_cr("Current Frame:");
+    StreamAutoIndentor sai2(ss, 2);
     _type.frame()->print_on(ss);
   }
   if (_expected.is_valid() && _expected.frame() != nullptr) {
-    ss->indent().print_cr("Stackmap Frame:");
-    streamIndentor si2(ss);
+    ss->print_cr("Stackmap Frame:");
+    StreamAutoIndentor sai2(ss, 2);
     _expected.frame()->print_on(ss);
   }
 }
 
 void ErrorContext::bytecode_details(outputStream* ss, const Method* method) const {
   if (method != nullptr) {
-    streamIndentor si(ss);
-    ss->indent().print_cr("Bytecode:");
-    streamIndentor si2(ss);
+    StreamAutoIndentor sai(ss, 2);
+    ss->print_cr("Bytecode:");
+    StreamAutoIndentor sai2(ss, 2);
+    // TODO: print_data should not indent
     ss->print_data(method->code_base(), method->code_size(), false);
   }
 }
 
 void ErrorContext::handler_details(outputStream* ss, const Method* method) const {
   if (method != nullptr) {
-    streamIndentor si(ss);
+    StreamAutoIndentor sai(ss, 2);
+
     ExceptionTable table(method);
     if (table.length() > 0) {
-      ss->indent().print_cr("Exception Handler Table:");
-      streamIndentor si2(ss);
+      ss->print_cr("Exception Handler Table:");
+      StreamAutoIndentor sai2(ss, 2);
       for (int i = 0; i < table.length(); ++i) {
-        ss->indent().print_cr("bci [%d, %d] => handler: %d", table.start_pc(i),
+        ss->print_cr("bci [%d, %d] => handler: %d", table.start_pc(i),
             table.end_pc(i), table.handler_pc(i));
       }
     }
@@ -566,17 +570,16 @@ void ErrorContext::handler_details(outputStream* ss, const Method* method) const
 
 void ErrorContext::stackmap_details(outputStream* ss, const Method* method) const {
   if (method != nullptr && method->has_stackmap_table()) {
-    streamIndentor si(ss);
-    ss->indent().print_cr("Stackmap Table:");
+    StreamAutoIndentor sai(ss, 2);
+    ss->print_cr("Stackmap Table:");
     Array<u1>* data = method->stackmap_data();
     stack_map_table* sm_table =
         stack_map_table::at((address)data->adr_at(0));
     stack_map_frame* sm_frame = sm_table->entries();
-    streamIndentor si2(ss);
+    StreamAutoIndentor sai2(ss, 2);
     int current_offset = -1;
     address end_of_sm_table = (address)sm_table + method->stackmap_data()->length();
     for (u2 i = 0; i < sm_table->number_of_entries(); ++i) {
-      ss->indent();
       if (!sm_frame->verify((address)sm_frame, end_of_sm_table)) {
         sm_frame->print_truncated(ss, current_offset);
         return;