dexdump: clean-up output

Remove trailing whitespaces in dexdump output.

Bug: 219965275
Test: art/tools/buildbot-build.sh && m dexdump && art/test.py --host -g
Change-Id: I8344c0e4431f3ce7c0260ea0173a57708849df71
diff --git a/dexdump/dexdump.cc b/dexdump/dexdump.cc
index d80809a..2ab98ec 100644
--- a/dexdump/dexdump.cc
+++ b/dexdump/dexdump.cc
@@ -1303,7 +1303,7 @@
     const u4 lastInstructionAddress = findLastInstructionAddress(accessor);
     // Positions and locals table in the debug info.
     bool is_static = (flags & kAccStatic) != 0;
-    fprintf(gOutFile, "      positions     : \n");
+    fprintf(gOutFile, "      positions     :\n");
     accessor.DecodeDebugPositionInfo([&](const DexFile::PositionInfo& entry) {
       if (entry.address_ > lastInstructionAddress) {
         return true;
@@ -1312,19 +1312,22 @@
         return false;
       }
     });
-    fprintf(gOutFile, "      locals        : \n");
+    fprintf(gOutFile, "      locals        :\n");
     accessor.DecodeDebugLocalInfo(is_static,
                                   idx,
                                   [&](const DexFile::LocalInfo& entry) {
-      const char* signature = entry.signature_ != nullptr ? entry.signature_ : "";
       fprintf(gOutFile,
-              "        0x%04x - 0x%04x reg=%d %s %s %s\n",
+              "        0x%04x - 0x%04x reg=%d %s %s",
               entry.start_address_,
               entry.end_address_,
               entry.reg_,
               entry.name_,
-              entry.descriptor_,
-              signature);
+              entry.descriptor_);
+      if (entry.signature_) {
+        fputc(' ', gOutFile);
+        fputs(entry.signature_, gOutFile);
+      }
+      fputc('\n', gOutFile);
     });
   }
 }
diff --git a/dexlayout/dexlayout.cc b/dexlayout/dexlayout.cc
index a471444..648c52d 100644
--- a/dexlayout/dexlayout.cc
+++ b/dexlayout/dexlayout.cc
@@ -1161,7 +1161,7 @@
 
   // Positions and locals table in the debug info.
   dex_ir::DebugInfoItem* debug_info = code->DebugInfo();
-  fprintf(out_file_, "      positions     : \n");
+  fprintf(out_file_, "      positions     :\n");
   if (debug_info != nullptr) {
     DexFile::DecodeDebugPositionInfo(debug_info->GetDebugInfo(),
                                      [this](uint32_t idx) {
@@ -1175,7 +1175,7 @@
                                         return false;
                                      });
   }
-  fprintf(out_file_, "      locals        : \n");
+  fprintf(out_file_, "      locals        :\n");
   if (debug_info != nullptr) {
     std::vector<const char*> arg_descriptors;
     const dex_ir::TypeList* parameters = proto->Parameters();
@@ -1205,16 +1205,18 @@
                                                             this->header_);
                                   },
                                   [&](const DexFile::LocalInfo& entry) {
-                                    const char* signature =
-                                        entry.signature_ != nullptr ? entry.signature_ : "";
                                     fprintf(out_file_,
-                                            "        0x%04x - 0x%04x reg=%d %s %s %s\n",
+                                            "        0x%04x - 0x%04x reg=%d %s %s",
                                             entry.start_address_,
                                             entry.end_address_,
                                             entry.reg_,
                                             entry.name_,
-                                            entry.descriptor_,
-                                            signature);
+                                            entry.descriptor_);
+                                    if (entry.signature_) {
+                                      fputc(' ', out_file_);
+                                      fputs(entry.signature_, out_file_);
+                                    }
+                                    fputc('\n', out_file_);
                                   });
   }
 }
diff --git a/test/dexdump/all-dex-files.jar b/test/dexdump/all-dex-files.jar
index 92f5406..6d50537 100644
--- a/test/dexdump/all-dex-files.jar
+++ b/test/dexdump/all-dex-files.jar
Binary files differ
diff --git a/test/dexdump/all-dex-files.txt b/test/dexdump/all-dex-files.txt
index a55691e..48493cf 100644
--- a/test/dexdump/all-dex-files.txt
+++ b/test/dexdump/all-dex-files.txt
@@ -114,8 +114,8 @@
 00043c: 7010 1400 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0014
 000442: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in LA;)
       name          : 'arrays'
@@ -144,8 +144,8 @@
 000488: 5100 0102                              |001a: aput-short v0, v1, v2
 00048c: 0e00                                   |001c: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in LA;)
       name          : 'binary_ops'
@@ -192,8 +192,8 @@
 00051c: af00 0102                              |003e: rem-double v0, v1, v2
 000520: 0e00                                   |0040: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in LA;)
       name          : 'binary_ops_2addr'
@@ -240,8 +240,8 @@
 000572: cf10                                   |001f: rem-double/2addr v0, v1
 000574: 0e00                                   |0020: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in LA;)
       name          : 'binary_ops_lit16'
@@ -264,8 +264,8 @@
 0005a4: d710 3412                              |000e: xor-int/lit16 v0, v1, #int 4660 // #1234
 0005a8: 0e00                                   |0010: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in LA;)
       name          : 'binary_ops_lit8'
@@ -291,8 +291,8 @@
 0005e4: e200 0112                              |0014: ushr-int/lit8 v0, v1, #int 18 // #12
 0005e8: 0e00                                   |0016: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #6              : (in LA;)
       name          : 'compares'
@@ -312,8 +312,8 @@
 00060c: 3100 0102                              |0008: cmp-long v0, v1, v2
 000610: 0e00                                   |000a: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #7              : (in LA;)
       name          : 'conditionals'
@@ -340,8 +340,8 @@
 000650: 3d00 0200                              |0016: if-lez v0, 0018 // +0002
 000654: 0e00                                   |0018: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #8              : (in LA;)
       name          : 'constants'
@@ -367,8 +367,8 @@
 00069a: 1c00 0500                              |0019: const-class v0, Ljava/lang/Object; // type@0005
 00069e: 0e00                                   |001b: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #9              : (in LA;)
       name          : 'misc'
@@ -400,8 +400,8 @@
 0006ea: 0000                                   |001d: nop // spacer
 0006ec: 0003 0400 0a00 0000 0100 0000 0200 ... |001e: array-data (24 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #10              : (in LA;)
       name          : 'moves'
@@ -429,8 +429,8 @@
 000756: 0d00                                   |0015: move-exception v0
 000758: 0e00                                   |0016: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #11              : (in LA;)
       name          : 'packed_switch'
@@ -451,8 +451,8 @@
 00077a: 0000                                   |0007: nop // spacer
 00077c: 0001 0200 feff ff7f 0500 0000 0600 ... |0008: packed-switch-data (8 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #12              : (in LA;)
       name          : 'return32'
@@ -467,8 +467,8 @@
 00078c:                                        |[00078c] A.return32:()I
 00079c: 0f00                                   |0000: return v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #13              : (in LA;)
       name          : 'return64'
@@ -483,8 +483,8 @@
 0007a0:                                        |[0007a0] A.return64:()I
 0007b0: 1000                                   |0000: return-wide v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #14              : (in LA;)
       name          : 'return_object'
@@ -499,8 +499,8 @@
 0007b4:                                        |[0007b4] A.return_object:()Ljava/lang/Object;
 0007c4: 1100                                   |0000: return-object v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #15              : (in LA;)
       name          : 'sparse_switch'
@@ -517,8 +517,8 @@
 0007de: 0e00                                   |0003: return-void
 0007e0: 0002 0400 1111 0000 2222 0000 3333 ... |0004: sparse-switch-data (18 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #16              : (in LA;)
       name          : 'static_fields'
@@ -547,8 +547,8 @@
 000848: 6d00 0500                              |001a: sput-short v0, LA;.mS:S // field@0005
 00084c: 0e00                                   |001c: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #17              : (in LA;)
       name          : 'unary_ops'
@@ -584,8 +584,8 @@
 000888: 8f10                                   |0014: int-to-short v0, v1
 00088a: 0e00                                   |0015: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in LA;)
@@ -615,8 +615,8 @@
 0008d0: 5f10 0c00                              |001a: iput-short v0, v1, LA;.sS:S // field@000c
 0008d4: 0e00                                   |001c: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in LA;)
       name          : 'invokes'
@@ -635,8 +635,8 @@
 0008fa: 7154 0a00 1032                         |0009: invoke-static {v0, v1, v2, v3, v4}, LA;.invokes:()V // method@000a
 000900: 7254 0a00 1032                         |000c: invoke-interface {v0, v1, v2, v3, v4}, LA;.invokes:()V // method@000a
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -703,8 +703,8 @@
 00149c: 7010 0000 0000                         |0000: invoke-direct {v0}, Landroid/app/Activity;.<init>:()V // method@0000
 0014a2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'a'
@@ -733,8 +733,8 @@
 0014ee: 6e20 3b00 1000                         |001d: invoke-virtual {v0, v1}, Landroid/view/Window;.clearFlags:(I)V // method@003b
 0014f4: 28f0                                   |0020: goto 0010 // -0010
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/Checkers;)
@@ -751,8 +751,8 @@
 001508: 6f20 0100 1000                         |0000: invoke-super {v0, v1}, Landroid/app/Activity;.onConfigurationChanged:(Landroid/content/res/Configuration;)V // method@0001
 00150e: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onCreate'
@@ -796,8 +796,8 @@
 001590: d800 0001                              |0038: add-int/lit8 v0, v0, #int 1 // #01
 001594: 28dd                                   |003a: goto 0017 // -0023
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onCreateOptionsMenu'
@@ -916,8 +916,8 @@
 001750: 7252 2b00 5a10                         |00d4: invoke-interface {v10, v5, v0, v1, v2}, Landroid/view/Menu;.add:(IIILjava/lang/CharSequence;)Landroid/view/MenuItem; // method@002b
 001756: 0f04                                   |00d7: return v4
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onKeyDown'
@@ -955,8 +955,8 @@
 0017be: 28e2                                   |002b: goto 000d // -001e
 0017c0: 0001 0500 1300 0000 1a00 0000 2000 ... |002c: packed-switch-data (14 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onOptionsItemSelected'
@@ -1048,8 +1048,8 @@
 001912: 0000                                   |0093: nop // spacer
 001914: 0001 0300 0000 0000 0800 0000 3600 ... |0094: packed-switch-data (10 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onPause'
@@ -1073,8 +1073,8 @@
 00195a: 7210 1400 0000                         |0011: invoke-interface {v0}, Landroid/content/SharedPreferences$Editor;.commit:()Z // method@0014
 001960: 0e00                                   |0014: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #6              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onStop'
@@ -1092,8 +1092,8 @@
 00197c: 7110 ac00 0000                         |0004: invoke-static {v0}, Ljava/lang/System;.exit:(I)V // method@00ac
 001982: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #7              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onTrackballEvent'
@@ -1126,8 +1126,8 @@
 0019d6: 0000                                   |0021: nop // spacer
 0019d8: 0001 0300 0000 0000 0800 0000 0300 ... |0022: packed-switch-data (10 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -1644,8 +1644,8 @@
       catches       : 1
         0x00ef - 0x01c7
           Ljava/lang/Exception; -> 0x021e
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1675,8 +1675,8 @@
 001f80: d800 0001                              |001c: add-int/lit8 v0, v0, #int 1 // #01
 001f84: 28e3                                   |001e: goto 0001 // -001d
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1708,8 +1708,8 @@
 001fd4: d800 0001                              |001e: add-int/lit8 v0, v0, #int 1 // #01
 001fd8: 28e2                                   |0020: goto 0002 // -001e
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1766,8 +1766,8 @@
 002066: 0162                                   |003d: move v2, v6
 002068: 28e9                                   |003e: goto 0027 // -0017
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1831,8 +1831,8 @@
 002116: 6e5a 2000 2501                         |004d: invoke-virtual {v5, v2, v1, v0, v10}, Landroid/graphics/Canvas;.drawText:(Ljava/lang/String;FFLandroid/graphics/Paint;)V // method@0020
 00211c: 0e00                                   |0050: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1848,8 +1848,8 @@
 002130: 7020 5e00 1000                         |0000: invoke-direct {v0, v1}, Lcom/google/android/checkers/CheckersView;.b:(I)V // method@005e
 002136: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #6              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -2039,8 +2039,8 @@
         0x0104 - 0x011c
           Ljava/lang/ClassCastException; -> 0x011c
           <any> -> 0x0123
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #7              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -2063,8 +2063,8 @@
 0023e2: 0a00                                   |0009: move-result v0
 0023e4: 0f00                                   |000a: return v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #8              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -2448,8 +2448,8 @@
           <any> -> 0x0044
         0x004a - 0x027d
           <any> -> 0x0044
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #9              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'b'
@@ -2534,8 +2534,8 @@
           <any> -> 0x0057
         0x0030 - 0x0056
           <any> -> 0x0057
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #10              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'b'
@@ -2562,8 +2562,8 @@
       catches       : 1
         0x0001 - 0x000d
           <any> -> 0x000f
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #11              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'b'
@@ -2643,8 +2643,8 @@
 002b22: 0108                                   |0061: move v8, v0
 002b24: 28f1                                   |0062: goto 0053 // -000f
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #12              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'c'
@@ -2796,8 +2796,8 @@
 002d2e: 289b                                   |00fb: goto 0096 // -0065
 002d30: 0001 0300 0000 0000 1a00 0000 2400 ... |00fc: packed-switch-data (10 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #13              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'd'
@@ -2848,8 +2848,8 @@
 002de2: 28c4                                   |0047: goto 000b // -003c
 002de4: 0001 0600 0100 0000 0400 0000 1000 ... |0048: packed-switch-data (16 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #14              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'e'
@@ -2870,8 +2870,8 @@
 002e24: 1200                                   |0008: const/4 v0, #int 0 // #0
 002e26: 28fe                                   |0009: goto 0007 // -0002
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/CheckersView;)
@@ -2921,8 +2921,8 @@
 002eb0: 6e10 1000 0000                         |003c: invoke-virtual {v0}, Landroid/app/AlertDialog$Builder;.show:()Landroid/app/AlertDialog; // method@0010
 002eb6: 0e00                                   |003f: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -3011,8 +3011,8 @@
           <any> -> 0x0061
         0x0064 - 0x0070
           <any> -> 0x0061
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -3037,8 +3037,8 @@
 002ff0: 6e10 6d00 0600                         |000c: invoke-virtual {v6}, Lcom/google/android/checkers/CheckersView;.postInvalidate:()V // method@006d
 002ff6: 0e00                                   |000f: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -3130,8 +3130,8 @@
       catches       : 1
         0x0001 - 0x00a5
           <any> -> 0x00a7
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -3157,8 +3157,8 @@
 003196: 1211                                   |000f: const/4 v1, #int 1 // #1
 003198: 0f01                                   |0010: return v1
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -3189,8 +3189,8 @@
       catches       : 1
         0x0003 - 0x000f
           <any> -> 0x0013
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #6              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'b'
@@ -3226,8 +3226,8 @@
       catches       : 1
         0x0002 - 0x000b
           <any> -> 0x001b
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #7              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'b'
@@ -3287,8 +3287,8 @@
       catches       : 1
         0x0006 - 0x003a
           <any> -> 0x0042
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #8              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'c'
@@ -3311,8 +3311,8 @@
       catches       : 1
         0x0001 - 0x0003
           <any> -> 0x0005
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #9              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'c'
@@ -3349,8 +3349,8 @@
       catches       : 1
         0x0004 - 0x001b
           <any> -> 0x001f
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #10              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'd'
@@ -3380,8 +3380,8 @@
       catches       : 1
         0x0003 - 0x000c
           <any> -> 0x0010
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #11              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'draw'
@@ -4088,8 +4088,8 @@
           <any> -> 0x02af
         0x02b2 - 0x04db
           <any> -> 0x02af
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #12              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'e'
@@ -4119,8 +4119,8 @@
       catches       : 1
         0x0003 - 0x000c
           <any> -> 0x0010
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #13              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'onSizeChanged'
@@ -4167,8 +4167,8 @@
       catches       : 1
         0x0004 - 0x002b
           <any> -> 0x002f
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #14              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'onTouchEvent'
@@ -4206,8 +4206,8 @@
 003ee6: 0a00                                   |0027: move-result v0
 003ee8: 28fb                                   |0028: goto 0023 // -0005
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #15              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'setLevel'
@@ -4253,8 +4253,8 @@
       catches       : 1
         0x0007 - 0x000d
           <any> -> 0x0026
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -5032,8 +5032,8 @@
 004866: 0000                                   |0467: nop // spacer
 004868: 0003 0400 8100 0000 6745 68ba ff5c ... |0468: array-data (262 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/a;)
       name          : '<init>'
@@ -5097,8 +5097,8 @@
       catches       : 1
         0x0030 - 0x0040
           Ljava/lang/Exception; -> 0x0056
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5122,8 +5122,8 @@
 004b74: 1200                                   |000c: const/4 v0, #int 0 // #0
 004b76: 28f8                                   |000d: goto 0005 // -0008
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5824,8 +5824,8 @@
 005584: 0001 0200 0000 0000 b402 0000 ba02 ... |04fe: packed-switch-data (8 units)
 005594: 0001 0300 0100 0000 9402 0000 9802 ... |0506: packed-switch-data (10 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5872,8 +5872,8 @@
 005622: 0110                                   |0035: move v0, v1
 005624: 28f0                                   |0036: goto 0026 // -0010
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5945,8 +5945,8 @@
 0056f8: b520                                   |0060: and-int/2addr v0, v2
 0056fa: 28b3                                   |0061: goto 0014 // -004d
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #6              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5992,8 +5992,8 @@
 005776: 4800 0200                              |0035: aget-byte v0, v2, v0
 00577a: 28f2                                   |0037: goto 0029 // -000e
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #7              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -6032,8 +6032,8 @@
 0057de: 4800 0300                              |0029: aget-byte v0, v3, v0
 0057e2: 28f5                                   |002b: goto 0020 // -000b
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #8              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -6066,8 +6066,8 @@
 005832: 4800 0200                              |001f: aget-byte v0, v2, v0
 005836: 28f8                                   |0021: goto 0019 // -0008
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #9              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -6118,8 +6118,8 @@
 0058b8: 0002 0200 4000 0000 c000 0000 0600 ... |0038: sparse-switch-data (10 units)
 0058cc: 0002 0200 8000 0000 c000 0000 0400 ... |0042: sparse-switch-data (10 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #10              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -6154,8 +6154,8 @@
 005938: 4b09 0100                              |0024: aput v9, v1, v0
 00593c: 28e0                                   |0026: goto 0006 // -0020
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #11              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -6227,8 +6227,8 @@
 005a0e: 7606 7e00 0000                         |005f: invoke-direct/range {v0, v1, v2, v3, v4, v5}, Lcom/google/android/checkers/a;.a:(IIIII)V // method@007e
 005a14: 0e00                                   |0062: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #12              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -6698,8 +6698,8 @@
 0060f8: 1201                                   |0368: const/4 v1, #int 0 // #0
 0060fa: 2900 19fd                              |0369: goto/16 0082 // -02e7
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #13              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -6739,8 +6739,8 @@
 006166: 4800 0300                              |002b: aget-byte v0, v3, v0
 00616a: 28f5                                   |002d: goto 0022 // -000b
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #14              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -6786,8 +6786,8 @@
 0061e6: 4800 0200                              |0035: aget-byte v0, v2, v0
 0061ea: 28f2                                   |0037: goto 0029 // -000e
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #15              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -6820,8 +6820,8 @@
         0x000a - 0x000d
           Ljava/lang/InterruptedException; -> 0x000e
           <any> -> 0x0010
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #16              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -7030,8 +7030,8 @@
 006506: 0000                                   |015d: nop // spacer
 006508: 0002 0400 0001 0000 0002 0000 0004 ... |015e: sparse-switch-data (18 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #17              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -7103,8 +7103,8 @@
 0065fa: 7606 7e00 0000                         |005f: invoke-direct/range {v0, v1, v2, v3, v4, v5}, Lcom/google/android/checkers/a;.a:(IIIII)V // method@007e
 006600: 0e00                                   |0062: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #18              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -7382,8 +7382,8 @@
 0069a8: 1200                                   |01ca: const/4 v0, #int 0 // #0
 0069aa: 2900 5efe                              |01cb: goto/16 0029 // -01a2
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #19              : (in Lcom/google/android/checkers/a;)
       name          : 'c'
@@ -7428,8 +7428,8 @@
 006a26: 4800 0200                              |0033: aget-byte v0, v2, v0
 006a2a: 28f2                                   |0035: goto 0027 // -000e
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #20              : (in Lcom/google/android/checkers/a;)
       name          : 'c'
@@ -7450,8 +7450,8 @@
       catches       : 1
         0x0002 - 0x0005
           Ljava/lang/InterruptedException; -> 0x0006
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #21              : (in Lcom/google/android/checkers/a;)
       name          : 'c'
@@ -7579,8 +7579,8 @@
 006bf6: 7606 7e00 0000                         |00c7: invoke-direct/range {v0, v1, v2, v3, v4, v5}, Lcom/google/android/checkers/a;.a:(IIIII)V // method@007e
 006bfc: 0e00                                   |00ca: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #22              : (in Lcom/google/android/checkers/a;)
       name          : 'd'
@@ -7626,8 +7626,8 @@
 006c7a: 4800 0200                              |0035: aget-byte v0, v2, v0
 006c7e: 28f2                                   |0037: goto 0029 // -000e
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/a;)
@@ -7647,8 +7647,8 @@
 006c9c: 0a00                                   |0006: move-result v0
 006c9e: 0f00                                   |0007: return v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -7686,8 +7686,8 @@
 006d04: d800 0001                              |002a: add-int/lit8 v0, v0, #int 1 // #01
 006d08: 28f5                                   |002c: goto 0021 // -000b
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -7703,8 +7703,8 @@
 006d1c: 7020 8500 1000                         |0000: invoke-direct {v0, v1}, Lcom/google/android/checkers/a;.b:(I)V // method@0085
 006d22: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -7738,8 +7738,8 @@
 006d78: 5920 5100                              |0022: iput v0, v2, Lcom/google/android/checkers/a;.x:I // field@0051
 006d7c: 0e00                                   |0024: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -7766,8 +7766,8 @@
       catches       : 1
         0x0001 - 0x000b
           <any> -> 0x000d
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lcom/google/android/checkers/a;)
       name          : 'run'
@@ -8070,8 +8070,8 @@
 0071e2: 01d5                                   |020b: move v5, v13
 0071e4: 2900 2cff                              |020c: goto/16 0138 // -00d4
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -8116,8 +8116,8 @@
 0071fc: 7010 a000 0000                         |0002: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00a0
 007202: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/b;)
@@ -8139,8 +8139,8 @@
 007228: 6e10 6d00 0000                         |000a: invoke-virtual {v0}, Lcom/google/android/checkers/CheckersView;.postInvalidate:()V // method@006d
 00722e: 0e00                                   |000d: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -8185,8 +8185,8 @@
 007244: 7010 a000 0000                         |0002: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00a0
 00724a: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/c;)
@@ -8202,8 +8202,8 @@
 00724c:                                        |[00724c] com.google.android.checkers.c.onClick:(Landroid/content/DialogInterface;I)V
 00725c: 0e00                                   |0000: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -8248,8 +8248,8 @@
 007274: 7010 a000 0000                         |0002: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00a0
 00727a: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/d;)
@@ -8265,8 +8265,8 @@
 00727c:                                        |[00727c] com.google.android.checkers.d.onClick:(Landroid/content/DialogInterface;I)V
 00728c: 0e00                                   |0000: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -8311,8 +8311,8 @@
 0072a4: 7010 a000 0000                         |0002: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00a0
 0072aa: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/e;)
@@ -8331,8 +8331,8 @@
 0072c2: 6e20 6800 1000                         |0003: invoke-virtual {v0, v1}, Lcom/google/android/checkers/CheckersView;.e:(Z)Z // method@0068
 0072c8: 0e00                                   |0006: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -8377,8 +8377,8 @@
 0072e0: 7010 a000 0000                         |0002: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00a0
 0072e6: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/f;)
@@ -8396,8 +8396,8 @@
 0072fc: 7120 5600 3000                         |0002: invoke-static {v0, v3}, Lcom/google/android/checkers/CheckersView;.a:(Lcom/google/android/checkers/CheckersView;I)V // method@0056
 007302: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -8528,8 +8528,8 @@
 007348: d800 0001                              |001a: add-int/lit8 v0, v0, #int 1 // #01
 00734c: 28e6                                   |001c: goto 0002 // -001a
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
   source_file_idx   : -1 (unknown)
@@ -8597,10 +8597,10 @@
 0003c0: 7010 0a00 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@000a
 0003c6: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=22
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LMain; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LMain;
 
     #1              : (in LMain;)
       name          : 'main'
@@ -8626,13 +8626,13 @@
 000400: fa20 1200 5000 1000                    |0014: invoke-polymorphic {v0, v5}, Ljava/lang/invoke/MethodHandle;.invokeExact:([Ljava/lang/Object;)Ljava/lang/Object;, ([Ljava/lang/String;)V // method@0012, proto@0010
 000408: 0e00                                   |0018: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=26
         0x000c line=27
         0x0014 line=28
         0x0018 line=29
-      locals        : 
-        0x0000 - 0x0019 reg=5 (null) [Ljava/lang/String; 
+      locals        :
+        0x0000 - 0x0019 reg=5 (null) [Ljava/lang/String;
 
   Virtual methods   -
   source_file_idx   : 29 (Main.java)
@@ -8676,10 +8676,10 @@
 00041c: 7010 0a00 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@000a
 000422: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=22
-      locals        : 
-        0x0000 - 0x0004 reg=0 this Lconstmethodhandle/ConstTest; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this Lconstmethodhandle/ConstTest;
 
     #1              : (in Lconstmethodhandle/ConstTest;)
       name          : 'displayMethodHandle'
@@ -8715,13 +8715,13 @@
 00048a: 6e20 0800 1000                         |002b: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@0008
 000490: 0e00                                   |002e: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=24
         0x001a line=25
         0x002b line=24
         0x002e line=26
-      locals        : 
-        0x0000 - 0x002f reg=3 (null) Ljava/lang/invoke/MethodHandle; 
+      locals        :
+        0x0000 - 0x002f reg=3 (null) Ljava/lang/invoke/MethodHandle;
 
     #2              : (in Lconstmethodhandle/ConstTest;)
       name          : 'displayMethodType'
@@ -8747,11 +8747,11 @@
 0004ce: 6e20 0800 1000                         |0015: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@0008
 0004d4: 0e00                                   |0018: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=29
         0x0018 line=30
-      locals        : 
-        0x0000 - 0x0019 reg=3 (null) Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x0019 reg=3 (null) Ljava/lang/invoke/MethodType;
 
     #3              : (in Lconstmethodhandle/ConstTest;)
       name          : 'main'
@@ -8772,8 +8772,8 @@
 0004fe: 7110 0400 0000                         |000b: invoke-static {v0}, Lconstmethodhandle/ConstTest;.displayMethodType:(Ljava/lang/invoke/MethodType;)V // method@0004
 000504: 0e00                                   |000e: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lconstmethodhandle/ConstTest;)
       name          : 'test1'
@@ -8789,8 +8789,8 @@
 000518: fe00 0000                              |0000: const-method-handle v0, method_handle@0000
 00051c: 1100                                   |0002: return-object v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lconstmethodhandle/ConstTest;)
       name          : 'test2'
@@ -8806,8 +8806,8 @@
 000530: ff00 1100                              |0000: const-method-type v0, (CSIJFDLjava/lang/Object;)Z // proto@0011
 000534: 1100                                   |0002: return-object v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
   source_file_idx   : 3 (ConstTest.java)
@@ -8880,12 +8880,12 @@
 001b28: 7020 d200 1000                         |0000: invoke-direct {v0, v1}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 001b2e: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=449
         0x0003 line=450
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestBadBootstrapArguments$TestersConstantCallSite; 
-        0x0000 - 0x0004 reg=1 mh Ljava/lang/invoke/MethodHandle; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestBadBootstrapArguments$TestersConstantCallSite;
+        0x0000 - 0x0004 reg=1 mh Ljava/lang/invoke/MethodHandle;
 
   Virtual methods   -
   source_file_idx   : 144 (TestBadBootstrapArguments.java)
@@ -8925,10 +8925,10 @@
 002554: 7010 bf00 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00bf
 00255a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=19
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestBase; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestBase;
 
     #1              : (in LTestBase;)
       name          : 'assertEquals'
@@ -8957,13 +8957,13 @@
 0025a8: 7020 b500 1000                         |001e: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 0025ae: 2700                                   |0021: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
         0x0002 line=28
         0x0003 line=30
-      locals        : 
-        0x0000 - 0x0022 reg=3 b1 B 
-        0x0000 - 0x0022 reg=4 b2 B 
+      locals        :
+        0x0000 - 0x0022 reg=3 b1 B
+        0x0000 - 0x0022 reg=4 b2 B
 
     #2              : (in LTestBase;)
       name          : 'assertEquals'
@@ -8992,13 +8992,13 @@
 0025fc: 7020 b500 1000                         |001e: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 002602: 2700                                   |0021: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=34
         0x0002 line=35
         0x0003 line=37
-      locals        : 
-        0x0000 - 0x0022 reg=3 c1 C 
-        0x0000 - 0x0022 reg=4 c2 C 
+      locals        :
+        0x0000 - 0x0022 reg=3 c1 C
+        0x0000 - 0x0022 reg=4 c2 C
 
     #3              : (in LTestBase;)
       name          : 'assertEquals'
@@ -9028,13 +9028,13 @@
 002654: 7020 b500 1000                         |0020: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 00265a: 2700                                   |0023: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=69
         0x0004 line=70
         0x0005 line=72
-      locals        : 
-        0x0000 - 0x0024 reg=3 d1 D 
-        0x0000 - 0x0024 reg=5 d2 D 
+      locals        :
+        0x0000 - 0x0024 reg=3 d1 D
+        0x0000 - 0x0024 reg=5 d2 D
 
     #4              : (in LTestBase;)
       name          : 'assertEquals'
@@ -9064,13 +9064,13 @@
 0026ac: 7020 b500 1000                         |0020: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 0026b2: 2700                                   |0023: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=62
         0x0004 line=63
         0x0005 line=65
-      locals        : 
-        0x0000 - 0x0024 reg=3 f1 F 
-        0x0000 - 0x0024 reg=4 f2 F 
+      locals        :
+        0x0000 - 0x0024 reg=3 f1 F
+        0x0000 - 0x0024 reg=4 f2 F
 
     #5              : (in LTestBase;)
       name          : 'assertEquals'
@@ -9099,13 +9099,13 @@
 002700: 7020 b500 1000                         |001e: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 002706: 2700                                   |0021: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=48
         0x0002 line=49
         0x0003 line=51
-      locals        : 
-        0x0000 - 0x0022 reg=3 i1 I 
-        0x0000 - 0x0022 reg=4 i2 I 
+      locals        :
+        0x0000 - 0x0022 reg=3 i1 I
+        0x0000 - 0x0022 reg=4 i2 I
 
     #6              : (in LTestBase;)
       name          : 'assertEquals'
@@ -9135,13 +9135,13 @@
 0027b4: 7020 b500 1000                         |0020: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 0027ba: 2700                                   |0023: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=55
         0x0004 line=56
         0x0005 line=58
-      locals        : 
-        0x0000 - 0x0024 reg=3 l1 J 
-        0x0000 - 0x0024 reg=5 l2 J 
+      locals        :
+        0x0000 - 0x0024 reg=3 l1 J
+        0x0000 - 0x0024 reg=5 l2 J
 
     #7              : (in LTestBase;)
       name          : 'assertEquals'
@@ -9172,13 +9172,13 @@
 00275c: 7020 b500 1000                         |0022: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 002762: 2700                                   |0025: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=76
         0x0006 line=79
         0x0007 line=77
-      locals        : 
-        0x0000 - 0x0026 reg=3 o Ljava/lang/Object; 
-        0x0000 - 0x0026 reg=4 p Ljava/lang/Object; 
+      locals        :
+        0x0000 - 0x0026 reg=3 o Ljava/lang/Object;
+        0x0000 - 0x0026 reg=4 p Ljava/lang/Object;
 
     #8              : (in LTestBase;)
       name          : 'assertEquals'
@@ -9207,13 +9207,13 @@
 002808: 7020 b500 1000                         |001e: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 00280e: 2700                                   |0021: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=41
         0x0002 line=42
         0x0003 line=44
-      locals        : 
-        0x0000 - 0x0022 reg=3 s1 S 
-        0x0000 - 0x0022 reg=4 s2 S 
+      locals        :
+        0x0000 - 0x0022 reg=3 s1 S
+        0x0000 - 0x0022 reg=4 s2 S
 
     #9              : (in LTestBase;)
       name          : 'assertNotEquals'
@@ -9244,13 +9244,13 @@
 002864: 7020 b500 1000                         |0022: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 00286a: 2700                                   |0025: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=82
         0x0006 line=85
         0x0007 line=83
-      locals        : 
-        0x0000 - 0x0026 reg=3 o Ljava/lang/Object; 
-        0x0000 - 0x0026 reg=4 p Ljava/lang/Object; 
+      locals        :
+        0x0000 - 0x0026 reg=3 o Ljava/lang/Object;
+        0x0000 - 0x0026 reg=4 p Ljava/lang/Object;
 
     #10              : (in LTestBase;)
       name          : 'assertNotReached'
@@ -9268,9 +9268,9 @@
 002884: 7020 b500 1000                         |0004: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 00288a: 2700                                   |0007: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=88
-      locals        : 
+      locals        :
 
     #11              : (in LTestBase;)
       name          : 'assertTrue'
@@ -9296,12 +9296,12 @@
 0028c8: 7020 b500 1000                         |0016: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 0028ce: 2700                                   |0019: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=21
         0x0002 line=24
         0x0003 line=22
-      locals        : 
-        0x0000 - 0x001a reg=3 value Z 
+      locals        :
+        0x0000 - 0x001a reg=3 value Z
 
     #12              : (in LTestBase;)
       name          : 'fail'
@@ -9320,11 +9320,11 @@
 0028ee: 7100 cc00 0000                         |0007: invoke-static {}, Ljava/lang/Thread;.dumpStack:()V // method@00cc
 0028f4: 0e00                                   |000a: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=92
         0x0007 line=93
         0x000a line=94
-      locals        : 
+      locals        :
 
   Virtual methods   -
   source_file_idx   : 145 (TestBase.java)
@@ -9373,11 +9373,11 @@
 002acc: 7010 bf00 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00bf
 002ad2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=177
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestInvocationKinds$Widget; 
-        0x0000 - 0x0004 reg=1 value I 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestInvocationKinds$Widget;
+        0x0000 - 0x0004 reg=1 value I
 
   Virtual methods   -
   source_file_idx   : 148 (TestInvocationKinds.java)
@@ -9423,10 +9423,10 @@
 002ef8: 7010 cf00 0000                         |0000: invoke-direct {v0}, Ljava/lang/ThreadLocal;.<init>:()V // method@00cf
 002efe: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=33
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestInvokeCustomWithConcurrentThreads$1; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestInvokeCustomWithConcurrentThreads$1;
 
   Virtual methods   -
     #0              : (in LTestInvokeCustomWithConcurrentThreads$1;)
@@ -9448,10 +9448,10 @@
 002ec6: 0c00                                   |000b: move-result-object v0
 002ec8: 1100                                   |000c: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=36
-      locals        : 
-        0x0000 - 0x000d reg=1 this LTestInvokeCustomWithConcurrentThreads$1; 
+      locals        :
+        0x0000 - 0x000d reg=1 this LTestInvokeCustomWithConcurrentThreads$1;
 
     #1              : (in LTestInvokeCustomWithConcurrentThreads$1;)
       name          : 'initialValue'
@@ -9468,10 +9468,10 @@
 002ee2: 0c00                                   |0003: move-result-object v0
 002ee4: 1100                                   |0004: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=33
-      locals        : 
-        0x0000 - 0x0005 reg=1 this LTestInvokeCustomWithConcurrentThreads$1; 
+      locals        :
+        0x0000 - 0x0005 reg=1 this LTestInvokeCustomWithConcurrentThreads$1;
 
   source_file_idx   : 149 (TestInvokeCustomWithConcurrentThreads.java)
 
@@ -9515,10 +9515,10 @@
 003fd8: 7010 bf00 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00bf
 003fde: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=23
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LUnrelatedBSM; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LUnrelatedBSM;
 
     #1              : (in LUnrelatedBSM;)
       name          : 'bsm'
@@ -9537,15 +9537,15 @@
 003fc0: 7020 d200 0100                         |0006: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003fc6: 1101                                   |0009: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
         0x0004 line=28
-      locals        : 
-        0x0000 - 0x0000 reg=5 (null) Ljava/lang/Class; 
-        0x0004 - 0x000a reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x000a reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x000a reg=3 name Ljava/lang/String; 
-        0x0000 - 0x000a reg=4 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x0000 reg=5 (null) Ljava/lang/Class;
+        0x0004 - 0x000a reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x000a reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x000a reg=3 name Ljava/lang/String;
+        0x0000 - 0x000a reg=4 methodType Ljava/lang/invoke/MethodType;
         0x0000 - 0x000a reg=5 target Ljava/lang/Class; Ljava/lang/Class<*>;
 
   Virtual methods   -
@@ -9596,10 +9596,10 @@
 001910: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 001916: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=21
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LMain; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LMain;
 
     #1              : (in LMain;)
       name          : 'TestLinkerMethodMinimalArguments'
@@ -9653,7 +9653,7 @@
           Ljava/lang/BootstrapMethodError; -> 0x0022
         0x0033 - 0x0039
           Ljava/lang/ArithmeticException; -> 0x003a
-      positions     : 
+      positions     :
         0x0000 line=49
         0x0006 line=53
         0x0009 line=56
@@ -9670,9 +9670,9 @@
         0x003a line=70
         0x003b line=73
         0x0041 line=75
-      locals        : 
-        0x000b - 0x0018 reg=0 e Ljava/lang/BootstrapMethodError; 
-        0x0023 - 0x0030 reg=0 e Ljava/lang/BootstrapMethodError; 
+      locals        :
+        0x000b - 0x0018 reg=0 e Ljava/lang/BootstrapMethodError;
+        0x0023 - 0x0030 reg=0 e Ljava/lang/BootstrapMethodError;
 
     #2              : (in LMain;)
       name          : 'TestLinkerMethodMultipleArgumentTypes'
@@ -9696,12 +9696,12 @@
 001a04: 7120 8400 1000                         |0012: invoke-static {v0, v1}, LTestLinkerMethodMultipleArgumentTypes;.test:(II)V // method@0084
 001a0a: 0e00                                   |0015: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=42
         0x0007 line=43
         0x000e line=44
         0x0015 line=45
-      locals        : 
+      locals        :
 
     #3              : (in LMain;)
       name          : 'TestUninitializedCallSite'
@@ -9757,7 +9757,7 @@
           Ljava/lang/IllegalStateException; -> 0x0017
         0x0035 - 0x0044
           Ljava/lang/IllegalStateException; -> 0x0045
-      positions     : 
+      positions     :
         0x0000 line=24
         0x000b line=26
         0x0013 line=27
@@ -9771,10 +9771,10 @@
         0x0045 line=36
         0x0046 line=37
         0x004d line=39
-      locals        : 
-        0x0018 - 0x001f reg=1 e Ljava/lang/IllegalStateException; 
-        0x0046 - 0x004d reg=1 e Ljava/lang/IllegalStateException; 
-        0x000b - 0x004e reg=0 callSite Ljava/lang/invoke/CallSite; 
+      locals        :
+        0x0018 - 0x001f reg=1 e Ljava/lang/IllegalStateException;
+        0x0046 - 0x004d reg=1 e Ljava/lang/IllegalStateException;
+        0x000b - 0x004e reg=0 callSite Ljava/lang/invoke/CallSite;
 
     #4              : (in LMain;)
       name          : 'main'
@@ -9798,7 +9798,7 @@
 001b10: 7100 a800 0000                         |0018: invoke-static {}, LTestVariableArityLinkerMethod;.test:()V // method@00a8
 001b16: 0e00                                   |001b: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=78
         0x0003 line=79
         0x0006 line=80
@@ -9809,8 +9809,8 @@
         0x0015 line=85
         0x0018 line=86
         0x001b line=87
-      locals        : 
-        0x0000 - 0x001c reg=0 args [Ljava/lang/String; 
+      locals        :
+        0x0000 - 0x001c reg=0 args [Ljava/lang/String;
 
   Virtual methods   -
   source_file_idx   : 136 (Main.java)
@@ -9894,10 +9894,10 @@
 001d74: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 001d7a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestBadBootstrapArguments; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestBadBootstrapArguments;
 
     #1              : (in LTestBadBootstrapArguments;)
       name          : 'boxingArguments'
@@ -9915,10 +9915,10 @@
 001d94: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001d9a: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=348
         0x0007 line=349
-      locals        : 
+      locals        :
 
     #2              : (in LTestBadBootstrapArguments;)
       name          : 'bsm'
@@ -9969,7 +9969,7 @@
 001c66: 7020 d200 0100                         |0051: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 001c6c: 1101                                   |0054: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=35
         0x0007 line=36
         0x0010 line=37
@@ -9983,13 +9983,13 @@
         0x0040 line=45
         0x0047 line=46
         0x004f line=47
-      locals        : 
-        0x004f - 0x0055 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0055 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0055 reg=3 methodName Ljava/lang/String; 
-        0x0000 - 0x0055 reg=4 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0055 reg=5 extraInt I 
-        0x0000 - 0x0055 reg=6 extraString Ljava/lang/String; 
+      locals        :
+        0x004f - 0x0055 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0055 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0055 reg=3 methodName Ljava/lang/String;
+        0x0000 - 0x0055 reg=4 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0055 reg=5 extraInt I
+        0x0000 - 0x0055 reg=6 extraString Ljava/lang/String;
 
     #3              : (in LTestBadBootstrapArguments;)
       name          : 'bsmDJ'
@@ -10023,7 +10023,7 @@
 001cd2: 7020 d200 0100                         |0029: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 001cd8: 1101                                   |002c: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=270
         0x0007 line=271
         0x000c line=272
@@ -10031,13 +10031,13 @@
         0x0018 line=274
         0x001f line=275
         0x0027 line=276
-      locals        : 
-        0x0027 - 0x002d reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x002d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x002d reg=3 methodName Ljava/lang/String; 
-        0x0000 - 0x002d reg=4 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x002d reg=5 extraArg0 D 
-        0x0000 - 0x002d reg=7 extraArg1 J 
+      locals        :
+        0x0027 - 0x002d reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x002d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x002d reg=3 methodName Ljava/lang/String;
+        0x0000 - 0x002d reg=4 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x002d reg=5 extraArg0 D
+        0x0000 - 0x002d reg=7 extraArg1 J
 
     #4              : (in LTestBadBootstrapArguments;)
       name          : 'bsmDoubleLong'
@@ -10071,7 +10071,7 @@
 001d3e: 7020 d200 0100                         |0029: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 001d44: 1101                                   |002c: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=314
         0x0007 line=315
         0x000c line=316
@@ -10079,13 +10079,13 @@
         0x0018 line=318
         0x001f line=319
         0x0027 line=320
-      locals        : 
-        0x0027 - 0x002d reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x002d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x002d reg=3 methodName Ljava/lang/String; 
-        0x0000 - 0x002d reg=4 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x002d reg=5 extraArg0 Ljava/lang/Double; 
-        0x0000 - 0x002d reg=6 extraArg1 Ljava/lang/Long; 
+      locals        :
+        0x0027 - 0x002d reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x002d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x002d reg=3 methodName Ljava/lang/String;
+        0x0000 - 0x002d reg=4 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x002d reg=5 extraArg0 Ljava/lang/Double;
+        0x0000 - 0x002d reg=6 extraArg1 Ljava/lang/Long;
 
     #5              : (in LTestBadBootstrapArguments;)
       name          : 'bsmReturningInteger'
@@ -10106,13 +10106,13 @@
 001b82: 0c00                                   |000b: move-result-object v0
 001b84: 1100                                   |000c: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=425
         0x0007 line=426
-      locals        : 
-        0x0000 - 0x000d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x000d reg=3 name Ljava/lang/String; 
-        0x0000 - 0x000d reg=4 type Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x000d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x000d reg=3 name Ljava/lang/String;
+        0x0000 - 0x000d reg=4 type Ljava/lang/invoke/MethodType;
 
     #6              : (in LTestBadBootstrapArguments;)
       name          : 'bsmReturningObject'
@@ -10132,13 +10132,13 @@
 001baa: 7010 bf00 0000                         |0009: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00bf
 001bb0: 1100                                   |000c: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=402
         0x0007 line=403
-      locals        : 
-        0x0000 - 0x000d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x000d reg=3 name Ljava/lang/String; 
-        0x0000 - 0x000d reg=4 type Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x000d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x000d reg=3 name Ljava/lang/String;
+        0x0000 - 0x000d reg=4 type Ljava/lang/invoke/MethodType;
 
     #7              : (in LTestBadBootstrapArguments;)
       name          : 'bsmReturningTestersConstantCallsite'
@@ -10159,12 +10159,12 @@
 001b54: 7020 0800 1000                         |000a: invoke-direct {v0, v1}, LTestBadBootstrapArguments$TestersConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@0008
 001b5a: 1100                                   |000d: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=455
-      locals        : 
-        0x0000 - 0x000e reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x000e reg=3 name Ljava/lang/String; 
-        0x0000 - 0x000e reg=4 type Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x000e reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x000e reg=3 name Ljava/lang/String;
+        0x0000 - 0x000e reg=4 type Ljava/lang/invoke/MethodType;
 
     #8              : (in LTestBadBootstrapArguments;)
       name          : 'bsmReturningVoid'
@@ -10182,13 +10182,13 @@
 001db4: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001dba: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=380
         0x0007 line=381
-      locals        : 
-        0x0000 - 0x0008 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0008 reg=3 name Ljava/lang/String; 
-        0x0000 - 0x0008 reg=4 type Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x0008 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0008 reg=3 name Ljava/lang/String;
+        0x0000 - 0x0008 reg=4 type Ljava/lang/invoke/MethodType;
 
     #9              : (in LTestBadBootstrapArguments;)
       name          : 'bsmZBCS'
@@ -10205,17 +10205,17 @@
 001d5e: 1200                                   |0003: const/4 v0, #int 0 // #0
 001d60: 1100                                   |0004: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=227
         0x0003 line=228
-      locals        : 
-        0x0000 - 0x0005 reg=1 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0005 reg=2 methodName Ljava/lang/String; 
-        0x0000 - 0x0005 reg=3 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0005 reg=4 extraArg0 Z 
-        0x0000 - 0x0005 reg=5 extraArg1 B 
-        0x0000 - 0x0005 reg=6 extraArg2 C 
-        0x0000 - 0x0005 reg=7 extraArg3 S 
+      locals        :
+        0x0000 - 0x0005 reg=1 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0005 reg=2 methodName Ljava/lang/String;
+        0x0000 - 0x0005 reg=3 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0005 reg=4 extraArg0 Z
+        0x0000 - 0x0005 reg=5 extraArg1 B
+        0x0000 - 0x0005 reg=6 extraArg2 C
+        0x0000 - 0x0005 reg=7 extraArg3 S
 
     #10              : (in LTestBadBootstrapArguments;)
       name          : 'extraArguments'
@@ -10233,10 +10233,10 @@
 001dd4: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001dda: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=158
         0x0007 line=159
-      locals        : 
+      locals        :
 
     #11              : (in LTestBadBootstrapArguments;)
       name          : 'happy'
@@ -10254,10 +10254,10 @@
 001df4: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001dfa: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=74
         0x0007 line=75
-      locals        : 
+      locals        :
 
     #12              : (in LTestBadBootstrapArguments;)
       name          : 'integerReturnType'
@@ -10273,10 +10273,10 @@
 001e0c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e12: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=444
         0x0003 line=445
-      locals        : 
+      locals        :
 
     #13              : (in LTestBadBootstrapArguments;)
       name          : 'invokeBoxingArguments'
@@ -10292,10 +10292,10 @@
 001e24: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e2a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=344
         0x0003 line=345
-      locals        : 
+      locals        :
 
     #14              : (in LTestBadBootstrapArguments;)
       name          : 'invokeExtraArguments'
@@ -10311,10 +10311,10 @@
 001e3c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e42: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=154
         0x0003 line=155
-      locals        : 
+      locals        :
 
     #15              : (in LTestBadBootstrapArguments;)
       name          : 'invokeHappy'
@@ -10330,10 +10330,10 @@
 001e54: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e5a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=70
         0x0003 line=71
-      locals        : 
+      locals        :
 
     #16              : (in LTestBadBootstrapArguments;)
       name          : 'invokeIntegerReturnType'
@@ -10349,10 +10349,10 @@
 001e6c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e72: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=440
         0x0003 line=441
-      locals        : 
+      locals        :
 
     #17              : (in LTestBadBootstrapArguments;)
       name          : 'invokeMissingParameterTypes'
@@ -10368,10 +10368,10 @@
 001e84: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e8a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=124
         0x0003 line=125
-      locals        : 
+      locals        :
 
     #18              : (in LTestBadBootstrapArguments;)
       name          : 'invokeNarrowArguments'
@@ -10387,10 +10387,10 @@
 001e9c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001ea2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=256
         0x0003 line=257
-      locals        : 
+      locals        :
 
     #19              : (in LTestBadBootstrapArguments;)
       name          : 'invokeObjectReturnType'
@@ -10406,10 +10406,10 @@
 001eb4: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001eba: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=417
         0x0003 line=418
-      locals        : 
+      locals        :
 
     #20              : (in LTestBadBootstrapArguments;)
       name          : 'invokeViaCustomCallSiteClass'
@@ -10425,10 +10425,10 @@
 001ecc: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001ed2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=469
         0x0003 line=470
-      locals        : 
+      locals        :
 
     #21              : (in LTestBadBootstrapArguments;)
       name          : 'invokeVoidReturnType'
@@ -10444,10 +10444,10 @@
 001ee4: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001eea: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=394
         0x0003 line=395
-      locals        : 
+      locals        :
 
     #22              : (in LTestBadBootstrapArguments;)
       name          : 'invokeWideningArguments'
@@ -10463,10 +10463,10 @@
 001efc: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f02: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=300
         0x0003 line=301
-      locals        : 
+      locals        :
 
     #23              : (in LTestBadBootstrapArguments;)
       name          : 'invokeWideningBoxingArguments'
@@ -10482,10 +10482,10 @@
 001f14: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f1a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=372
         0x0003 line=373
-      locals        : 
+      locals        :
 
     #24              : (in LTestBadBootstrapArguments;)
       name          : 'invokeWrongArguments'
@@ -10501,10 +10501,10 @@
 001f2c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f32: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=182
         0x0003 line=183
-      locals        : 
+      locals        :
 
     #25              : (in LTestBadBootstrapArguments;)
       name          : 'invokeWrongArgumentsAgain'
@@ -10520,10 +10520,10 @@
 001f44: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f4a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=210
         0x0003 line=211
-      locals        : 
+      locals        :
 
     #26              : (in LTestBadBootstrapArguments;)
       name          : 'invokeWrongParameterTypes'
@@ -10539,10 +10539,10 @@
 001f5c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f62: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=98
         0x0003 line=99
-      locals        : 
+      locals        :
 
     #27              : (in LTestBadBootstrapArguments;)
       name          : 'missingParameterTypes'
@@ -10560,10 +10560,10 @@
 001f7c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001f82: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=128
         0x0007 line=129
-      locals        : 
+      locals        :
 
     #28              : (in LTestBadBootstrapArguments;)
       name          : 'narrowArguments'
@@ -10579,10 +10579,10 @@
 001f94: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f9a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=260
         0x0003 line=261
-      locals        : 
+      locals        :
 
     #29              : (in LTestBadBootstrapArguments;)
       name          : 'objectReturnType'
@@ -10598,10 +10598,10 @@
 001fac: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001fb2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=421
         0x0003 line=422
-      locals        : 
+      locals        :
 
     #30              : (in LTestBadBootstrapArguments;)
       name          : 'sayHello'
@@ -10619,10 +10619,10 @@
 001fcc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001fd2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=473
         0x0007 line=474
-      locals        : 
+      locals        :
 
     #31              : (in LTestBadBootstrapArguments;)
       name          : 'test'
@@ -10898,7 +10898,7 @@
           Ljava/lang/BootstrapMethodError; -> 0x01bc
         0x01e1 - 0x01e7
           Ljava/lang/BootstrapMethodError; -> 0x01e8
-      positions     : 
+      positions     :
         0x0000 line=477
         0x0007 line=478
         0x000a line=480
@@ -10994,18 +10994,18 @@
         0x0200 line=579
         0x020d line=581
         0x0210 line=582
-      locals        : 
-        0x0012 - 0x0022 reg=0 expected Ljava/lang/NoSuchMethodError; 
-        0x002a - 0x003a reg=0 expected Ljava/lang/NoSuchMethodError; 
-        0x0042 - 0x0073 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x007b - 0x00ac reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x00b4 - 0x00e5 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x00ed - 0x011e reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x0126 - 0x0157 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x0165 - 0x0189 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x0191 - 0x01b5 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x01bd - 0x01e1 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x01e9 - 0x020d reg=0 expected Ljava/lang/BootstrapMethodError; 
+      locals        :
+        0x0012 - 0x0022 reg=0 expected Ljava/lang/NoSuchMethodError;
+        0x002a - 0x003a reg=0 expected Ljava/lang/NoSuchMethodError;
+        0x0042 - 0x0073 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x007b - 0x00ac reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x00b4 - 0x00e5 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x00ed - 0x011e reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x0126 - 0x0157 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x0165 - 0x0189 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x0191 - 0x01b5 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x01bd - 0x01e1 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x01e9 - 0x020d reg=0 expected Ljava/lang/BootstrapMethodError;
 
     #32              : (in LTestBadBootstrapArguments;)
       name          : 'voidReturnType'
@@ -11021,10 +11021,10 @@
 00249c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 0024a2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=398
         0x0003 line=399
-      locals        : 
+      locals        :
 
     #33              : (in LTestBadBootstrapArguments;)
       name          : 'wideningArguments'
@@ -11042,10 +11042,10 @@
 0024bc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 0024c2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=304
         0x0007 line=305
-      locals        : 
+      locals        :
 
     #34              : (in LTestBadBootstrapArguments;)
       name          : 'wideningBoxingArguments'
@@ -11063,10 +11063,10 @@
 0024dc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 0024e2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=376
         0x0007 line=377
-      locals        : 
+      locals        :
 
     #35              : (in LTestBadBootstrapArguments;)
       name          : 'wrongArguments'
@@ -11084,10 +11084,10 @@
 0024fc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 002502: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=186
         0x0007 line=187
-      locals        : 
+      locals        :
 
     #36              : (in LTestBadBootstrapArguments;)
       name          : 'wrongArgumentsAgain'
@@ -11105,10 +11105,10 @@
 00251c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 002522: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=214
         0x0007 line=215
-      locals        : 
+      locals        :
 
     #37              : (in LTestBadBootstrapArguments;)
       name          : 'wrongParameterTypes'
@@ -11126,10 +11126,10 @@
 00253c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 002542: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=102
         0x0007 line=103
-      locals        : 
+      locals        :
 
   Virtual methods   -
   source_file_idx   : 144 (TestBadBootstrapArguments.java)
@@ -11180,9 +11180,9 @@
 0029da: 6700 0000                              |0001: sput v0, LTestDynamicBootstrapArguments;.bsmCalls:I // field@0000
 0029de: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
-      locals        : 
+      locals        :
 
     #1              : (in LTestDynamicBootstrapArguments;)
       name          : '<init>'
@@ -11198,10 +11198,10 @@
 0029f0: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 0029f6: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=26
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestDynamicBootstrapArguments; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestDynamicBootstrapArguments;
 
     #2              : (in LTestDynamicBootstrapArguments;)
       name          : 'bsm'
@@ -11234,22 +11234,22 @@
 0029be: 7020 d200 2300                         |0027: invoke-direct {v3, v2}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 0029c4: 1103                                   |002a: return-object v3
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=36
         0x0006 line=37
         0x0008 line=38
         0x001a line=39
         0x001e line=40
         0x0025 line=41
-      locals        : 
+      locals        :
         0x0008 - 0x002b reg=0 definingClass Ljava/lang/Class; Ljava/lang/Class<*>;
-        0x001a - 0x002b reg=1 methodName Ljava/lang/String; 
-        0x001e - 0x002b reg=2 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x002b reg=5 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x002b reg=6 name Ljava/lang/String; 
-        0x0000 - 0x002b reg=7 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x002b reg=8 otherNameComponent Ljava/lang/String; 
-        0x0000 - 0x002b reg=9 nameSuffix J 
+        0x001a - 0x002b reg=1 methodName Ljava/lang/String;
+        0x001e - 0x002b reg=2 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x002b reg=5 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x002b reg=6 name Ljava/lang/String;
+        0x0000 - 0x002b reg=7 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x002b reg=8 otherNameComponent Ljava/lang/String;
+        0x0000 - 0x002b reg=9 nameSuffix J
 
     #3              : (in LTestDynamicBootstrapArguments;)
       name          : 'targetA100000000'
@@ -11276,17 +11276,17 @@
 00293c: 6e20 b200 4000                         |001a: invoke-virtual {v0, v4}, Ljava/io/PrintStream;.println:(Ljava/lang/Object;)V // method@00b2
 002942: 0f02                                   |001d: return v2
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=71
         0x0005 line=72
         0x000c line=73
         0x0011 line=74
         0x0018 line=75
         0x001d line=76
-      locals        : 
-        0x0000 - 0x001e reg=2 i I 
-        0x0000 - 0x001e reg=3 s Ljava/lang/String; 
-        0x0000 - 0x001e reg=4 d Ljava/lang/Double; 
+      locals        :
+        0x0000 - 0x001e reg=2 i I
+        0x0000 - 0x001e reg=3 s Ljava/lang/String;
+        0x0000 - 0x001e reg=4 d Ljava/lang/Double;
 
     #4              : (in LTestDynamicBootstrapArguments;)
       name          : 'test'
@@ -11311,14 +11311,14 @@
 002a32: 7120 4100 0100                         |0015: invoke-static {v1, v0}, LTestDynamicBootstrapArguments;.assertEquals:(II)V // method@0041
 002a38: 0e00                                   |0018: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=86
         0x0007 line=87
         0x000a line=88
         0x0010 line=89
         0x0013 line=90
         0x0018 line=91
-      locals        : 
+      locals        :
 
     #5              : (in LTestDynamicBootstrapArguments;)
       name          : 'testCallSites'
@@ -11357,12 +11357,12 @@
 002ab2: 7120 4100 0200                         |0033: invoke-static {v2, v0}, LTestDynamicBootstrapArguments;.assertEquals:(II)V // method@0041
 002ab8: 0e00                                   |0036: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=80
         0x0013 line=81
         0x0026 line=82
         0x0036 line=83
-      locals        : 
+      locals        :
 
     #6              : (in LTestDynamicBootstrapArguments;)
       name          : 'testDynamic'
@@ -11379,13 +11379,13 @@
 00295a: 1200                                   |0003: const/4 v0, #int 0 // #0
 00295c: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=66
         0x0003 line=67
-      locals        : 
-        0x0000 - 0x0005 reg=1 i I 
-        0x0000 - 0x0005 reg=2 s Ljava/lang/String; 
-        0x0000 - 0x0005 reg=3 d Ljava/lang/Double; 
+      locals        :
+        0x0000 - 0x0005 reg=1 i I
+        0x0000 - 0x0005 reg=2 s Ljava/lang/String;
+        0x0000 - 0x0005 reg=3 d Ljava/lang/Double;
 
   Virtual methods   -
   source_file_idx   : 147 (TestDynamicBootstrapArguments.java)
@@ -11461,10 +11461,10 @@
 002cb4: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 002cba: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=25
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestInvocationKinds; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestInvocationKinds;
 
     #1              : (in LTestInvocationKinds;)
       name          : 'getInstanceField'
@@ -11481,11 +11481,11 @@
 002b06: 1900 f87f                              |0003: const-wide/high16 v0, #long 9221120237041090560 // #7ff8
 002b0a: 1000                                   |0005: return-wide v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=117
         0x0003 line=118
-      locals        : 
-        0x0000 - 0x0006 reg=2 instance LTestInvocationKinds; 
+      locals        :
+        0x0000 - 0x0006 reg=2 instance LTestInvocationKinds;
 
     #2              : (in LTestInvocationKinds;)
       name          : 'getStaticField'
@@ -11502,10 +11502,10 @@
 002b3e: 1200                                   |0003: const/4 v0, #int 0 // #0
 002b40: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=71
         0x0003 line=72
-      locals        : 
+      locals        :
 
     #3              : (in LTestInvocationKinds;)
       name          : 'lookupConstructor'
@@ -11529,18 +11529,18 @@
 002b90: 7020 d200 2300                         |0010: invoke-direct {v3, v2}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002b96: 1103                                   |0013: return-object v3
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=183
         0x0004 line=184
         0x000a line=185
         0x000e line=186
-      locals        : 
+      locals        :
         0x0004 - 0x0014 reg=0 cls Ljava/lang/Class; Ljava/lang/Class<*>;
-        0x000a - 0x0014 reg=1 constructorMethodType Ljava/lang/invoke/MethodType; 
-        0x000e - 0x0014 reg=2 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0014 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0014 reg=5 name Ljava/lang/String; 
-        0x0000 - 0x0014 reg=6 methodType Ljava/lang/invoke/MethodType; 
+        0x000a - 0x0014 reg=1 constructorMethodType Ljava/lang/invoke/MethodType;
+        0x000e - 0x0014 reg=2 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0014 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0014 reg=5 name Ljava/lang/String;
+        0x0000 - 0x0014 reg=6 methodType Ljava/lang/invoke/MethodType;
 
     #4              : (in LTestInvocationKinds;)
       name          : 'lookupInstanceFieldGetter'
@@ -11565,15 +11565,15 @@
 002bc8: 7020 d200 0100                         |0010: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002bce: 1101                                   |0013: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=101
         0x0001 line=102
         0x000e line=103
-      locals        : 
-        0x000e - 0x0014 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0014 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0014 reg=3 name Ljava/lang/String; 
-        0x0000 - 0x0014 reg=4 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x000e - 0x0014 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0014 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0014 reg=3 name Ljava/lang/String;
+        0x0000 - 0x0014 reg=4 methodType Ljava/lang/invoke/MethodType;
 
     #5              : (in LTestInvocationKinds;)
       name          : 'lookupInstanceFieldSetter'
@@ -11599,15 +11599,15 @@
 002c02: 7020 d200 0100                         |0011: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002c08: 1101                                   |0014: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=78
         0x0001 line=79
         0x000f line=80
-      locals        : 
-        0x000f - 0x0015 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0015 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0015 reg=3 name Ljava/lang/String; 
-        0x0000 - 0x0015 reg=4 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x000f - 0x0015 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0015 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0015 reg=3 name Ljava/lang/String;
+        0x0000 - 0x0015 reg=4 methodType Ljava/lang/invoke/MethodType;
 
     #6              : (in LTestInvocationKinds;)
       name          : 'lookupStaticFieldGetter'
@@ -11629,15 +11629,15 @@
 002c34: 7020 d200 0100                         |000c: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002c3a: 1101                                   |000f: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=32
         0x0002 line=33
         0x000a line=34
-      locals        : 
-        0x000a - 0x0010 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0010 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0010 reg=3 name Ljava/lang/String; 
-        0x0000 - 0x0010 reg=4 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x000a - 0x0010 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0010 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0010 reg=3 name Ljava/lang/String;
+        0x0000 - 0x0010 reg=4 methodType Ljava/lang/invoke/MethodType;
 
     #7              : (in LTestInvocationKinds;)
       name          : 'lookupStaticFieldSetter'
@@ -11660,16 +11660,16 @@
 002c66: 7020 d200 0100                         |000d: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002c6c: 1101                                   |0010: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=54
         0x0002 line=56
         0x0007 line=55
         0x000b line=57
-      locals        : 
-        0x000b - 0x0011 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0011 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0011 reg=3 name Ljava/lang/String; 
-        0x0000 - 0x0011 reg=4 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x000b - 0x0011 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0011 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0011 reg=3 name Ljava/lang/String;
+        0x0000 - 0x0011 reg=4 methodType Ljava/lang/invoke/MethodType;
 
     #8              : (in LTestInvocationKinds;)
       name          : 'lookupVirtual'
@@ -11693,16 +11693,16 @@
 002c9c: 7020 d200 1200                         |000e: invoke-direct {v2, v1}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002ca2: 1102                                   |0011: return-object v2
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=146
         0x0006 line=147
         0x000c line=148
-      locals        : 
-        0x0006 - 0x0012 reg=0 mt Ljava/lang/invoke/MethodType; 
-        0x000c - 0x0012 reg=1 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0012 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0012 reg=4 name Ljava/lang/String; 
-        0x0000 - 0x0012 reg=5 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0006 - 0x0012 reg=0 mt Ljava/lang/invoke/MethodType;
+        0x000c - 0x0012 reg=1 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0012 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0012 reg=4 name Ljava/lang/String;
+        0x0000 - 0x0012 reg=5 methodType Ljava/lang/invoke/MethodType;
 
     #9              : (in LTestInvocationKinds;)
       name          : 'makeWidget'
@@ -11719,11 +11719,11 @@
 002aea: 1200                                   |0003: const/4 v0, #int 0 // #0
 002aec: 1100                                   |0004: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=200
         0x0003 line=201
-      locals        : 
-        0x0000 - 0x0005 reg=1 v I 
+      locals        :
+        0x0000 - 0x0005 reg=1 v I
 
     #10              : (in LTestInvocationKinds;)
       name          : 'maxIntegerValue'
@@ -11740,13 +11740,13 @@
 002b5a: 1200                                   |0003: const/4 v0, #int 0 // #0
 002b5c: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=159
         0x0003 line=160
-      locals        : 
-        0x0000 - 0x0005 reg=1 receiver LTestInvocationKinds; 
-        0x0000 - 0x0005 reg=2 x I 
-        0x0000 - 0x0005 reg=3 y I 
+      locals        :
+        0x0000 - 0x0005 reg=1 receiver LTestInvocationKinds;
+        0x0000 - 0x0005 reg=2 x I
+        0x0000 - 0x0005 reg=3 y I
 
     #11              : (in LTestInvocationKinds;)
       name          : 'setInstanceField'
@@ -11764,13 +11764,13 @@
 002cd6: 5a20 0200                              |0005: iput-wide v0, v2, LTestInvocationKinds;.instance_field:D // field@0002
 002cda: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=94
         0x0003 line=95
         0x0007 line=96
-      locals        : 
-        0x0000 - 0x0008 reg=2 instance LTestInvocationKinds; 
-        0x0000 - 0x0008 reg=3 value D 
+      locals        :
+        0x0000 - 0x0008 reg=2 instance LTestInvocationKinds;
+        0x0000 - 0x0008 reg=3 value D
 
     #12              : (in LTestInvocationKinds;)
       name          : 'setStaticField'
@@ -11786,11 +11786,11 @@
 002cec: 7100 4d00 0000                         |0000: invoke-static {}, LTestInvocationKinds;.assertNotReached:()V // method@004d
 002cf2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=48
         0x0003 line=49
-      locals        : 
-        0x0000 - 0x0004 reg=0 value I 
+      locals        :
+        0x0000 - 0x0004 reg=0 value I
 
     #13              : (in LTestInvocationKinds;)
       name          : 'test'
@@ -11814,14 +11814,14 @@
 002d2c: 7100 5c00 0000                         |0014: invoke-static {}, LTestInvocationKinds;.testConstructor:()V // method@005c
 002d32: 0e00                                   |0017: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=212
         0x000b line=213
         0x000e line=214
         0x0011 line=215
         0x0014 line=216
         0x0017 line=217
-      locals        : 
+      locals        :
 
     #14              : (in LTestInvocationKinds;)
       name          : 'testConstructor'
@@ -11850,14 +11850,14 @@
 002d7a: 6e20 b200 2100                         |001b: invoke-virtual {v1, v2}, Ljava/io/PrintStream;.println:(Ljava/lang/Object;)V // method@00b2
 002d80: 0e00                                   |001e: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=205
         0x0007 line=206
         0x000c line=207
         0x0015 line=208
         0x001e line=209
-      locals        : 
-        0x000c - 0x001f reg=0 receiver LTestInvocationKinds$Widget; 
+      locals        :
+        0x000c - 0x001f reg=0 receiver LTestInvocationKinds$Widget;
 
     #15              : (in LTestInvocationKinds;)
       name          : 'testInstanceFieldAccessors'
@@ -11888,7 +11888,7 @@
 002de4: 7140 4a00 2143                         |0028: invoke-static {v1, v2, v3, v4}, LTestInvocationKinds;.assertEquals:(DD)V // method@004a
 002dea: 0e00                                   |002b: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=133
         0x0007 line=134
         0x000c line=135
@@ -11897,8 +11897,8 @@
         0x001d line=138
         0x0024 line=139
         0x002b line=140
-      locals        : 
-        0x000c - 0x002c reg=0 instance LTestInvocationKinds; 
+      locals        :
+        0x000c - 0x002c reg=0 instance LTestInvocationKinds;
 
     #16              : (in LTestInvocationKinds;)
       name          : 'testInvokeVirtual'
@@ -11924,15 +11924,15 @@
 002e26: 6e20 b100 1200                         |0015: invoke-virtual {v2, v1}, Ljava/io/PrintStream;.println:(I)V // method@00b1
 002e2c: 0e00                                   |0018: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=168
         0x0007 line=169
         0x000c line=170
         0x0013 line=171
         0x0018 line=172
-      locals        : 
-        0x000c - 0x0019 reg=0 receiver LTestInvocationKinds; 
-        0x0013 - 0x0019 reg=1 result I 
+      locals        :
+        0x000c - 0x0019 reg=0 receiver LTestInvocationKinds;
+        0x0013 - 0x0019 reg=1 result I
 
     #17              : (in LTestInvocationKinds;)
       name          : 'testStaticFieldAccessors'
@@ -11967,7 +11967,7 @@
 002e96: 7120 4b00 1000                         |002b: invoke-static {v0, v1}, LTestInvocationKinds;.assertEquals:(II)V // method@004b
 002e9c: 0e00                                   |002e: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=122
         0x0007 line=123
         0x000b line=124
@@ -11977,7 +11977,7 @@
         0x0022 line=128
         0x0027 line=129
         0x002e line=130
-      locals        : 
+      locals        :
 
   Virtual methods   -
     #0              : (in LTestInvocationKinds;)
@@ -11997,12 +11997,12 @@
 002b24: 0130                                   |0004: move v0, v3
 002b26: 0f00                                   |0005: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=164
-      locals        : 
-        0x0000 - 0x0006 reg=1 this LTestInvocationKinds; 
-        0x0000 - 0x0006 reg=2 x I 
-        0x0000 - 0x0006 reg=3 y I 
+      locals        :
+        0x0000 - 0x0006 reg=1 this LTestInvocationKinds;
+        0x0000 - 0x0006 reg=2 x I
+        0x0000 - 0x0006 reg=3 y I
 
   source_file_idx   : 148 (TestInvocationKinds.java)
 
@@ -12097,14 +12097,14 @@
 0030b8: 6901 0500                              |0022: sput-object v1, LTestInvokeCustomWithConcurrentThreads;.barrier:Ljava/util/concurrent/CyclicBarrier; // field@0005
 0030bc: 0e00                                   |0024: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=30
         0x0008 line=32
         0x000f line=41
         0x0015 line=44
         0x0019 line=47
         0x001d line=50
-      locals        : 
+      locals        :
 
     #1              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : '<init>'
@@ -12120,10 +12120,10 @@
 0030d0: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 0030d6: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=52
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestInvokeCustomWithConcurrentThreads; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestInvokeCustomWithConcurrentThreads;
 
     #2              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'access$000'
@@ -12139,9 +12139,9 @@
 00305c: 6200 0800                              |0000: sget-object v0, LTestInvokeCustomWithConcurrentThreads;.nextIndex:Ljava/util/concurrent/atomic/AtomicInteger; // field@0008
 003060: 1100                                   |0002: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
-      locals        : 
+      locals        :
 
     #3              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'getThreadIndex'
@@ -12162,9 +12162,9 @@
 002f26: 0a00                                   |000b: move-result v0
 002f28: 0f00                                   |000c: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=55
-      locals        : 
+      locals        :
 
     #4              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'linkerMethod'
@@ -12225,7 +12225,7 @@
 003044: 4601 0102                              |005e: aget-object v1, v1, v2
 003048: 1101                                   |0060: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=87
         0x0002 line=88
         0x0006 line=89
@@ -12237,11 +12237,11 @@
         0x0046 line=99
         0x004b line=101
         0x0058 line=102
-      locals        : 
-        0x0006 - 0x0061 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0061 reg=5 caller Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0061 reg=6 name Ljava/lang/String; 
-        0x0000 - 0x0061 reg=7 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0006 - 0x0061 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0061 reg=5 caller Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0061 reg=6 name Ljava/lang/String;
+        0x0000 - 0x0061 reg=7 methodType Ljava/lang/invoke/MethodType;
 
     #5              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'notUsed'
@@ -12256,10 +12256,10 @@
 002f2c:                                        |[002f2c] TestInvokeCustomWithConcurrentThreads.notUsed:(I)I
 002f3c: 0f00                                   |0000: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=59
-      locals        : 
-        0x0000 - 0x0001 reg=0 x I 
+      locals        :
+        0x0000 - 0x0001 reg=0 x I
 
     #6              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'setCalled'
@@ -12283,12 +12283,12 @@
 002f74: 1200                                   |0012: const/4 v0, #int 0 // #0
 002f76: 0f00                                   |0013: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=79
         0x0007 line=80
         0x0012 line=81
-      locals        : 
-        0x0000 - 0x0014 reg=2 index I 
+      locals        :
+        0x0000 - 0x0014 reg=2 index I
 
     #7              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'test'
@@ -12418,7 +12418,7 @@
 0032ce: 7120 6600 2500                         |00e1: invoke-static {v5, v2}, LTestInvokeCustomWithConcurrentThreads;.assertEquals:(II)V // method@0066
 0032d4: 0e00                                   |00e4: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=107
         0x0006 line=108
         0x000f line=109
@@ -12457,18 +12457,18 @@
         0x00de line=157
         0x00e1 line=158
         0x00e4 line=159
-      locals        : 
-        0x0002 - 0x001b reg=1 i I 
-        0x001e - 0x0034 reg=3 i I 
-        0x0035 - 0x003f reg=3 i I 
-        0x0040 - 0x0044 reg=3 winners I 
-        0x0041 - 0x0044 reg=4 votes I 
-        0x0044 - 0x0066 reg=3 i I 
-        0x0090 - 0x00b2 reg=7 i I 
-        0x00bc - 0x00de reg=7 i I 
-        0x001d - 0x00e5 reg=1 threads [Ljava/lang/Thread; 
-        0x0044 - 0x00e5 reg=4 winners I 
-        0x0044 - 0x00e5 reg=5 votes I 
+      locals        :
+        0x0002 - 0x001b reg=1 i I
+        0x001e - 0x0034 reg=3 i I
+        0x0035 - 0x003f reg=3 i I
+        0x0040 - 0x0044 reg=3 winners I
+        0x0041 - 0x0044 reg=4 votes I
+        0x0044 - 0x0066 reg=3 i I
+        0x0090 - 0x00b2 reg=7 i I
+        0x00bc - 0x00de reg=7 i I
+        0x001d - 0x00e5 reg=1 threads [Ljava/lang/Thread;
+        0x0044 - 0x00e5 reg=4 winners I
+        0x0044 - 0x00e5 reg=5 votes I
 
   Virtual methods   -
     #0              : (in LTestInvokeCustomWithConcurrentThreads;)
@@ -12488,13 +12488,13 @@
 0030f2: 7110 6b00 0000                         |0005: invoke-static {v0}, LTestInvokeCustomWithConcurrentThreads;.notUsed:(I)I // method@006b
 0030f8: 0e00                                   |0008: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=63
         0x0005 line=64
         0x0008 line=65
-      locals        : 
-        0x0005 - 0x0009 reg=0 x I 
-        0x0000 - 0x0009 reg=1 this LTestInvokeCustomWithConcurrentThreads; 
+      locals        :
+        0x0005 - 0x0009 reg=0 x I
+        0x0000 - 0x0009 reg=1 this LTestInvokeCustomWithConcurrentThreads;
 
   source_file_idx   : 149 (TestInvokeCustomWithConcurrentThreads.java)
 
@@ -12566,9 +12566,9 @@
 003416: 6700 0f00                              |0001: sput v0, LTestLinkerMethodMinimalArguments;.forceFailureType:I // field@000f
 00341a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=26
-      locals        : 
+      locals        :
 
     #1              : (in LTestLinkerMethodMinimalArguments;)
       name          : '<init>'
@@ -12584,10 +12584,10 @@
 00342c: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 003432: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=25
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestLinkerMethodMinimalArguments; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestLinkerMethodMinimalArguments;
 
     #2              : (in LTestLinkerMethodMinimalArguments;)
       name          : '_add'
@@ -12613,14 +12613,14 @@
 00330e: 7020 b400 1000                         |0013: invoke-direct {v0, v1}, Ljava/lang/ArithmeticException;.<init>:(Ljava/lang/String;)V // method@00b4
 003314: 2700                                   |0016: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=51
         0x0005 line=55
         0x0008 line=52
         0x000f line=53
-      locals        : 
-        0x0000 - 0x0017 reg=2 a I 
-        0x0000 - 0x0017 reg=3 b I 
+      locals        :
+        0x0000 - 0x0017 reg=2 a I
+        0x0000 - 0x0017 reg=3 b I
 
     #3              : (in LTestLinkerMethodMinimalArguments;)
       name          : 'add'
@@ -12637,12 +12637,12 @@
 00332e: 12f0                                   |0003: const/4 v0, #int -1 // #ff
 003330: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=45
         0x0003 line=46
-      locals        : 
-        0x0000 - 0x0005 reg=1 a I 
-        0x0000 - 0x0005 reg=2 b I 
+      locals        :
+        0x0000 - 0x0005 reg=1 a I
+        0x0000 - 0x0005 reg=2 b I
 
     #4              : (in LTestLinkerMethodMinimalArguments;)
       name          : 'linkerMethod'
@@ -12696,7 +12696,7 @@
 0033f2: 1101                                   |0057: return-object v1
 0033f4: 0001 0200 0100 0000 1800 0000 0900 ... |0058: packed-switch-data (8 units)
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=61
         0x0018 line=62
         0x001a line=63
@@ -12706,11 +12706,11 @@
         0x0030 line=71
         0x0038 line=66
         0x0056 line=68
-      locals        : 
-        0x001e - 0x0060 reg=0 mh_add Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0060 reg=4 caller Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0060 reg=5 name Ljava/lang/String; 
-        0x0000 - 0x0060 reg=6 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x001e - 0x0060 reg=0 mh_add Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0060 reg=4 caller Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0060 reg=5 name Ljava/lang/String;
+        0x0000 - 0x0060 reg=6 methodType Ljava/lang/invoke/MethodType;
 
     #5              : (in LTestLinkerMethodMinimalArguments;)
       name          : 'test'
@@ -12757,17 +12757,17 @@
 0034c4: 6e20 b300 1000                         |0040: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 0034ca: 0e00                                   |0043: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=78
         0x000a line=79
         0x0012 line=80
         0x0014 line=81
         0x001d line=82
         0x0043 line=83
-      locals        : 
-        0x0000 - 0x0044 reg=3 failureType I 
-        0x0000 - 0x0044 reg=4 x I 
-        0x0000 - 0x0044 reg=5 y I 
+      locals        :
+        0x0000 - 0x0044 reg=3 failureType I
+        0x0000 - 0x0044 reg=4 x I
+        0x0000 - 0x0044 reg=5 y I
 
   Virtual methods   -
   source_file_idx   : 151 (TestLinkerMethodMinimalArguments.java)
@@ -12821,9 +12821,9 @@
 00362a: 6700 1000                              |0001: sput v0, LTestLinkerMethodMultipleArgumentTypes;.bootstrapRunCount:I // field@0010
 00362e: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=28
-      locals        : 
+      locals        :
 
     #1              : (in LTestLinkerMethodMultipleArgumentTypes;)
       name          : '<init>'
@@ -12839,10 +12839,10 @@
 003640: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 003646: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=26
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestLinkerMethodMultipleArgumentTypes; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestLinkerMethodMultipleArgumentTypes;
 
     #2              : (in LTestLinkerMethodMultipleArgumentTypes;)
       name          : '_add'
@@ -12858,11 +12858,11 @@
 0034f4: 9000 0102                              |0000: add-int v0, v1, v2
 0034f8: 0f00                                   |0002: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=74
-      locals        : 
-        0x0000 - 0x0003 reg=1 a I 
-        0x0000 - 0x0003 reg=2 b I 
+      locals        :
+        0x0000 - 0x0003 reg=1 a I
+        0x0000 - 0x0003 reg=2 b I
 
     #3              : (in LTestLinkerMethodMultipleArgumentTypes;)
       name          : 'add'
@@ -12879,12 +12879,12 @@
 003512: 12f0                                   |0003: const/4 v0, #int -1 // #ff
 003514: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=68
         0x0003 line=69
-      locals        : 
-        0x0000 - 0x0005 reg=1 a I 
-        0x0000 - 0x0005 reg=2 b I 
+      locals        :
+        0x0000 - 0x0005 reg=1 a I
+        0x0000 - 0x0005 reg=2 b I
 
     #4              : (in LTestLinkerMethodMultipleArgumentTypes;)
       name          : 'linkerMethod'
@@ -12948,7 +12948,7 @@
 00360e: 7020 d200 df00                         |0073: invoke-direct {v15, v13}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003614: 110f                                   |0076: return-object v15
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=93
         0x0022 line=94
         0x0028 line=95
@@ -12963,22 +12963,22 @@
         0x0069 line=104
         0x006b line=105
         0x0071 line=106
-      locals        : 
-        0x0000 - 0x0000 reg=28 (null) Ljava/lang/Class; 
-        0x0071 - 0x0077 reg=13 mh_add Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0077 reg=16 caller Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0077 reg=17 name Ljava/lang/String; 
-        0x0000 - 0x0077 reg=18 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0077 reg=19 v1 I 
-        0x0000 - 0x0077 reg=20 v2 I 
-        0x0000 - 0x0077 reg=21 v3 I 
-        0x0000 - 0x0077 reg=22 v4 I 
-        0x0000 - 0x0077 reg=23 v5 I 
-        0x0000 - 0x0077 reg=24 v6 F 
-        0x0000 - 0x0077 reg=25 v7 D 
-        0x0000 - 0x0077 reg=27 v8 Ljava/lang/String; 
+      locals        :
+        0x0000 - 0x0000 reg=28 (null) Ljava/lang/Class;
+        0x0071 - 0x0077 reg=13 mh_add Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0077 reg=16 caller Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0077 reg=17 name Ljava/lang/String;
+        0x0000 - 0x0077 reg=18 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0077 reg=19 v1 I
+        0x0000 - 0x0077 reg=20 v2 I
+        0x0000 - 0x0077 reg=21 v3 I
+        0x0000 - 0x0077 reg=22 v4 I
+        0x0000 - 0x0077 reg=23 v5 I
+        0x0000 - 0x0077 reg=24 v6 F
+        0x0000 - 0x0077 reg=25 v7 D
+        0x0000 - 0x0077 reg=27 v8 Ljava/lang/String;
         0x0000 - 0x0077 reg=28 v9 Ljava/lang/Class; Ljava/lang/Class<*>;
-        0x0000 - 0x0077 reg=29 v10 J 
+        0x0000 - 0x0077 reg=29 v10 J
 
     #5              : (in LTestLinkerMethodMultipleArgumentTypes;)
       name          : 'test'
@@ -13000,13 +13000,13 @@
 003672: 6e20 b100 1000                         |000d: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(I)V // method@00b1
 003678: 0e00                                   |0010: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=114
         0x0009 line=115
         0x0010 line=116
-      locals        : 
-        0x0000 - 0x0011 reg=2 x I 
-        0x0000 - 0x0011 reg=3 y I 
+      locals        :
+        0x0000 - 0x0011 reg=2 x I
+        0x0000 - 0x0011 reg=3 y I
 
   Virtual methods   -
     #0              : (in LTestLinkerMethodMultipleArgumentTypes;)
@@ -13023,10 +13023,10 @@
 0034dc: 6000 1000                              |0000: sget v0, LTestLinkerMethodMultipleArgumentTypes;.bootstrapRunCount:I // field@0010
 0034e0: 0f00                                   |0002: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=110
-      locals        : 
-        0x0000 - 0x0003 reg=1 this LTestLinkerMethodMultipleArgumentTypes; 
+      locals        :
+        0x0000 - 0x0003 reg=1 this LTestLinkerMethodMultipleArgumentTypes;
 
   source_file_idx   : 153 (TestLinkerMethodMultipleArgumentTypes.java)
 
@@ -13071,10 +13071,10 @@
 0036f4: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 0036fa: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=23
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestLinkerUnrelatedBSM; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestLinkerUnrelatedBSM;
 
     #1              : (in LTestLinkerUnrelatedBSM;)
       name          : '_addf'
@@ -13090,11 +13090,11 @@
 00368c: a600 0102                              |0000: add-float v0, v1, v2
 003690: 0f00                                   |0002: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=47
-      locals        : 
-        0x0000 - 0x0003 reg=1 a F 
-        0x0000 - 0x0003 reg=2 b F 
+      locals        :
+        0x0000 - 0x0003 reg=1 a F
+        0x0000 - 0x0003 reg=2 b F
 
     #2              : (in LTestLinkerUnrelatedBSM;)
       name          : '_subf'
@@ -13110,11 +13110,11 @@
 0036a4: a700 0102                              |0000: sub-float v0, v1, v2
 0036a8: 0f00                                   |0002: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=73
-      locals        : 
-        0x0000 - 0x0003 reg=1 a F 
-        0x0000 - 0x0003 reg=2 b F 
+      locals        :
+        0x0000 - 0x0003 reg=1 a F
+        0x0000 - 0x0003 reg=2 b F
 
     #3              : (in LTestLinkerUnrelatedBSM;)
       name          : 'addf'
@@ -13131,12 +13131,12 @@
 0036c2: 1210                                   |0003: const/4 v0, #int 1 // #1
 0036c4: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=42
         0x0003 line=43
-      locals        : 
-        0x0000 - 0x0005 reg=1 a F 
-        0x0000 - 0x0005 reg=2 b F 
+      locals        :
+        0x0000 - 0x0005 reg=1 a F
+        0x0000 - 0x0005 reg=2 b F
 
     #4              : (in LTestLinkerUnrelatedBSM;)
       name          : 'subf'
@@ -13153,12 +13153,12 @@
 0036de: 1210                                   |0003: const/4 v0, #int 1 // #1
 0036e0: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=68
         0x0003 line=69
-      locals        : 
-        0x0000 - 0x0005 reg=1 a F 
-        0x0000 - 0x0005 reg=2 b F 
+      locals        :
+        0x0000 - 0x0005 reg=1 a F
+        0x0000 - 0x0005 reg=2 b F
 
     #5              : (in LTestLinkerUnrelatedBSM;)
       name          : 'test'
@@ -13188,12 +13188,12 @@
 003748: 7120 8900 0100                         |001e: invoke-static {v1, v0}, LTestLinkerUnrelatedBSM;.assertEquals:(FF)V // method@0089
 00374e: 0e00                                   |0021: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=77
         0x000b line=78
         0x0018 line=79
         0x0021 line=80
-      locals        : 
+      locals        :
 
   Virtual methods   -
   source_file_idx   : 154 (TestLinkerUnrelatedBSM.java)
@@ -13284,10 +13284,10 @@
 003a8c: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 003a92: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestVariableArityLinkerMethod; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestVariableArityLinkerMethod;
 
     #1              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithBoxedArray'
@@ -13320,16 +13320,16 @@
 00379c: 7020 d200 0100                         |001e: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 0037a2: 1101                                   |0021: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=477
         0x0014 line=478
         0x001c line=479
-      locals        : 
-        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0022 reg=6 extraArgs [Ljava/lang/Integer; 
+      locals        :
+        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0022 reg=6 extraArgs [Ljava/lang/Integer;
 
     #2              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithClassAndFloatArray'
@@ -13364,18 +13364,18 @@
 0037f6: 7020 d200 0100                         |0021: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 0037fc: 1101                                   |0024: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=294
         0x0017 line=296
         0x001f line=297
-      locals        : 
-        0x0000 - 0x0000 reg=6 (null) Ljava/lang/Class; 
-        0x001f - 0x0025 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0025 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0025 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0025 reg=5 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x0000 reg=6 (null) Ljava/lang/Class;
+        0x001f - 0x0025 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0025 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0025 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0025 reg=5 methodType Ljava/lang/invoke/MethodType;
         0x0000 - 0x0025 reg=6 extraArg Ljava/lang/Class; Ljava/lang/Class<*>;
-        0x0000 - 0x0025 reg=7 arityArgs [F 
+        0x0000 - 0x0025 reg=7 arityArgs [F
 
     #3              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithClassArray'
@@ -13408,16 +13408,16 @@
 00384c: 7020 d200 0100                         |001e: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003852: 1101                                   |0021: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=367
         0x0014 line=368
         0x001c line=369
-      locals        : 
-        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0022 reg=6 arityArgs [Ljava/lang/Class; 
+      locals        :
+        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0022 reg=6 arityArgs [Ljava/lang/Class;
 
     #4              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithDoubleArray'
@@ -13450,16 +13450,16 @@
 0038a0: 7020 d200 0100                         |001e: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 0038a6: 1101                                   |0021: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=332
         0x0014 line=333
         0x001c line=334
-      locals        : 
-        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0022 reg=6 arityArgs [D 
+      locals        :
+        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0022 reg=6 arityArgs [D
 
     #5              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithFloatAndLongArray'
@@ -13496,19 +13496,19 @@
 003902: 7020 d200 0100                         |0025: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003908: 1101                                   |0028: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=257
         0x000e line=258
         0x0018 line=257
         0x001b line=259
         0x0023 line=260
-      locals        : 
-        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String; 
-        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0029 reg=7 extraArg F 
-        0x0000 - 0x0029 reg=8 arityArgs [J 
+      locals        :
+        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String;
+        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0029 reg=7 extraArg F
+        0x0000 - 0x0029 reg=8 arityArgs [J
 
     #6              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithIntAndStringArray'
@@ -13545,19 +13545,19 @@
 003966: 7020 d200 0100                         |0025: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 00396c: 1101                                   |0028: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=133
         0x000e line=138
         0x0018 line=133
         0x001b line=140
         0x0023 line=141
-      locals        : 
-        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String; 
-        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0029 reg=7 extraInt I 
-        0x0000 - 0x0029 reg=8 extraArityArgs [Ljava/lang/String; 
+      locals        :
+        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String;
+        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0029 reg=7 extraInt I
+        0x0000 - 0x0029 reg=8 extraArityArgs [Ljava/lang/String;
 
     #7              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithLongAndIntArray'
@@ -13594,17 +13594,17 @@
 0039ca: 7020 d200 0100                         |0025: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 0039d0: 1101                                   |0028: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=219
         0x001b line=220
         0x0023 line=221
-      locals        : 
-        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String; 
-        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0029 reg=7 extraArg J 
-        0x0000 - 0x0029 reg=9 arityArgs [I 
+      locals        :
+        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String;
+        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0029 reg=7 extraArg J
+        0x0000 - 0x0029 reg=9 arityArgs [I
 
     #8              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithStringArray'
@@ -13637,16 +13637,16 @@
 003a20: 7020 d200 0100                         |001e: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003a26: 1101                                   |0021: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=61
         0x0014 line=62
         0x001c line=63
-      locals        : 
-        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0022 reg=6 arityArgs [Ljava/lang/String; 
+      locals        :
+        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0022 reg=6 arityArgs [Ljava/lang/String;
 
     #9              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithWiderArray'
@@ -13679,16 +13679,16 @@
 003a74: 7020 d200 0100                         |001e: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003a7a: 1101                                   |0021: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=447
         0x0014 line=448
         0x001c line=449
-      locals        : 
-        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0022 reg=6 extraArgs [J 
+      locals        :
+        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0022 reg=6 extraArgs [J
 
     #10              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodA'
@@ -13706,10 +13706,10 @@
 003aac: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003ab2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=86
         0x0007 line=87
-      locals        : 
+      locals        :
 
     #11              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodB'
@@ -13727,10 +13727,10 @@
 003acc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003ad2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=105
         0x0007 line=106
-      locals        : 
+      locals        :
 
     #12              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodC'
@@ -13748,10 +13748,10 @@
 003aec: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003af2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=123
         0x0007 line=124
-      locals        : 
+      locals        :
 
     #13              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodD'
@@ -13769,10 +13769,10 @@
 003b0c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003b12: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=166
         0x0007 line=167
-      locals        : 
+      locals        :
 
     #14              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodE'
@@ -13790,10 +13790,10 @@
 003b2c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003b32: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=189
         0x0007 line=190
-      locals        : 
+      locals        :
 
     #15              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodF'
@@ -13811,10 +13811,10 @@
 003b4c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003b52: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=209
         0x0007 line=210
-      locals        : 
+      locals        :
 
     #16              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodG'
@@ -13832,10 +13832,10 @@
 003b6c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003b72: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=247
         0x0007 line=248
-      locals        : 
+      locals        :
 
     #17              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodH'
@@ -13853,10 +13853,10 @@
 003b8c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003b92: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=284
         0x0007 line=285
-      locals        : 
+      locals        :
 
     #18              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodI'
@@ -13874,10 +13874,10 @@
 003bac: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003bb2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=323
         0x0007 line=324
-      locals        : 
+      locals        :
 
     #19              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodJ'
@@ -13895,10 +13895,10 @@
 003bcc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003bd2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=358
         0x0007 line=359
-      locals        : 
+      locals        :
 
     #20              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodK'
@@ -13916,10 +13916,10 @@
 003bec: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003bf2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=392
         0x0007 line=393
-      locals        : 
+      locals        :
 
     #21              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodO'
@@ -13935,10 +13935,10 @@
 003c04: 7100 8e00 0000                         |0000: invoke-static {}, LTestVariableArityLinkerMethod;.assertNotReached:()V // method@008e
 003c0a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=413
         0x0003 line=414
-      locals        : 
+      locals        :
 
     #22              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodP'
@@ -13954,10 +13954,10 @@
 003c1c: 7100 8e00 0000                         |0000: invoke-static {}, LTestVariableArityLinkerMethod;.assertNotReached:()V // method@008e
 003c22: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=441
         0x0003 line=442
-      locals        : 
+      locals        :
 
     #23              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodQ'
@@ -13973,10 +13973,10 @@
 003c34: 7100 8e00 0000                         |0000: invoke-static {}, LTestVariableArityLinkerMethod;.assertNotReached:()V // method@008e
 003c3a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=468
         0x0003 line=469
-      locals        : 
+      locals        :
 
     #24              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodR'
@@ -13992,10 +13992,10 @@
 003c4c: 7100 8e00 0000                         |0000: invoke-static {}, LTestVariableArityLinkerMethod;.assertNotReached:()V // method@008e
 003c52: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=501
         0x0003 line=502
-      locals        : 
+      locals        :
 
     #25              : (in LTestVariableArityLinkerMethod;)
       name          : 'printBsmArgs'
@@ -14090,7 +14090,7 @@
 003d9a: 6e20 b300 1000                         |009b: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003da0: 0e00                                   |009e: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=29
         0x0005 line=30
         0x000c line=31
@@ -14112,11 +14112,11 @@
         0x0093 line=31
         0x0097 line=52
         0x009e line=53
-      locals        : 
-        0x002b - 0x008b reg=1 array Ljava/lang/Object; 
-        0x000d - 0x0097 reg=0 i I 
-        0x0000 - 0x009f reg=4 method Ljava/lang/String; 
-        0x0000 - 0x009f reg=5 args [Ljava/lang/Object; 
+      locals        :
+        0x002b - 0x008b reg=1 array Ljava/lang/Object;
+        0x000d - 0x0097 reg=0 i I
+        0x0000 - 0x009f reg=4 method Ljava/lang/String;
+        0x0000 - 0x009f reg=5 args [Ljava/lang/Object;
 
     #26              : (in LTestVariableArityLinkerMethod;)
       name          : 'test'
@@ -14240,7 +14240,7 @@
           Ljava/lang/BootstrapMethodError; -> 0x008e
         0x00b3 - 0x00b9
           Ljava/lang/BootstrapMethodError; -> 0x00ba
-      positions     : 
+      positions     :
         0x0000 line=506
         0x0005 line=507
         0x0008 line=508
@@ -14289,13 +14289,13 @@
         0x00cb line=565
         0x00d2 line=566
         0x00df line=568
-      locals        : 
-        0x0002 - 0x0011 reg=1 i I 
-        0x0012 - 0x0020 reg=0 i I 
-        0x0037 - 0x005b reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x0063 - 0x0087 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x008f - 0x00b3 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x00bb - 0x00df reg=0 expected Ljava/lang/BootstrapMethodError; 
+      locals        :
+        0x0002 - 0x0011 reg=1 i I
+        0x0012 - 0x0020 reg=0 i I
+        0x0037 - 0x005b reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x0063 - 0x0087 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x008f - 0x00b3 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x00bb - 0x00df reg=0 expected Ljava/lang/BootstrapMethodError;
 
   Virtual methods   -
   source_file_idx   : 156 (TestVariableArityLinkerMethod.java)
@@ -14745,10 +14745,10 @@
 0001bc: 7010 0200 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
 0001c2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=9
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LMain; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LMain;
 
     #1              : (in LMain;)
       name          : 'main'
@@ -14775,19 +14775,19 @@
 000206: fa54 0300 1032 0400                    |0019: invoke-polymorphic {v0, v1, v2, v3, v4}, Ljava/lang/invoke/MethodHandle;.invoke:([Ljava/lang/Object;)Ljava/lang/Object;, (Ljava/lang/String;DI)V // method@0003, proto@0004
 00020e: 0e00                                   |001d: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0006 line=31
         0x0007 line=32
         0x0008 line=33
         0x0011 line=34
         0x0016 line=35
         0x001d line=56
-      locals        : 
-        0x0007 - 0x001e reg=0 handle Ljava/lang/invoke/MethodHandle; 
-        0x0008 - 0x001e reg=5 o Ljava/lang/Object; 
-        0x0011 - 0x001e reg=7 s Ljava/lang/String; 
-        0x0016 - 0x001e reg=8 x I 
-        0x0000 - 0x001e reg=9 args [Ljava/lang/String; 
+      locals        :
+        0x0007 - 0x001e reg=0 handle Ljava/lang/invoke/MethodHandle;
+        0x0008 - 0x001e reg=5 o Ljava/lang/Object;
+        0x0011 - 0x001e reg=7 s Ljava/lang/String;
+        0x0016 - 0x001e reg=8 x I
+        0x0000 - 0x001e reg=9 args [Ljava/lang/String;
 
   Virtual methods   -
   source_file_idx   : 12 (Main.java)
@@ -14851,10 +14851,10 @@
 000158: 7010 0300 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0003
 00015e: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=2
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LQuoting; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LQuoting;
 
   Virtual methods   -
     #0              : (in LQuoting;)
@@ -14879,11 +14879,11 @@
 000194: 0c00                                   |0012: move-result-object v0
 000196: 1100                                   |0013: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=5
-      locals        : 
-        0x0000 - 0x0014 reg=2 this LQuoting; 
-        0x0000 - 0x0014 reg=3 (null) Ljava/lang/String; 
+      locals        :
+        0x0000 - 0x0014 reg=2 this LQuoting;
+        0x0000 - 0x0014 reg=3 (null) Ljava/lang/String;
 
     #1              : (in LQuoting;)
       name          : 'unicode'
@@ -14899,10 +14899,10 @@
 0001a8: 1a00 0000                              |0000: const-string v0, "\b\f\n\r\t\\\"'😜☈'\"" // string@0000
 0001ac: 1100                                   |0002: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=10
-      locals        : 
-        0x0000 - 0x0003 reg=1 this LQuoting; 
+      locals        :
+        0x0000 - 0x0003 reg=1 this LQuoting;
 
   source_file_idx   : 9 (Quoting.java)
 
@@ -15024,10 +15024,10 @@
 0001bc: 7010 0100 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0001
 0001c2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=24
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LStaticFields; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LStaticFields;
 
   Virtual methods   -
   source_file_idx   : 11 (StaticFields.java)
@@ -15362,9 +15362,9 @@
 0003be: 6900 2c00                              |0001: sput-object v0, LTest;.mObject:Ljava/lang/Object; // field@002c
 0003c2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=66
-      locals        : 
+      locals        :
 
     #1              : (in LTest;)
       name          : '<init>'
@@ -15380,10 +15380,10 @@
 0003d4: 7010 0200 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
 0003da: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=1
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTest; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTest;
 
   Virtual methods   -
   source_file_idx   : 13 (Test.java)
diff --git a/test/dexdump/all.txt b/test/dexdump/all.txt
index 894bac5..89ff49e 100644
--- a/test/dexdump/all.txt
+++ b/test/dexdump/all.txt
@@ -114,8 +114,8 @@
 00043c: 7010 1400 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0014
 000442: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in LA;)
       name          : 'arrays'
@@ -144,8 +144,8 @@
 000488: 5100 0102                              |001a: aput-short v0, v1, v2
 00048c: 0e00                                   |001c: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in LA;)
       name          : 'binary_ops'
@@ -192,8 +192,8 @@
 00051c: af00 0102                              |003e: rem-double v0, v1, v2
 000520: 0e00                                   |0040: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in LA;)
       name          : 'binary_ops_2addr'
@@ -240,8 +240,8 @@
 000572: cf10                                   |001f: rem-double/2addr v0, v1
 000574: 0e00                                   |0020: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in LA;)
       name          : 'binary_ops_lit16'
@@ -264,8 +264,8 @@
 0005a4: d710 3412                              |000e: xor-int/lit16 v0, v1, #int 4660 // #1234
 0005a8: 0e00                                   |0010: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in LA;)
       name          : 'binary_ops_lit8'
@@ -291,8 +291,8 @@
 0005e4: e200 0112                              |0014: ushr-int/lit8 v0, v1, #int 18 // #12
 0005e8: 0e00                                   |0016: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #6              : (in LA;)
       name          : 'compares'
@@ -312,8 +312,8 @@
 00060c: 3100 0102                              |0008: cmp-long v0, v1, v2
 000610: 0e00                                   |000a: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #7              : (in LA;)
       name          : 'conditionals'
@@ -340,8 +340,8 @@
 000650: 3d00 0200                              |0016: if-lez v0, 0018 // +0002
 000654: 0e00                                   |0018: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #8              : (in LA;)
       name          : 'constants'
@@ -367,8 +367,8 @@
 00069a: 1c00 0500                              |0019: const-class v0, Ljava/lang/Object; // type@0005
 00069e: 0e00                                   |001b: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #9              : (in LA;)
       name          : 'misc'
@@ -400,8 +400,8 @@
 0006ea: 0000                                   |001d: nop // spacer
 0006ec: 0003 0400 0a00 0000 0100 0000 0200 ... |001e: array-data (24 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #10              : (in LA;)
       name          : 'moves'
@@ -429,8 +429,8 @@
 000756: 0d00                                   |0015: move-exception v0
 000758: 0e00                                   |0016: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #11              : (in LA;)
       name          : 'packed_switch'
@@ -451,8 +451,8 @@
 00077a: 0000                                   |0007: nop // spacer
 00077c: 0001 0200 feff ff7f 0500 0000 0600 ... |0008: packed-switch-data (8 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #12              : (in LA;)
       name          : 'return32'
@@ -467,8 +467,8 @@
 00078c:                                        |[00078c] A.return32:()I
 00079c: 0f00                                   |0000: return v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #13              : (in LA;)
       name          : 'return64'
@@ -483,8 +483,8 @@
 0007a0:                                        |[0007a0] A.return64:()I
 0007b0: 1000                                   |0000: return-wide v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #14              : (in LA;)
       name          : 'return_object'
@@ -499,8 +499,8 @@
 0007b4:                                        |[0007b4] A.return_object:()Ljava/lang/Object;
 0007c4: 1100                                   |0000: return-object v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #15              : (in LA;)
       name          : 'sparse_switch'
@@ -517,8 +517,8 @@
 0007de: 0e00                                   |0003: return-void
 0007e0: 0002 0400 1111 0000 2222 0000 3333 ... |0004: sparse-switch-data (18 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #16              : (in LA;)
       name          : 'static_fields'
@@ -547,8 +547,8 @@
 000848: 6d00 0500                              |001a: sput-short v0, LA;.mS:S // field@0005
 00084c: 0e00                                   |001c: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #17              : (in LA;)
       name          : 'unary_ops'
@@ -584,8 +584,8 @@
 000888: 8f10                                   |0014: int-to-short v0, v1
 00088a: 0e00                                   |0015: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in LA;)
@@ -615,8 +615,8 @@
 0008d0: 5f10 0c00                              |001a: iput-short v0, v1, LA;.sS:S // field@000c
 0008d4: 0e00                                   |001c: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in LA;)
       name          : 'invokes'
@@ -635,8 +635,8 @@
 0008fa: 7154 0a00 1032                         |0009: invoke-static {v0, v1, v2, v3, v4}, LA;.invokes:()V // method@000a
 000900: 7254 0a00 1032                         |000c: invoke-interface {v0, v1, v2, v3, v4}, LA;.invokes:()V // method@000a
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
diff --git a/test/dexdump/bytecodes.txt b/test/dexdump/bytecodes.txt
index 018e68f..02172b9 100644
--- a/test/dexdump/bytecodes.txt
+++ b/test/dexdump/bytecodes.txt
@@ -136,10 +136,10 @@
 0009a0: 7010 1900 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0019
 0009a6: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=4
-      locals        : 
-        0x0000 - 0x0004 reg=0 this Lcom/google/android/test/BuildConfig; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this Lcom/google/android/test/BuildConfig;
 
   Virtual methods   -
   source_file_idx   : 3 (BuildConfig.java)
@@ -184,10 +184,10 @@
 0009b8: 7010 1900 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0019
 0009be: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=11
-      locals        : 
-        0x0000 - 0x0004 reg=0 this Lcom/google/android/test/R$attr; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this Lcom/google/android/test/R$attr;
 
   Virtual methods   -
   source_file_idx   : 44 (R.java)
@@ -237,10 +237,10 @@
 0009d0: 7010 1900 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0019
 0009d6: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=13
-      locals        : 
-        0x0000 - 0x0004 reg=0 this Lcom/google/android/test/R$drawable; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this Lcom/google/android/test/R$drawable;
 
   Virtual methods   -
   source_file_idx   : 44 (R.java)
@@ -284,10 +284,10 @@
 0009e8: 7010 1900 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0019
 0009ee: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=10
-      locals        : 
-        0x0000 - 0x0004 reg=0 this Lcom/google/android/test/R; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this Lcom/google/android/test/R;
 
   Virtual methods   -
   source_file_idx   : 44 (R.java)
@@ -475,7 +475,7 @@
 000a6a: 0000                                   |0035: nop // spacer
 000a6c: 0003 0400 0800 0000 0100 0000 0200 ... |0036: array-data (20 units)
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=7
         0x0003 line=8
         0x0007 line=9
@@ -486,7 +486,7 @@
         0x0021 line=14
         0x0028 line=15
         0x002b line=16
-      locals        : 
+      locals        :
 
     #1              : (in Lcom/google/android/test/Test;)
       name          : '<init>'
@@ -593,7 +593,7 @@
           <any> -> 0x00a6
         0x00a1 - 0x00a3
           <any> -> 0x00a6
-      positions     : 
+      positions     :
         0x0004 line=43
         0x0007 line=18
         0x000a line=19
@@ -636,9 +636,9 @@
         0x00ca line=36
         0x00d6 line=37
         0x00de line=38
-      locals        : 
-        0x00a0 - 0x00a6 reg=0 e Ljava/lang/Exception; 
-        0x0000 - 0x00ea reg=8 this Lcom/google/android/test/Test; 
+      locals        :
+        0x00a0 - 0x00a6 reg=0 e Ljava/lang/Exception;
+        0x0000 - 0x00ea reg=8 this Lcom/google/android/test/Test;
 
     #2              : (in Lcom/google/android/test/Test;)
       name          : 'add'
@@ -783,7 +783,7 @@
       catches       : 1
         0x0005 - 0x00e8
           <any> -> 0x00ec
-      positions     : 
+      positions     :
         0x0004 line=179
         0x0007 line=180
         0x000d line=181
@@ -803,10 +803,10 @@
         0x00e4 line=197
         0x00ea line=195
         0x00ec line=179
-      locals        : 
-        0x0000 - 0x00e8 reg=12 o Ljava/lang/Object; 
-        0x0000 - 0x00ef reg=11 this Lcom/google/android/test/Test; 
-        0x00ea - 0x00ef reg=12 o Ljava/lang/Object; 
+      locals        :
+        0x0000 - 0x00e8 reg=12 o Ljava/lang/Object;
+        0x0000 - 0x00ef reg=11 this Lcom/google/android/test/Test;
+        0x00ea - 0x00ef reg=12 o Ljava/lang/Object;
 
     #3              : (in Lcom/google/android/test/Test;)
       name          : 'adds'
@@ -886,7 +886,7 @@
 000f86: 6208 1e00                              |0073: sget-object v8, Lcom/google/android/test/Test;.sO:Ljava/lang/Object; // field@001e
 000f8a: 1108                                   |0075: return-object v8
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=201
         0x0002 line=202
         0x0008 line=203
@@ -899,8 +899,8 @@
         0x003f line=210
         0x0057 line=211
         0x0071 line=212
-      locals        : 
-        0x0000 - 0x0075 reg=8 o Ljava/lang/Object; 
+      locals        :
+        0x0000 - 0x0075 reg=8 o Ljava/lang/Object;
 
     #4              : (in Lcom/google/android/test/Test;)
       name          : 'copies'
@@ -1007,7 +1007,7 @@
 0010ec: 6802 1d00                              |00a8: sput-wide v2, Lcom/google/android/test/Test;.sL:J // field@001d
 0010f0: 0e00                                   |00aa: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=216
         0x0021 line=217
         0x0037 line=218
@@ -1022,10 +1022,10 @@
         0x0078 line=227
         0x007e line=228
         0x00aa line=229
-      locals        : 
-        0x0037 - 0x00ab reg=14 d D 
-        0x0021 - 0x00ab reg=16 x J 
-        0x0000 - 0x00ab reg=18 this Lcom/google/android/test/Test; 
+      locals        :
+        0x0037 - 0x00ab reg=14 d D
+        0x0021 - 0x00ab reg=16 x J
+        0x0000 - 0x00ab reg=18 this Lcom/google/android/test/Test;
 
     #5              : (in Lcom/google/android/test/Test;)
       name          : 'doit'
@@ -1071,7 +1071,7 @@
 00117c: 0001 0200 0000 0000 0900 0000 1b00 ... |003c: packed-switch-data (8 units)
 00118c: 0002 0200 2dfb ffff 0ba2 0700 0d00 ... |0044: sparse-switch-data (10 units)
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=98
         0x0002 line=99
         0x0007 line=101
@@ -1088,9 +1088,9 @@
         0x0035 line=111
         0x003b line=101
         0x0044 line=109
-      locals        : 
-        0x0000 - 0x004e reg=1 this Lcom/google/android/test/Test; 
-        0x0000 - 0x004e reg=2 x I 
+      locals        :
+        0x0000 - 0x004e reg=1 this Lcom/google/android/test/Test;
+        0x0000 - 0x004e reg=2 x I
 
     #6              : (in Lcom/google/android/test/Test;)
       name          : 'geta'
@@ -1143,7 +1143,7 @@
 00123e: 1200                                   |0047: const/4 v0, #int 0 // #0
 001240: 28c0                                   |0048: goto 0008 // -0040
       catches       : (none)
-      positions     : 
+      positions     :
         0x0002 line=72
         0x0008 line=81
         0x0009 line=73
@@ -1155,8 +1155,8 @@
         0x0037 line=79
         0x0041 line=80
         0x0047 line=81
-      locals        : 
-        0x0000 - 0x0049 reg=7 this Lcom/google/android/test/Test; 
+      locals        :
+        0x0000 - 0x0049 reg=7 this Lcom/google/android/test/Test;
 
     #7              : (in Lcom/google/android/test/Test;)
       name          : 'p'
@@ -1182,17 +1182,17 @@
 001274: d800 0001                              |0010: add-int/lit8 v0, v0, #int 1 // #01
 001278: 28f0                                   |0012: goto 0002 // -0010
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=120
         0x0001 line=121
         0x0007 line=124
         0x0008 line=122
         0x0010 line=121
-      locals        : 
-        0x0002 - 0x0013 reg=0 i I 
-        0x0001 - 0x0013 reg=1 y I 
-        0x0000 - 0x0013 reg=4 this Lcom/google/android/test/Test; 
-        0x0000 - 0x0013 reg=5 x I 
+      locals        :
+        0x0002 - 0x0013 reg=0 i I
+        0x0001 - 0x0013 reg=1 y I
+        0x0000 - 0x0013 reg=4 this Lcom/google/android/test/Test;
+        0x0000 - 0x0013 reg=5 x I
 
     #8              : (in Lcom/google/android/test/Test;)
       name          : 'params'
@@ -1363,7 +1363,7 @@
 0014e0: 0003 0400 0200 0000 0100 0000 0100 ... |012a: array-data (8 units)
 0014f0: 0003 0800 0200 0000 0100 0000 0000 ... |0132: array-data (12 units)
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=232
         0x000a line=233
         0x0012 line=235
@@ -1393,29 +1393,29 @@
         0x0115 line=254
         0x012a line=256
         0x0132 line=258
-      locals        : 
-        0x0025 - 0x0052 reg=4 aa [I 
-        0x0032 - 0x0052 reg=5 bb [J 
-        0x00d8 - 0x013e reg=6 d1 D 
-        0x00e2 - 0x013e reg=8 d2 D 
-        0x00ec - 0x013e reg=10 d3 D 
-        0x00f6 - 0x013e reg=12 d4 D 
-        0x0100 - 0x013e reg=14 d5 D 
-        0x00a6 - 0x013e reg=16 f1 F 
-        0x00b0 - 0x013e reg=17 f2 F 
-        0x00ba - 0x013e reg=18 f3 F 
-        0x00c4 - 0x013e reg=19 f4 F 
-        0x00ce - 0x013e reg=20 f5 F 
-        0x0000 - 0x013e reg=26 this Lcom/google/android/test/Test; 
-        0x0000 - 0x013e reg=27 b B 
-        0x0000 - 0x013e reg=28 c C 
-        0x0000 - 0x013e reg=29 s S 
-        0x0000 - 0x013e reg=30 i I 
-        0x0000 - 0x013e reg=31 l J 
-        0x0000 - 0x013e reg=33 f F 
-        0x0000 - 0x013e reg=34 d D 
-        0x0000 - 0x013e reg=36 o Ljava/lang/Object; 
-        0x0000 - 0x013e reg=37 a [I 
+      locals        :
+        0x0025 - 0x0052 reg=4 aa [I
+        0x0032 - 0x0052 reg=5 bb [J
+        0x00d8 - 0x013e reg=6 d1 D
+        0x00e2 - 0x013e reg=8 d2 D
+        0x00ec - 0x013e reg=10 d3 D
+        0x00f6 - 0x013e reg=12 d4 D
+        0x0100 - 0x013e reg=14 d5 D
+        0x00a6 - 0x013e reg=16 f1 F
+        0x00b0 - 0x013e reg=17 f2 F
+        0x00ba - 0x013e reg=18 f3 F
+        0x00c4 - 0x013e reg=19 f4 F
+        0x00ce - 0x013e reg=20 f5 F
+        0x0000 - 0x013e reg=26 this Lcom/google/android/test/Test;
+        0x0000 - 0x013e reg=27 b B
+        0x0000 - 0x013e reg=28 c C
+        0x0000 - 0x013e reg=29 s S
+        0x0000 - 0x013e reg=30 i I
+        0x0000 - 0x013e reg=31 l J
+        0x0000 - 0x013e reg=33 f F
+        0x0000 - 0x013e reg=34 d D
+        0x0000 - 0x013e reg=36 o Ljava/lang/Object;
+        0x0000 - 0x013e reg=37 a [I
 
     #9              : (in Lcom/google/android/test/Test;)
       name          : 'q'
@@ -1480,7 +1480,7 @@
 0015bc: 4b01 0006                              |0052: aput v1, v0, v6
 0015c0: 28c0                                   |0054: goto 0014 // -0040
       catches       : (none)
-      positions     : 
+      positions     :
         0x0003 line=127
         0x0007 line=128
         0x0014 line=136
@@ -1490,10 +1490,10 @@
         0x0030 line=132
         0x003c line=133
         0x0046 line=134
-      locals        : 
-        0x0000 - 0x0055 reg=7 this Lcom/google/android/test/Test; 
-        0x0000 - 0x0055 reg=8 x I 
-        0x0000 - 0x0055 reg=9 y I 
+      locals        :
+        0x0000 - 0x0055 reg=7 this Lcom/google/android/test/Test;
+        0x0000 - 0x0055 reg=8 x I
+        0x0000 - 0x0055 reg=9 y I
 
     #10              : (in Lcom/google/android/test/Test;)
       name          : 'r'
@@ -1566,7 +1566,7 @@
 00168a: b0ba                                   |005b: add-int/2addr v10, v11
 00168c: 0f0a                                   |005c: return v10
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=139
         0x0006 line=140
         0x0009 line=141
@@ -1596,19 +1596,19 @@
         0x0058 line=153
         0x0059 line=155
         0x005b line=153
-      locals        : 
-        0x000d - 0x005d reg=0 t1 I 
-        0x000f - 0x005d reg=1 t2 I 
-        0x0011 - 0x005d reg=2 t3 I 
-        0x0013 - 0x005d reg=3 t4 I 
-        0x0015 - 0x005d reg=4 t5 I 
-        0x0017 - 0x005d reg=5 t6 I 
-        0x0019 - 0x005d reg=6 t7 I 
-        0x001b - 0x005d reg=7 t8 I 
-        0x001d - 0x005d reg=8 t9 I 
-        0x000b - 0x005d reg=9 z I 
-        0x0000 - 0x005d reg=13 x I 
-        0x0000 - 0x005d reg=14 y I 
+      locals        :
+        0x000d - 0x005d reg=0 t1 I
+        0x000f - 0x005d reg=1 t2 I
+        0x0011 - 0x005d reg=2 t3 I
+        0x0013 - 0x005d reg=3 t4 I
+        0x0015 - 0x005d reg=4 t5 I
+        0x0017 - 0x005d reg=5 t6 I
+        0x0019 - 0x005d reg=6 t7 I
+        0x001b - 0x005d reg=7 t8 I
+        0x001d - 0x005d reg=8 t9 I
+        0x000b - 0x005d reg=9 z I
+        0x0000 - 0x005d reg=13 x I
+        0x0000 - 0x005d reg=14 y I
 
     #11              : (in Lcom/google/android/test/Test;)
       name          : 's'
@@ -1723,7 +1723,7 @@
 00181e: 9b16 1618                              |00bf: add-long v22, v22, v24
 001822: 1016                                   |00c1: return-wide v22
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=159
         0x000c line=160
         0x0021 line=161
@@ -1753,19 +1753,19 @@
         0x00b9 line=173
         0x00bb line=175
         0x00bf line=173
-      locals        : 
-        0x0027 - 0x00c2 reg=2 t1 J 
-        0x0029 - 0x00c2 reg=4 t2 J 
-        0x002b - 0x00c2 reg=6 t3 J 
-        0x002d - 0x00c2 reg=8 t4 J 
-        0x002f - 0x00c2 reg=10 t5 J 
-        0x0031 - 0x00c2 reg=12 t6 J 
-        0x0038 - 0x00c2 reg=14 t7 J 
-        0x003f - 0x00c2 reg=16 t8 J 
-        0x0046 - 0x00c2 reg=18 t9 J 
-        0x0025 - 0x00c2 reg=20 z J 
-        0x0000 - 0x00c2 reg=28 x J 
-        0x0000 - 0x00c2 reg=30 y J 
+      locals        :
+        0x0027 - 0x00c2 reg=2 t1 J
+        0x0029 - 0x00c2 reg=4 t2 J
+        0x002b - 0x00c2 reg=6 t3 J
+        0x002d - 0x00c2 reg=8 t4 J
+        0x002f - 0x00c2 reg=10 t5 J
+        0x0031 - 0x00c2 reg=12 t6 J
+        0x0038 - 0x00c2 reg=14 t7 J
+        0x003f - 0x00c2 reg=16 t8 J
+        0x0046 - 0x00c2 reg=18 t9 J
+        0x0025 - 0x00c2 reg=20 z J
+        0x0000 - 0x00c2 reg=28 x J
+        0x0000 - 0x00c2 reg=30 y J
 
     #12              : (in Lcom/google/android/test/Test;)
       name          : 'seta'
@@ -1805,7 +1805,7 @@
 00188e: 4d05 0004                              |002d: aput-object v5, v0, v4
 001892: 0e00                                   |002f: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0002 line=60
         0x0006 line=61
         0x000a line=62
@@ -1816,8 +1816,8 @@
         0x0025 line=67
         0x002b line=68
         0x002f line=69
-      locals        : 
-        0x0000 - 0x0030 reg=5 this Lcom/google/android/test/Test; 
+      locals        :
+        0x0000 - 0x0030 reg=5 this Lcom/google/android/test/Test;
 
   Virtual methods   -
     #0              : (in Lcom/google/android/test/Test;)
@@ -1836,12 +1836,12 @@
 0018ac: 5b10 0b00                              |0004: iput-object v0, v1, Lcom/google/android/test/Test;.mArray:[I // field@000b
 0018b0: 0e00                                   |0006: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=86
         0x0003 line=87
         0x0006 line=88
-      locals        : 
-        0x0000 - 0x0007 reg=1 this Lcom/google/android/test/Test; 
+      locals        :
+        0x0000 - 0x0007 reg=1 this Lcom/google/android/test/Test;
 
     #1              : (in Lcom/google/android/test/Test;)
       name          : 'run'
@@ -1860,14 +1860,14 @@
 0018d0: 6900 1600                              |0006: sput-object v0, Lcom/google/android/test/Test;.sArray:[I // field@0016
 0018d4: 0e00                                   |0008: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=92
         0x0004 line=93
         0x0006 line=94
         0x0008 line=95
-      locals        : 
-        0x0004 - 0x0009 reg=0 x [I 
-        0x0000 - 0x0009 reg=2 this Lcom/google/android/test/Test; 
+      locals        :
+        0x0004 - 0x0009 reg=0 x [I
+        0x0000 - 0x0009 reg=2 this Lcom/google/android/test/Test;
 
   source_file_idx   : 49 (Test.java)
 
diff --git a/test/dexdump/checkers.txt b/test/dexdump/checkers.txt
index 925c2af..2f757af 100644
--- a/test/dexdump/checkers.txt
+++ b/test/dexdump/checkers.txt
@@ -62,8 +62,8 @@
 00149c: 7010 0000 0000                         |0000: invoke-direct {v0}, Landroid/app/Activity;.<init>:()V // method@0000
 0014a2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'a'
@@ -92,8 +92,8 @@
 0014ee: 6e20 3b00 1000                         |001d: invoke-virtual {v0, v1}, Landroid/view/Window;.clearFlags:(I)V // method@003b
 0014f4: 28f0                                   |0020: goto 0010 // -0010
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/Checkers;)
@@ -110,8 +110,8 @@
 001508: 6f20 0100 1000                         |0000: invoke-super {v0, v1}, Landroid/app/Activity;.onConfigurationChanged:(Landroid/content/res/Configuration;)V // method@0001
 00150e: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onCreate'
@@ -155,8 +155,8 @@
 001590: d800 0001                              |0038: add-int/lit8 v0, v0, #int 1 // #01
 001594: 28dd                                   |003a: goto 0017 // -0023
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onCreateOptionsMenu'
@@ -275,8 +275,8 @@
 001750: 7252 2b00 5a10                         |00d4: invoke-interface {v10, v5, v0, v1, v2}, Landroid/view/Menu;.add:(IIILjava/lang/CharSequence;)Landroid/view/MenuItem; // method@002b
 001756: 0f04                                   |00d7: return v4
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onKeyDown'
@@ -314,8 +314,8 @@
 0017be: 28e2                                   |002b: goto 000d // -001e
 0017c0: 0001 0500 1300 0000 1a00 0000 2000 ... |002c: packed-switch-data (14 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onOptionsItemSelected'
@@ -407,8 +407,8 @@
 001912: 0000                                   |0093: nop // spacer
 001914: 0001 0300 0000 0000 0800 0000 3600 ... |0094: packed-switch-data (10 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onPause'
@@ -432,8 +432,8 @@
 00195a: 7210 1400 0000                         |0011: invoke-interface {v0}, Landroid/content/SharedPreferences$Editor;.commit:()Z // method@0014
 001960: 0e00                                   |0014: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #6              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onStop'
@@ -451,8 +451,8 @@
 00197c: 7110 ac00 0000                         |0004: invoke-static {v0}, Ljava/lang/System;.exit:(I)V // method@00ac
 001982: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #7              : (in Lcom/google/android/checkers/Checkers;)
       name          : 'onTrackballEvent'
@@ -485,8 +485,8 @@
 0019d6: 0000                                   |0021: nop // spacer
 0019d8: 0001 0300 0000 0000 0800 0000 0300 ... |0022: packed-switch-data (10 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -1003,8 +1003,8 @@
       catches       : 1
         0x00ef - 0x01c7
           Ljava/lang/Exception; -> 0x021e
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1034,8 +1034,8 @@
 001f80: d800 0001                              |001c: add-int/lit8 v0, v0, #int 1 // #01
 001f84: 28e3                                   |001e: goto 0001 // -001d
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1067,8 +1067,8 @@
 001fd4: d800 0001                              |001e: add-int/lit8 v0, v0, #int 1 // #01
 001fd8: 28e2                                   |0020: goto 0002 // -001e
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1125,8 +1125,8 @@
 002066: 0162                                   |003d: move v2, v6
 002068: 28e9                                   |003e: goto 0027 // -0017
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1190,8 +1190,8 @@
 002116: 6e5a 2000 2501                         |004d: invoke-virtual {v5, v2, v1, v0, v10}, Landroid/graphics/Canvas;.drawText:(Ljava/lang/String;FFLandroid/graphics/Paint;)V // method@0020
 00211c: 0e00                                   |0050: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1207,8 +1207,8 @@
 002130: 7020 5e00 1000                         |0000: invoke-direct {v0, v1}, Lcom/google/android/checkers/CheckersView;.b:(I)V // method@005e
 002136: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #6              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1398,8 +1398,8 @@
         0x0104 - 0x011c
           Ljava/lang/ClassCastException; -> 0x011c
           <any> -> 0x0123
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #7              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1422,8 +1422,8 @@
 0023e2: 0a00                                   |0009: move-result v0
 0023e4: 0f00                                   |000a: return v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #8              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -1807,8 +1807,8 @@
           <any> -> 0x0044
         0x004a - 0x027d
           <any> -> 0x0044
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #9              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'b'
@@ -1893,8 +1893,8 @@
           <any> -> 0x0057
         0x0030 - 0x0056
           <any> -> 0x0057
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #10              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'b'
@@ -1921,8 +1921,8 @@
       catches       : 1
         0x0001 - 0x000d
           <any> -> 0x000f
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #11              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'b'
@@ -2002,8 +2002,8 @@
 002b22: 0108                                   |0061: move v8, v0
 002b24: 28f1                                   |0062: goto 0053 // -000f
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #12              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'c'
@@ -2155,8 +2155,8 @@
 002d2e: 289b                                   |00fb: goto 0096 // -0065
 002d30: 0001 0300 0000 0000 1a00 0000 2400 ... |00fc: packed-switch-data (10 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #13              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'd'
@@ -2207,8 +2207,8 @@
 002de2: 28c4                                   |0047: goto 000b // -003c
 002de4: 0001 0600 0100 0000 0400 0000 1000 ... |0048: packed-switch-data (16 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #14              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'e'
@@ -2229,8 +2229,8 @@
 002e24: 1200                                   |0008: const/4 v0, #int 0 // #0
 002e26: 28fe                                   |0009: goto 0007 // -0002
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/CheckersView;)
@@ -2280,8 +2280,8 @@
 002eb0: 6e10 1000 0000                         |003c: invoke-virtual {v0}, Landroid/app/AlertDialog$Builder;.show:()Landroid/app/AlertDialog; // method@0010
 002eb6: 0e00                                   |003f: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -2370,8 +2370,8 @@
           <any> -> 0x0061
         0x0064 - 0x0070
           <any> -> 0x0061
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -2396,8 +2396,8 @@
 002ff0: 6e10 6d00 0600                         |000c: invoke-virtual {v6}, Lcom/google/android/checkers/CheckersView;.postInvalidate:()V // method@006d
 002ff6: 0e00                                   |000f: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -2489,8 +2489,8 @@
       catches       : 1
         0x0001 - 0x00a5
           <any> -> 0x00a7
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -2516,8 +2516,8 @@
 003196: 1211                                   |000f: const/4 v1, #int 1 // #1
 003198: 0f01                                   |0010: return v1
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'a'
@@ -2548,8 +2548,8 @@
       catches       : 1
         0x0003 - 0x000f
           <any> -> 0x0013
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #6              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'b'
@@ -2585,8 +2585,8 @@
       catches       : 1
         0x0002 - 0x000b
           <any> -> 0x001b
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #7              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'b'
@@ -2646,8 +2646,8 @@
       catches       : 1
         0x0006 - 0x003a
           <any> -> 0x0042
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #8              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'c'
@@ -2670,8 +2670,8 @@
       catches       : 1
         0x0001 - 0x0003
           <any> -> 0x0005
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #9              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'c'
@@ -2708,8 +2708,8 @@
       catches       : 1
         0x0004 - 0x001b
           <any> -> 0x001f
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #10              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'd'
@@ -2739,8 +2739,8 @@
       catches       : 1
         0x0003 - 0x000c
           <any> -> 0x0010
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #11              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'draw'
@@ -3447,8 +3447,8 @@
           <any> -> 0x02af
         0x02b2 - 0x04db
           <any> -> 0x02af
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #12              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'e'
@@ -3478,8 +3478,8 @@
       catches       : 1
         0x0003 - 0x000c
           <any> -> 0x0010
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #13              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'onSizeChanged'
@@ -3526,8 +3526,8 @@
       catches       : 1
         0x0004 - 0x002b
           <any> -> 0x002f
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #14              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'onTouchEvent'
@@ -3565,8 +3565,8 @@
 003ee6: 0a00                                   |0027: move-result v0
 003ee8: 28fb                                   |0028: goto 0023 // -0005
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #15              : (in Lcom/google/android/checkers/CheckersView;)
       name          : 'setLevel'
@@ -3612,8 +3612,8 @@
       catches       : 1
         0x0007 - 0x000d
           <any> -> 0x0026
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -4391,8 +4391,8 @@
 004866: 0000                                   |0467: nop // spacer
 004868: 0003 0400 8100 0000 6745 68ba ff5c ... |0468: array-data (262 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/a;)
       name          : '<init>'
@@ -4456,8 +4456,8 @@
       catches       : 1
         0x0030 - 0x0040
           Ljava/lang/Exception; -> 0x0056
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -4481,8 +4481,8 @@
 004b74: 1200                                   |000c: const/4 v0, #int 0 // #0
 004b76: 28f8                                   |000d: goto 0005 // -0008
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5183,8 +5183,8 @@
 005584: 0001 0200 0000 0000 b402 0000 ba02 ... |04fe: packed-switch-data (8 units)
 005594: 0001 0300 0100 0000 9402 0000 9802 ... |0506: packed-switch-data (10 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5231,8 +5231,8 @@
 005622: 0110                                   |0035: move v0, v1
 005624: 28f0                                   |0036: goto 0026 // -0010
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5304,8 +5304,8 @@
 0056f8: b520                                   |0060: and-int/2addr v0, v2
 0056fa: 28b3                                   |0061: goto 0014 // -004d
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #6              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5351,8 +5351,8 @@
 005776: 4800 0200                              |0035: aget-byte v0, v2, v0
 00577a: 28f2                                   |0037: goto 0029 // -000e
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #7              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5391,8 +5391,8 @@
 0057de: 4800 0300                              |0029: aget-byte v0, v3, v0
 0057e2: 28f5                                   |002b: goto 0020 // -000b
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #8              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5425,8 +5425,8 @@
 005832: 4800 0200                              |001f: aget-byte v0, v2, v0
 005836: 28f8                                   |0021: goto 0019 // -0008
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #9              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5477,8 +5477,8 @@
 0058b8: 0002 0200 4000 0000 c000 0000 0600 ... |0038: sparse-switch-data (10 units)
 0058cc: 0002 0200 8000 0000 c000 0000 0400 ... |0042: sparse-switch-data (10 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #10              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5513,8 +5513,8 @@
 005938: 4b09 0100                              |0024: aput v9, v1, v0
 00593c: 28e0                                   |0026: goto 0006 // -0020
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #11              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -5586,8 +5586,8 @@
 005a0e: 7606 7e00 0000                         |005f: invoke-direct/range {v0, v1, v2, v3, v4, v5}, Lcom/google/android/checkers/a;.a:(IIIII)V // method@007e
 005a14: 0e00                                   |0062: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #12              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -6057,8 +6057,8 @@
 0060f8: 1201                                   |0368: const/4 v1, #int 0 // #0
 0060fa: 2900 19fd                              |0369: goto/16 0082 // -02e7
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #13              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -6098,8 +6098,8 @@
 006166: 4800 0300                              |002b: aget-byte v0, v3, v0
 00616a: 28f5                                   |002d: goto 0022 // -000b
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #14              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -6145,8 +6145,8 @@
 0061e6: 4800 0200                              |0035: aget-byte v0, v2, v0
 0061ea: 28f2                                   |0037: goto 0029 // -000e
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #15              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -6179,8 +6179,8 @@
         0x000a - 0x000d
           Ljava/lang/InterruptedException; -> 0x000e
           <any> -> 0x0010
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #16              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -6389,8 +6389,8 @@
 006506: 0000                                   |015d: nop // spacer
 006508: 0002 0400 0001 0000 0002 0000 0004 ... |015e: sparse-switch-data (18 units)
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #17              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -6462,8 +6462,8 @@
 0065fa: 7606 7e00 0000                         |005f: invoke-direct/range {v0, v1, v2, v3, v4, v5}, Lcom/google/android/checkers/a;.a:(IIIII)V // method@007e
 006600: 0e00                                   |0062: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #18              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -6741,8 +6741,8 @@
 0069a8: 1200                                   |01ca: const/4 v0, #int 0 // #0
 0069aa: 2900 5efe                              |01cb: goto/16 0029 // -01a2
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #19              : (in Lcom/google/android/checkers/a;)
       name          : 'c'
@@ -6787,8 +6787,8 @@
 006a26: 4800 0200                              |0033: aget-byte v0, v2, v0
 006a2a: 28f2                                   |0035: goto 0027 // -000e
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #20              : (in Lcom/google/android/checkers/a;)
       name          : 'c'
@@ -6809,8 +6809,8 @@
       catches       : 1
         0x0002 - 0x0005
           Ljava/lang/InterruptedException; -> 0x0006
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #21              : (in Lcom/google/android/checkers/a;)
       name          : 'c'
@@ -6938,8 +6938,8 @@
 006bf6: 7606 7e00 0000                         |00c7: invoke-direct/range {v0, v1, v2, v3, v4, v5}, Lcom/google/android/checkers/a;.a:(IIIII)V // method@007e
 006bfc: 0e00                                   |00ca: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #22              : (in Lcom/google/android/checkers/a;)
       name          : 'd'
@@ -6985,8 +6985,8 @@
 006c7a: 4800 0200                              |0035: aget-byte v0, v2, v0
 006c7e: 28f2                                   |0037: goto 0029 // -000e
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/a;)
@@ -7006,8 +7006,8 @@
 006c9c: 0a00                                   |0006: move-result v0
 006c9e: 0f00                                   |0007: return v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #1              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -7045,8 +7045,8 @@
 006d04: d800 0001                              |002a: add-int/lit8 v0, v0, #int 1 // #01
 006d08: 28f5                                   |002c: goto 0021 // -000b
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #2              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -7062,8 +7062,8 @@
 006d1c: 7020 8500 1000                         |0000: invoke-direct {v0, v1}, Lcom/google/android/checkers/a;.b:(I)V // method@0085
 006d22: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #3              : (in Lcom/google/android/checkers/a;)
       name          : 'a'
@@ -7097,8 +7097,8 @@
 006d78: 5920 5100                              |0022: iput v0, v2, Lcom/google/android/checkers/a;.x:I // field@0051
 006d7c: 0e00                                   |0024: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lcom/google/android/checkers/a;)
       name          : 'b'
@@ -7125,8 +7125,8 @@
       catches       : 1
         0x0001 - 0x000b
           <any> -> 0x000d
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lcom/google/android/checkers/a;)
       name          : 'run'
@@ -7429,8 +7429,8 @@
 0071e2: 01d5                                   |020b: move v5, v13
 0071e4: 2900 2cff                              |020c: goto/16 0138 // -00d4
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -7475,8 +7475,8 @@
 0071fc: 7010 a000 0000                         |0002: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00a0
 007202: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/b;)
@@ -7498,8 +7498,8 @@
 007228: 6e10 6d00 0000                         |000a: invoke-virtual {v0}, Lcom/google/android/checkers/CheckersView;.postInvalidate:()V // method@006d
 00722e: 0e00                                   |000d: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -7544,8 +7544,8 @@
 007244: 7010 a000 0000                         |0002: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00a0
 00724a: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/c;)
@@ -7561,8 +7561,8 @@
 00724c:                                        |[00724c] com.google.android.checkers.c.onClick:(Landroid/content/DialogInterface;I)V
 00725c: 0e00                                   |0000: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -7607,8 +7607,8 @@
 007274: 7010 a000 0000                         |0002: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00a0
 00727a: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/d;)
@@ -7624,8 +7624,8 @@
 00727c:                                        |[00727c] com.google.android.checkers.d.onClick:(Landroid/content/DialogInterface;I)V
 00728c: 0e00                                   |0000: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -7670,8 +7670,8 @@
 0072a4: 7010 a000 0000                         |0002: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00a0
 0072aa: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/e;)
@@ -7690,8 +7690,8 @@
 0072c2: 6e20 6800 1000                         |0003: invoke-virtual {v0, v1}, Lcom/google/android/checkers/CheckersView;.e:(Z)Z // method@0068
 0072c8: 0e00                                   |0006: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -7736,8 +7736,8 @@
 0072e0: 7010 a000 0000                         |0002: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00a0
 0072e6: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
     #0              : (in Lcom/google/android/checkers/f;)
@@ -7755,8 +7755,8 @@
 0072fc: 7120 5600 3000                         |0002: invoke-static {v0, v3}, Lcom/google/android/checkers/CheckersView;.a:(Lcom/google/android/checkers/CheckersView;I)V // method@0056
 007302: 0e00                                   |0005: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   source_file_idx   : -1 (unknown)
 
@@ -7887,8 +7887,8 @@
 007348: d800 0001                              |001a: add-int/lit8 v0, v0, #int 1 // #01
 00734c: 28e6                                   |001c: goto 0002 // -001a
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
   source_file_idx   : -1 (unknown)
diff --git a/test/dexdump/const-method-handle.txt b/test/dexdump/const-method-handle.txt
index 12020e1..d834ce0 100644
--- a/test/dexdump/const-method-handle.txt
+++ b/test/dexdump/const-method-handle.txt
@@ -62,10 +62,10 @@
 0003c0: 7010 0a00 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@000a
 0003c6: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=22
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LMain; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LMain;
 
     #1              : (in LMain;)
       name          : 'main'
@@ -91,13 +91,13 @@
 000400: fa20 1200 5000 1000                    |0014: invoke-polymorphic {v0, v5}, Ljava/lang/invoke/MethodHandle;.invokeExact:([Ljava/lang/Object;)Ljava/lang/Object;, ([Ljava/lang/String;)V // method@0012, proto@0010
 000408: 0e00                                   |0018: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=26
         0x000c line=27
         0x0014 line=28
         0x0018 line=29
-      locals        : 
-        0x0000 - 0x0019 reg=5 (null) [Ljava/lang/String; 
+      locals        :
+        0x0000 - 0x0019 reg=5 (null) [Ljava/lang/String;
 
   Virtual methods   -
   source_file_idx   : 29 (Main.java)
@@ -141,10 +141,10 @@
 00041c: 7010 0a00 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@000a
 000422: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=22
-      locals        : 
-        0x0000 - 0x0004 reg=0 this Lconstmethodhandle/ConstTest; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this Lconstmethodhandle/ConstTest;
 
     #1              : (in Lconstmethodhandle/ConstTest;)
       name          : 'displayMethodHandle'
@@ -180,13 +180,13 @@
 00048a: 6e20 0800 1000                         |002b: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@0008
 000490: 0e00                                   |002e: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=24
         0x001a line=25
         0x002b line=24
         0x002e line=26
-      locals        : 
-        0x0000 - 0x002f reg=3 (null) Ljava/lang/invoke/MethodHandle; 
+      locals        :
+        0x0000 - 0x002f reg=3 (null) Ljava/lang/invoke/MethodHandle;
 
     #2              : (in Lconstmethodhandle/ConstTest;)
       name          : 'displayMethodType'
@@ -212,11 +212,11 @@
 0004ce: 6e20 0800 1000                         |0015: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@0008
 0004d4: 0e00                                   |0018: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=29
         0x0018 line=30
-      locals        : 
-        0x0000 - 0x0019 reg=3 (null) Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x0019 reg=3 (null) Ljava/lang/invoke/MethodType;
 
     #3              : (in Lconstmethodhandle/ConstTest;)
       name          : 'main'
@@ -237,8 +237,8 @@
 0004fe: 7110 0400 0000                         |000b: invoke-static {v0}, Lconstmethodhandle/ConstTest;.displayMethodType:(Ljava/lang/invoke/MethodType;)V // method@0004
 000504: 0e00                                   |000e: return-void
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #4              : (in Lconstmethodhandle/ConstTest;)
       name          : 'test1'
@@ -254,8 +254,8 @@
 000518: fe00 0000                              |0000: const-method-handle v0, method_handle@0000
 00051c: 1100                                   |0002: return-object v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
     #5              : (in Lconstmethodhandle/ConstTest;)
       name          : 'test2'
@@ -271,8 +271,8 @@
 000530: ff00 1100                              |0000: const-method-type v0, (CSIJFDLjava/lang/Object;)Z // proto@0011
 000534: 1100                                   |0002: return-object v0
       catches       : (none)
-      positions     : 
-      locals        : 
+      positions     :
+      locals        :
 
   Virtual methods   -
   source_file_idx   : 3 (ConstTest.java)
diff --git a/test/dexdump/invoke-custom.txt b/test/dexdump/invoke-custom.txt
index 989f119..a24292e 100644
--- a/test/dexdump/invoke-custom.txt
+++ b/test/dexdump/invoke-custom.txt
@@ -63,12 +63,12 @@
 001b28: 7020 d200 1000                         |0000: invoke-direct {v0, v1}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 001b2e: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=449
         0x0003 line=450
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestBadBootstrapArguments$TestersConstantCallSite; 
-        0x0000 - 0x0004 reg=1 mh Ljava/lang/invoke/MethodHandle; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestBadBootstrapArguments$TestersConstantCallSite;
+        0x0000 - 0x0004 reg=1 mh Ljava/lang/invoke/MethodHandle;
 
   Virtual methods   -
   source_file_idx   : 144 (TestBadBootstrapArguments.java)
@@ -108,10 +108,10 @@
 002554: 7010 bf00 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00bf
 00255a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=19
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestBase; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestBase;
 
     #1              : (in LTestBase;)
       name          : 'assertEquals'
@@ -140,13 +140,13 @@
 0025a8: 7020 b500 1000                         |001e: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 0025ae: 2700                                   |0021: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
         0x0002 line=28
         0x0003 line=30
-      locals        : 
-        0x0000 - 0x0022 reg=3 b1 B 
-        0x0000 - 0x0022 reg=4 b2 B 
+      locals        :
+        0x0000 - 0x0022 reg=3 b1 B
+        0x0000 - 0x0022 reg=4 b2 B
 
     #2              : (in LTestBase;)
       name          : 'assertEquals'
@@ -175,13 +175,13 @@
 0025fc: 7020 b500 1000                         |001e: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 002602: 2700                                   |0021: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=34
         0x0002 line=35
         0x0003 line=37
-      locals        : 
-        0x0000 - 0x0022 reg=3 c1 C 
-        0x0000 - 0x0022 reg=4 c2 C 
+      locals        :
+        0x0000 - 0x0022 reg=3 c1 C
+        0x0000 - 0x0022 reg=4 c2 C
 
     #3              : (in LTestBase;)
       name          : 'assertEquals'
@@ -211,13 +211,13 @@
 002654: 7020 b500 1000                         |0020: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 00265a: 2700                                   |0023: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=69
         0x0004 line=70
         0x0005 line=72
-      locals        : 
-        0x0000 - 0x0024 reg=3 d1 D 
-        0x0000 - 0x0024 reg=5 d2 D 
+      locals        :
+        0x0000 - 0x0024 reg=3 d1 D
+        0x0000 - 0x0024 reg=5 d2 D
 
     #4              : (in LTestBase;)
       name          : 'assertEquals'
@@ -247,13 +247,13 @@
 0026ac: 7020 b500 1000                         |0020: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 0026b2: 2700                                   |0023: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=62
         0x0004 line=63
         0x0005 line=65
-      locals        : 
-        0x0000 - 0x0024 reg=3 f1 F 
-        0x0000 - 0x0024 reg=4 f2 F 
+      locals        :
+        0x0000 - 0x0024 reg=3 f1 F
+        0x0000 - 0x0024 reg=4 f2 F
 
     #5              : (in LTestBase;)
       name          : 'assertEquals'
@@ -282,13 +282,13 @@
 002700: 7020 b500 1000                         |001e: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 002706: 2700                                   |0021: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=48
         0x0002 line=49
         0x0003 line=51
-      locals        : 
-        0x0000 - 0x0022 reg=3 i1 I 
-        0x0000 - 0x0022 reg=4 i2 I 
+      locals        :
+        0x0000 - 0x0022 reg=3 i1 I
+        0x0000 - 0x0022 reg=4 i2 I
 
     #6              : (in LTestBase;)
       name          : 'assertEquals'
@@ -318,13 +318,13 @@
 0027b4: 7020 b500 1000                         |0020: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 0027ba: 2700                                   |0023: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=55
         0x0004 line=56
         0x0005 line=58
-      locals        : 
-        0x0000 - 0x0024 reg=3 l1 J 
-        0x0000 - 0x0024 reg=5 l2 J 
+      locals        :
+        0x0000 - 0x0024 reg=3 l1 J
+        0x0000 - 0x0024 reg=5 l2 J
 
     #7              : (in LTestBase;)
       name          : 'assertEquals'
@@ -355,13 +355,13 @@
 00275c: 7020 b500 1000                         |0022: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 002762: 2700                                   |0025: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=76
         0x0006 line=79
         0x0007 line=77
-      locals        : 
-        0x0000 - 0x0026 reg=3 o Ljava/lang/Object; 
-        0x0000 - 0x0026 reg=4 p Ljava/lang/Object; 
+      locals        :
+        0x0000 - 0x0026 reg=3 o Ljava/lang/Object;
+        0x0000 - 0x0026 reg=4 p Ljava/lang/Object;
 
     #8              : (in LTestBase;)
       name          : 'assertEquals'
@@ -390,13 +390,13 @@
 002808: 7020 b500 1000                         |001e: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 00280e: 2700                                   |0021: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=41
         0x0002 line=42
         0x0003 line=44
-      locals        : 
-        0x0000 - 0x0022 reg=3 s1 S 
-        0x0000 - 0x0022 reg=4 s2 S 
+      locals        :
+        0x0000 - 0x0022 reg=3 s1 S
+        0x0000 - 0x0022 reg=4 s2 S
 
     #9              : (in LTestBase;)
       name          : 'assertNotEquals'
@@ -427,13 +427,13 @@
 002864: 7020 b500 1000                         |0022: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 00286a: 2700                                   |0025: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=82
         0x0006 line=85
         0x0007 line=83
-      locals        : 
-        0x0000 - 0x0026 reg=3 o Ljava/lang/Object; 
-        0x0000 - 0x0026 reg=4 p Ljava/lang/Object; 
+      locals        :
+        0x0000 - 0x0026 reg=3 o Ljava/lang/Object;
+        0x0000 - 0x0026 reg=4 p Ljava/lang/Object;
 
     #10              : (in LTestBase;)
       name          : 'assertNotReached'
@@ -451,9 +451,9 @@
 002884: 7020 b500 1000                         |0004: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 00288a: 2700                                   |0007: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=88
-      locals        : 
+      locals        :
 
     #11              : (in LTestBase;)
       name          : 'assertTrue'
@@ -479,12 +479,12 @@
 0028c8: 7020 b500 1000                         |0016: invoke-direct {v0, v1}, Ljava/lang/AssertionError;.<init>:(Ljava/lang/Object;)V // method@00b5
 0028ce: 2700                                   |0019: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=21
         0x0002 line=24
         0x0003 line=22
-      locals        : 
-        0x0000 - 0x001a reg=3 value Z 
+      locals        :
+        0x0000 - 0x001a reg=3 value Z
 
     #12              : (in LTestBase;)
       name          : 'fail'
@@ -503,11 +503,11 @@
 0028ee: 7100 cc00 0000                         |0007: invoke-static {}, Ljava/lang/Thread;.dumpStack:()V // method@00cc
 0028f4: 0e00                                   |000a: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=92
         0x0007 line=93
         0x000a line=94
-      locals        : 
+      locals        :
 
   Virtual methods   -
   source_file_idx   : 145 (TestBase.java)
@@ -556,11 +556,11 @@
 002acc: 7010 bf00 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00bf
 002ad2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=177
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestInvocationKinds$Widget; 
-        0x0000 - 0x0004 reg=1 value I 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestInvocationKinds$Widget;
+        0x0000 - 0x0004 reg=1 value I
 
   Virtual methods   -
   source_file_idx   : 148 (TestInvocationKinds.java)
@@ -606,10 +606,10 @@
 002ef8: 7010 cf00 0000                         |0000: invoke-direct {v0}, Ljava/lang/ThreadLocal;.<init>:()V // method@00cf
 002efe: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=33
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestInvokeCustomWithConcurrentThreads$1; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestInvokeCustomWithConcurrentThreads$1;
 
   Virtual methods   -
     #0              : (in LTestInvokeCustomWithConcurrentThreads$1;)
@@ -631,10 +631,10 @@
 002ec6: 0c00                                   |000b: move-result-object v0
 002ec8: 1100                                   |000c: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=36
-      locals        : 
-        0x0000 - 0x000d reg=1 this LTestInvokeCustomWithConcurrentThreads$1; 
+      locals        :
+        0x0000 - 0x000d reg=1 this LTestInvokeCustomWithConcurrentThreads$1;
 
     #1              : (in LTestInvokeCustomWithConcurrentThreads$1;)
       name          : 'initialValue'
@@ -651,10 +651,10 @@
 002ee2: 0c00                                   |0003: move-result-object v0
 002ee4: 1100                                   |0004: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=33
-      locals        : 
-        0x0000 - 0x0005 reg=1 this LTestInvokeCustomWithConcurrentThreads$1; 
+      locals        :
+        0x0000 - 0x0005 reg=1 this LTestInvokeCustomWithConcurrentThreads$1;
 
   source_file_idx   : 149 (TestInvokeCustomWithConcurrentThreads.java)
 
@@ -698,10 +698,10 @@
 003fd8: 7010 bf00 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00bf
 003fde: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=23
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LUnrelatedBSM; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LUnrelatedBSM;
 
     #1              : (in LUnrelatedBSM;)
       name          : 'bsm'
@@ -720,15 +720,15 @@
 003fc0: 7020 d200 0100                         |0006: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003fc6: 1101                                   |0009: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
         0x0004 line=28
-      locals        : 
-        0x0000 - 0x0000 reg=5 (null) Ljava/lang/Class; 
-        0x0004 - 0x000a reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x000a reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x000a reg=3 name Ljava/lang/String; 
-        0x0000 - 0x000a reg=4 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x0000 reg=5 (null) Ljava/lang/Class;
+        0x0004 - 0x000a reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x000a reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x000a reg=3 name Ljava/lang/String;
+        0x0000 - 0x000a reg=4 methodType Ljava/lang/invoke/MethodType;
         0x0000 - 0x000a reg=5 target Ljava/lang/Class; Ljava/lang/Class<*>;
 
   Virtual methods   -
@@ -779,10 +779,10 @@
 001910: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 001916: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=21
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LMain; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LMain;
 
     #1              : (in LMain;)
       name          : 'TestLinkerMethodMinimalArguments'
@@ -836,7 +836,7 @@
           Ljava/lang/BootstrapMethodError; -> 0x0022
         0x0033 - 0x0039
           Ljava/lang/ArithmeticException; -> 0x003a
-      positions     : 
+      positions     :
         0x0000 line=49
         0x0006 line=53
         0x0009 line=56
@@ -853,9 +853,9 @@
         0x003a line=70
         0x003b line=73
         0x0041 line=75
-      locals        : 
-        0x000b - 0x0018 reg=0 e Ljava/lang/BootstrapMethodError; 
-        0x0023 - 0x0030 reg=0 e Ljava/lang/BootstrapMethodError; 
+      locals        :
+        0x000b - 0x0018 reg=0 e Ljava/lang/BootstrapMethodError;
+        0x0023 - 0x0030 reg=0 e Ljava/lang/BootstrapMethodError;
 
     #2              : (in LMain;)
       name          : 'TestLinkerMethodMultipleArgumentTypes'
@@ -879,12 +879,12 @@
 001a04: 7120 8400 1000                         |0012: invoke-static {v0, v1}, LTestLinkerMethodMultipleArgumentTypes;.test:(II)V // method@0084
 001a0a: 0e00                                   |0015: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=42
         0x0007 line=43
         0x000e line=44
         0x0015 line=45
-      locals        : 
+      locals        :
 
     #3              : (in LMain;)
       name          : 'TestUninitializedCallSite'
@@ -940,7 +940,7 @@
           Ljava/lang/IllegalStateException; -> 0x0017
         0x0035 - 0x0044
           Ljava/lang/IllegalStateException; -> 0x0045
-      positions     : 
+      positions     :
         0x0000 line=24
         0x000b line=26
         0x0013 line=27
@@ -954,10 +954,10 @@
         0x0045 line=36
         0x0046 line=37
         0x004d line=39
-      locals        : 
-        0x0018 - 0x001f reg=1 e Ljava/lang/IllegalStateException; 
-        0x0046 - 0x004d reg=1 e Ljava/lang/IllegalStateException; 
-        0x000b - 0x004e reg=0 callSite Ljava/lang/invoke/CallSite; 
+      locals        :
+        0x0018 - 0x001f reg=1 e Ljava/lang/IllegalStateException;
+        0x0046 - 0x004d reg=1 e Ljava/lang/IllegalStateException;
+        0x000b - 0x004e reg=0 callSite Ljava/lang/invoke/CallSite;
 
     #4              : (in LMain;)
       name          : 'main'
@@ -981,7 +981,7 @@
 001b10: 7100 a800 0000                         |0018: invoke-static {}, LTestVariableArityLinkerMethod;.test:()V // method@00a8
 001b16: 0e00                                   |001b: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=78
         0x0003 line=79
         0x0006 line=80
@@ -992,8 +992,8 @@
         0x0015 line=85
         0x0018 line=86
         0x001b line=87
-      locals        : 
-        0x0000 - 0x001c reg=0 args [Ljava/lang/String; 
+      locals        :
+        0x0000 - 0x001c reg=0 args [Ljava/lang/String;
 
   Virtual methods   -
   source_file_idx   : 136 (Main.java)
@@ -1077,10 +1077,10 @@
 001d74: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 001d7a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestBadBootstrapArguments; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestBadBootstrapArguments;
 
     #1              : (in LTestBadBootstrapArguments;)
       name          : 'boxingArguments'
@@ -1098,10 +1098,10 @@
 001d94: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001d9a: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=348
         0x0007 line=349
-      locals        : 
+      locals        :
 
     #2              : (in LTestBadBootstrapArguments;)
       name          : 'bsm'
@@ -1152,7 +1152,7 @@
 001c66: 7020 d200 0100                         |0051: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 001c6c: 1101                                   |0054: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=35
         0x0007 line=36
         0x0010 line=37
@@ -1166,13 +1166,13 @@
         0x0040 line=45
         0x0047 line=46
         0x004f line=47
-      locals        : 
-        0x004f - 0x0055 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0055 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0055 reg=3 methodName Ljava/lang/String; 
-        0x0000 - 0x0055 reg=4 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0055 reg=5 extraInt I 
-        0x0000 - 0x0055 reg=6 extraString Ljava/lang/String; 
+      locals        :
+        0x004f - 0x0055 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0055 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0055 reg=3 methodName Ljava/lang/String;
+        0x0000 - 0x0055 reg=4 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0055 reg=5 extraInt I
+        0x0000 - 0x0055 reg=6 extraString Ljava/lang/String;
 
     #3              : (in LTestBadBootstrapArguments;)
       name          : 'bsmDJ'
@@ -1206,7 +1206,7 @@
 001cd2: 7020 d200 0100                         |0029: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 001cd8: 1101                                   |002c: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=270
         0x0007 line=271
         0x000c line=272
@@ -1214,13 +1214,13 @@
         0x0018 line=274
         0x001f line=275
         0x0027 line=276
-      locals        : 
-        0x0027 - 0x002d reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x002d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x002d reg=3 methodName Ljava/lang/String; 
-        0x0000 - 0x002d reg=4 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x002d reg=5 extraArg0 D 
-        0x0000 - 0x002d reg=7 extraArg1 J 
+      locals        :
+        0x0027 - 0x002d reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x002d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x002d reg=3 methodName Ljava/lang/String;
+        0x0000 - 0x002d reg=4 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x002d reg=5 extraArg0 D
+        0x0000 - 0x002d reg=7 extraArg1 J
 
     #4              : (in LTestBadBootstrapArguments;)
       name          : 'bsmDoubleLong'
@@ -1254,7 +1254,7 @@
 001d3e: 7020 d200 0100                         |0029: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 001d44: 1101                                   |002c: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=314
         0x0007 line=315
         0x000c line=316
@@ -1262,13 +1262,13 @@
         0x0018 line=318
         0x001f line=319
         0x0027 line=320
-      locals        : 
-        0x0027 - 0x002d reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x002d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x002d reg=3 methodName Ljava/lang/String; 
-        0x0000 - 0x002d reg=4 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x002d reg=5 extraArg0 Ljava/lang/Double; 
-        0x0000 - 0x002d reg=6 extraArg1 Ljava/lang/Long; 
+      locals        :
+        0x0027 - 0x002d reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x002d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x002d reg=3 methodName Ljava/lang/String;
+        0x0000 - 0x002d reg=4 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x002d reg=5 extraArg0 Ljava/lang/Double;
+        0x0000 - 0x002d reg=6 extraArg1 Ljava/lang/Long;
 
     #5              : (in LTestBadBootstrapArguments;)
       name          : 'bsmReturningInteger'
@@ -1289,13 +1289,13 @@
 001b82: 0c00                                   |000b: move-result-object v0
 001b84: 1100                                   |000c: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=425
         0x0007 line=426
-      locals        : 
-        0x0000 - 0x000d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x000d reg=3 name Ljava/lang/String; 
-        0x0000 - 0x000d reg=4 type Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x000d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x000d reg=3 name Ljava/lang/String;
+        0x0000 - 0x000d reg=4 type Ljava/lang/invoke/MethodType;
 
     #6              : (in LTestBadBootstrapArguments;)
       name          : 'bsmReturningObject'
@@ -1315,13 +1315,13 @@
 001baa: 7010 bf00 0000                         |0009: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@00bf
 001bb0: 1100                                   |000c: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=402
         0x0007 line=403
-      locals        : 
-        0x0000 - 0x000d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x000d reg=3 name Ljava/lang/String; 
-        0x0000 - 0x000d reg=4 type Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x000d reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x000d reg=3 name Ljava/lang/String;
+        0x0000 - 0x000d reg=4 type Ljava/lang/invoke/MethodType;
 
     #7              : (in LTestBadBootstrapArguments;)
       name          : 'bsmReturningTestersConstantCallsite'
@@ -1342,12 +1342,12 @@
 001b54: 7020 0800 1000                         |000a: invoke-direct {v0, v1}, LTestBadBootstrapArguments$TestersConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@0008
 001b5a: 1100                                   |000d: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=455
-      locals        : 
-        0x0000 - 0x000e reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x000e reg=3 name Ljava/lang/String; 
-        0x0000 - 0x000e reg=4 type Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x000e reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x000e reg=3 name Ljava/lang/String;
+        0x0000 - 0x000e reg=4 type Ljava/lang/invoke/MethodType;
 
     #8              : (in LTestBadBootstrapArguments;)
       name          : 'bsmReturningVoid'
@@ -1365,13 +1365,13 @@
 001db4: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001dba: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=380
         0x0007 line=381
-      locals        : 
-        0x0000 - 0x0008 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0008 reg=3 name Ljava/lang/String; 
-        0x0000 - 0x0008 reg=4 type Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x0008 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0008 reg=3 name Ljava/lang/String;
+        0x0000 - 0x0008 reg=4 type Ljava/lang/invoke/MethodType;
 
     #9              : (in LTestBadBootstrapArguments;)
       name          : 'bsmZBCS'
@@ -1388,17 +1388,17 @@
 001d5e: 1200                                   |0003: const/4 v0, #int 0 // #0
 001d60: 1100                                   |0004: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=227
         0x0003 line=228
-      locals        : 
-        0x0000 - 0x0005 reg=1 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0005 reg=2 methodName Ljava/lang/String; 
-        0x0000 - 0x0005 reg=3 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0005 reg=4 extraArg0 Z 
-        0x0000 - 0x0005 reg=5 extraArg1 B 
-        0x0000 - 0x0005 reg=6 extraArg2 C 
-        0x0000 - 0x0005 reg=7 extraArg3 S 
+      locals        :
+        0x0000 - 0x0005 reg=1 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0005 reg=2 methodName Ljava/lang/String;
+        0x0000 - 0x0005 reg=3 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0005 reg=4 extraArg0 Z
+        0x0000 - 0x0005 reg=5 extraArg1 B
+        0x0000 - 0x0005 reg=6 extraArg2 C
+        0x0000 - 0x0005 reg=7 extraArg3 S
 
     #10              : (in LTestBadBootstrapArguments;)
       name          : 'extraArguments'
@@ -1416,10 +1416,10 @@
 001dd4: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001dda: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=158
         0x0007 line=159
-      locals        : 
+      locals        :
 
     #11              : (in LTestBadBootstrapArguments;)
       name          : 'happy'
@@ -1437,10 +1437,10 @@
 001df4: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001dfa: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=74
         0x0007 line=75
-      locals        : 
+      locals        :
 
     #12              : (in LTestBadBootstrapArguments;)
       name          : 'integerReturnType'
@@ -1456,10 +1456,10 @@
 001e0c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e12: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=444
         0x0003 line=445
-      locals        : 
+      locals        :
 
     #13              : (in LTestBadBootstrapArguments;)
       name          : 'invokeBoxingArguments'
@@ -1475,10 +1475,10 @@
 001e24: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e2a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=344
         0x0003 line=345
-      locals        : 
+      locals        :
 
     #14              : (in LTestBadBootstrapArguments;)
       name          : 'invokeExtraArguments'
@@ -1494,10 +1494,10 @@
 001e3c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e42: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=154
         0x0003 line=155
-      locals        : 
+      locals        :
 
     #15              : (in LTestBadBootstrapArguments;)
       name          : 'invokeHappy'
@@ -1513,10 +1513,10 @@
 001e54: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e5a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=70
         0x0003 line=71
-      locals        : 
+      locals        :
 
     #16              : (in LTestBadBootstrapArguments;)
       name          : 'invokeIntegerReturnType'
@@ -1532,10 +1532,10 @@
 001e6c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e72: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=440
         0x0003 line=441
-      locals        : 
+      locals        :
 
     #17              : (in LTestBadBootstrapArguments;)
       name          : 'invokeMissingParameterTypes'
@@ -1551,10 +1551,10 @@
 001e84: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001e8a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=124
         0x0003 line=125
-      locals        : 
+      locals        :
 
     #18              : (in LTestBadBootstrapArguments;)
       name          : 'invokeNarrowArguments'
@@ -1570,10 +1570,10 @@
 001e9c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001ea2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=256
         0x0003 line=257
-      locals        : 
+      locals        :
 
     #19              : (in LTestBadBootstrapArguments;)
       name          : 'invokeObjectReturnType'
@@ -1589,10 +1589,10 @@
 001eb4: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001eba: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=417
         0x0003 line=418
-      locals        : 
+      locals        :
 
     #20              : (in LTestBadBootstrapArguments;)
       name          : 'invokeViaCustomCallSiteClass'
@@ -1608,10 +1608,10 @@
 001ecc: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001ed2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=469
         0x0003 line=470
-      locals        : 
+      locals        :
 
     #21              : (in LTestBadBootstrapArguments;)
       name          : 'invokeVoidReturnType'
@@ -1627,10 +1627,10 @@
 001ee4: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001eea: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=394
         0x0003 line=395
-      locals        : 
+      locals        :
 
     #22              : (in LTestBadBootstrapArguments;)
       name          : 'invokeWideningArguments'
@@ -1646,10 +1646,10 @@
 001efc: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f02: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=300
         0x0003 line=301
-      locals        : 
+      locals        :
 
     #23              : (in LTestBadBootstrapArguments;)
       name          : 'invokeWideningBoxingArguments'
@@ -1665,10 +1665,10 @@
 001f14: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f1a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=372
         0x0003 line=373
-      locals        : 
+      locals        :
 
     #24              : (in LTestBadBootstrapArguments;)
       name          : 'invokeWrongArguments'
@@ -1684,10 +1684,10 @@
 001f2c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f32: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=182
         0x0003 line=183
-      locals        : 
+      locals        :
 
     #25              : (in LTestBadBootstrapArguments;)
       name          : 'invokeWrongArgumentsAgain'
@@ -1703,10 +1703,10 @@
 001f44: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f4a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=210
         0x0003 line=211
-      locals        : 
+      locals        :
 
     #26              : (in LTestBadBootstrapArguments;)
       name          : 'invokeWrongParameterTypes'
@@ -1722,10 +1722,10 @@
 001f5c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f62: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=98
         0x0003 line=99
-      locals        : 
+      locals        :
 
     #27              : (in LTestBadBootstrapArguments;)
       name          : 'missingParameterTypes'
@@ -1743,10 +1743,10 @@
 001f7c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001f82: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=128
         0x0007 line=129
-      locals        : 
+      locals        :
 
     #28              : (in LTestBadBootstrapArguments;)
       name          : 'narrowArguments'
@@ -1762,10 +1762,10 @@
 001f94: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001f9a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=260
         0x0003 line=261
-      locals        : 
+      locals        :
 
     #29              : (in LTestBadBootstrapArguments;)
       name          : 'objectReturnType'
@@ -1781,10 +1781,10 @@
 001fac: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 001fb2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=421
         0x0003 line=422
-      locals        : 
+      locals        :
 
     #30              : (in LTestBadBootstrapArguments;)
       name          : 'sayHello'
@@ -1802,10 +1802,10 @@
 001fcc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 001fd2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=473
         0x0007 line=474
-      locals        : 
+      locals        :
 
     #31              : (in LTestBadBootstrapArguments;)
       name          : 'test'
@@ -2081,7 +2081,7 @@
           Ljava/lang/BootstrapMethodError; -> 0x01bc
         0x01e1 - 0x01e7
           Ljava/lang/BootstrapMethodError; -> 0x01e8
-      positions     : 
+      positions     :
         0x0000 line=477
         0x0007 line=478
         0x000a line=480
@@ -2177,18 +2177,18 @@
         0x0200 line=579
         0x020d line=581
         0x0210 line=582
-      locals        : 
-        0x0012 - 0x0022 reg=0 expected Ljava/lang/NoSuchMethodError; 
-        0x002a - 0x003a reg=0 expected Ljava/lang/NoSuchMethodError; 
-        0x0042 - 0x0073 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x007b - 0x00ac reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x00b4 - 0x00e5 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x00ed - 0x011e reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x0126 - 0x0157 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x0165 - 0x0189 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x0191 - 0x01b5 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x01bd - 0x01e1 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x01e9 - 0x020d reg=0 expected Ljava/lang/BootstrapMethodError; 
+      locals        :
+        0x0012 - 0x0022 reg=0 expected Ljava/lang/NoSuchMethodError;
+        0x002a - 0x003a reg=0 expected Ljava/lang/NoSuchMethodError;
+        0x0042 - 0x0073 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x007b - 0x00ac reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x00b4 - 0x00e5 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x00ed - 0x011e reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x0126 - 0x0157 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x0165 - 0x0189 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x0191 - 0x01b5 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x01bd - 0x01e1 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x01e9 - 0x020d reg=0 expected Ljava/lang/BootstrapMethodError;
 
     #32              : (in LTestBadBootstrapArguments;)
       name          : 'voidReturnType'
@@ -2204,10 +2204,10 @@
 00249c: 7100 0b00 0000                         |0000: invoke-static {}, LTestBadBootstrapArguments;.assertNotReached:()V // method@000b
 0024a2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=398
         0x0003 line=399
-      locals        : 
+      locals        :
 
     #33              : (in LTestBadBootstrapArguments;)
       name          : 'wideningArguments'
@@ -2225,10 +2225,10 @@
 0024bc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 0024c2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=304
         0x0007 line=305
-      locals        : 
+      locals        :
 
     #34              : (in LTestBadBootstrapArguments;)
       name          : 'wideningBoxingArguments'
@@ -2246,10 +2246,10 @@
 0024dc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 0024e2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=376
         0x0007 line=377
-      locals        : 
+      locals        :
 
     #35              : (in LTestBadBootstrapArguments;)
       name          : 'wrongArguments'
@@ -2267,10 +2267,10 @@
 0024fc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 002502: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=186
         0x0007 line=187
-      locals        : 
+      locals        :
 
     #36              : (in LTestBadBootstrapArguments;)
       name          : 'wrongArgumentsAgain'
@@ -2288,10 +2288,10 @@
 00251c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 002522: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=214
         0x0007 line=215
-      locals        : 
+      locals        :
 
     #37              : (in LTestBadBootstrapArguments;)
       name          : 'wrongParameterTypes'
@@ -2309,10 +2309,10 @@
 00253c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 002542: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=102
         0x0007 line=103
-      locals        : 
+      locals        :
 
   Virtual methods   -
   source_file_idx   : 144 (TestBadBootstrapArguments.java)
@@ -2363,9 +2363,9 @@
 0029da: 6700 0000                              |0001: sput v0, LTestDynamicBootstrapArguments;.bsmCalls:I // field@0000
 0029de: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
-      locals        : 
+      locals        :
 
     #1              : (in LTestDynamicBootstrapArguments;)
       name          : '<init>'
@@ -2381,10 +2381,10 @@
 0029f0: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 0029f6: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=26
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestDynamicBootstrapArguments; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestDynamicBootstrapArguments;
 
     #2              : (in LTestDynamicBootstrapArguments;)
       name          : 'bsm'
@@ -2417,22 +2417,22 @@
 0029be: 7020 d200 2300                         |0027: invoke-direct {v3, v2}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 0029c4: 1103                                   |002a: return-object v3
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=36
         0x0006 line=37
         0x0008 line=38
         0x001a line=39
         0x001e line=40
         0x0025 line=41
-      locals        : 
+      locals        :
         0x0008 - 0x002b reg=0 definingClass Ljava/lang/Class; Ljava/lang/Class<*>;
-        0x001a - 0x002b reg=1 methodName Ljava/lang/String; 
-        0x001e - 0x002b reg=2 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x002b reg=5 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x002b reg=6 name Ljava/lang/String; 
-        0x0000 - 0x002b reg=7 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x002b reg=8 otherNameComponent Ljava/lang/String; 
-        0x0000 - 0x002b reg=9 nameSuffix J 
+        0x001a - 0x002b reg=1 methodName Ljava/lang/String;
+        0x001e - 0x002b reg=2 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x002b reg=5 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x002b reg=6 name Ljava/lang/String;
+        0x0000 - 0x002b reg=7 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x002b reg=8 otherNameComponent Ljava/lang/String;
+        0x0000 - 0x002b reg=9 nameSuffix J
 
     #3              : (in LTestDynamicBootstrapArguments;)
       name          : 'targetA100000000'
@@ -2459,17 +2459,17 @@
 00293c: 6e20 b200 4000                         |001a: invoke-virtual {v0, v4}, Ljava/io/PrintStream;.println:(Ljava/lang/Object;)V // method@00b2
 002942: 0f02                                   |001d: return v2
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=71
         0x0005 line=72
         0x000c line=73
         0x0011 line=74
         0x0018 line=75
         0x001d line=76
-      locals        : 
-        0x0000 - 0x001e reg=2 i I 
-        0x0000 - 0x001e reg=3 s Ljava/lang/String; 
-        0x0000 - 0x001e reg=4 d Ljava/lang/Double; 
+      locals        :
+        0x0000 - 0x001e reg=2 i I
+        0x0000 - 0x001e reg=3 s Ljava/lang/String;
+        0x0000 - 0x001e reg=4 d Ljava/lang/Double;
 
     #4              : (in LTestDynamicBootstrapArguments;)
       name          : 'test'
@@ -2494,14 +2494,14 @@
 002a32: 7120 4100 0100                         |0015: invoke-static {v1, v0}, LTestDynamicBootstrapArguments;.assertEquals:(II)V // method@0041
 002a38: 0e00                                   |0018: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=86
         0x0007 line=87
         0x000a line=88
         0x0010 line=89
         0x0013 line=90
         0x0018 line=91
-      locals        : 
+      locals        :
 
     #5              : (in LTestDynamicBootstrapArguments;)
       name          : 'testCallSites'
@@ -2540,12 +2540,12 @@
 002ab2: 7120 4100 0200                         |0033: invoke-static {v2, v0}, LTestDynamicBootstrapArguments;.assertEquals:(II)V // method@0041
 002ab8: 0e00                                   |0036: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=80
         0x0013 line=81
         0x0026 line=82
         0x0036 line=83
-      locals        : 
+      locals        :
 
     #6              : (in LTestDynamicBootstrapArguments;)
       name          : 'testDynamic'
@@ -2562,13 +2562,13 @@
 00295a: 1200                                   |0003: const/4 v0, #int 0 // #0
 00295c: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=66
         0x0003 line=67
-      locals        : 
-        0x0000 - 0x0005 reg=1 i I 
-        0x0000 - 0x0005 reg=2 s Ljava/lang/String; 
-        0x0000 - 0x0005 reg=3 d Ljava/lang/Double; 
+      locals        :
+        0x0000 - 0x0005 reg=1 i I
+        0x0000 - 0x0005 reg=2 s Ljava/lang/String;
+        0x0000 - 0x0005 reg=3 d Ljava/lang/Double;
 
   Virtual methods   -
   source_file_idx   : 147 (TestDynamicBootstrapArguments.java)
@@ -2644,10 +2644,10 @@
 002cb4: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 002cba: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=25
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestInvocationKinds; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestInvocationKinds;
 
     #1              : (in LTestInvocationKinds;)
       name          : 'getInstanceField'
@@ -2664,11 +2664,11 @@
 002b06: 1900 f87f                              |0003: const-wide/high16 v0, #long 9221120237041090560 // #7ff8
 002b0a: 1000                                   |0005: return-wide v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=117
         0x0003 line=118
-      locals        : 
-        0x0000 - 0x0006 reg=2 instance LTestInvocationKinds; 
+      locals        :
+        0x0000 - 0x0006 reg=2 instance LTestInvocationKinds;
 
     #2              : (in LTestInvocationKinds;)
       name          : 'getStaticField'
@@ -2685,10 +2685,10 @@
 002b3e: 1200                                   |0003: const/4 v0, #int 0 // #0
 002b40: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=71
         0x0003 line=72
-      locals        : 
+      locals        :
 
     #3              : (in LTestInvocationKinds;)
       name          : 'lookupConstructor'
@@ -2712,18 +2712,18 @@
 002b90: 7020 d200 2300                         |0010: invoke-direct {v3, v2}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002b96: 1103                                   |0013: return-object v3
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=183
         0x0004 line=184
         0x000a line=185
         0x000e line=186
-      locals        : 
+      locals        :
         0x0004 - 0x0014 reg=0 cls Ljava/lang/Class; Ljava/lang/Class<*>;
-        0x000a - 0x0014 reg=1 constructorMethodType Ljava/lang/invoke/MethodType; 
-        0x000e - 0x0014 reg=2 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0014 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0014 reg=5 name Ljava/lang/String; 
-        0x0000 - 0x0014 reg=6 methodType Ljava/lang/invoke/MethodType; 
+        0x000a - 0x0014 reg=1 constructorMethodType Ljava/lang/invoke/MethodType;
+        0x000e - 0x0014 reg=2 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0014 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0014 reg=5 name Ljava/lang/String;
+        0x0000 - 0x0014 reg=6 methodType Ljava/lang/invoke/MethodType;
 
     #4              : (in LTestInvocationKinds;)
       name          : 'lookupInstanceFieldGetter'
@@ -2748,15 +2748,15 @@
 002bc8: 7020 d200 0100                         |0010: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002bce: 1101                                   |0013: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=101
         0x0001 line=102
         0x000e line=103
-      locals        : 
-        0x000e - 0x0014 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0014 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0014 reg=3 name Ljava/lang/String; 
-        0x0000 - 0x0014 reg=4 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x000e - 0x0014 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0014 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0014 reg=3 name Ljava/lang/String;
+        0x0000 - 0x0014 reg=4 methodType Ljava/lang/invoke/MethodType;
 
     #5              : (in LTestInvocationKinds;)
       name          : 'lookupInstanceFieldSetter'
@@ -2782,15 +2782,15 @@
 002c02: 7020 d200 0100                         |0011: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002c08: 1101                                   |0014: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=78
         0x0001 line=79
         0x000f line=80
-      locals        : 
-        0x000f - 0x0015 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0015 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0015 reg=3 name Ljava/lang/String; 
-        0x0000 - 0x0015 reg=4 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x000f - 0x0015 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0015 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0015 reg=3 name Ljava/lang/String;
+        0x0000 - 0x0015 reg=4 methodType Ljava/lang/invoke/MethodType;
 
     #6              : (in LTestInvocationKinds;)
       name          : 'lookupStaticFieldGetter'
@@ -2812,15 +2812,15 @@
 002c34: 7020 d200 0100                         |000c: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002c3a: 1101                                   |000f: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=32
         0x0002 line=33
         0x000a line=34
-      locals        : 
-        0x000a - 0x0010 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0010 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0010 reg=3 name Ljava/lang/String; 
-        0x0000 - 0x0010 reg=4 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x000a - 0x0010 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0010 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0010 reg=3 name Ljava/lang/String;
+        0x0000 - 0x0010 reg=4 methodType Ljava/lang/invoke/MethodType;
 
     #7              : (in LTestInvocationKinds;)
       name          : 'lookupStaticFieldSetter'
@@ -2843,16 +2843,16 @@
 002c66: 7020 d200 0100                         |000d: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002c6c: 1101                                   |0010: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=54
         0x0002 line=56
         0x0007 line=55
         0x000b line=57
-      locals        : 
-        0x000b - 0x0011 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0011 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0011 reg=3 name Ljava/lang/String; 
-        0x0000 - 0x0011 reg=4 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x000b - 0x0011 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0011 reg=2 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0011 reg=3 name Ljava/lang/String;
+        0x0000 - 0x0011 reg=4 methodType Ljava/lang/invoke/MethodType;
 
     #8              : (in LTestInvocationKinds;)
       name          : 'lookupVirtual'
@@ -2876,16 +2876,16 @@
 002c9c: 7020 d200 1200                         |000e: invoke-direct {v2, v1}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 002ca2: 1102                                   |0011: return-object v2
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=146
         0x0006 line=147
         0x000c line=148
-      locals        : 
-        0x0006 - 0x0012 reg=0 mt Ljava/lang/invoke/MethodType; 
-        0x000c - 0x0012 reg=1 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0012 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0012 reg=4 name Ljava/lang/String; 
-        0x0000 - 0x0012 reg=5 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0006 - 0x0012 reg=0 mt Ljava/lang/invoke/MethodType;
+        0x000c - 0x0012 reg=1 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0012 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0012 reg=4 name Ljava/lang/String;
+        0x0000 - 0x0012 reg=5 methodType Ljava/lang/invoke/MethodType;
 
     #9              : (in LTestInvocationKinds;)
       name          : 'makeWidget'
@@ -2902,11 +2902,11 @@
 002aea: 1200                                   |0003: const/4 v0, #int 0 // #0
 002aec: 1100                                   |0004: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=200
         0x0003 line=201
-      locals        : 
-        0x0000 - 0x0005 reg=1 v I 
+      locals        :
+        0x0000 - 0x0005 reg=1 v I
 
     #10              : (in LTestInvocationKinds;)
       name          : 'maxIntegerValue'
@@ -2923,13 +2923,13 @@
 002b5a: 1200                                   |0003: const/4 v0, #int 0 // #0
 002b5c: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=159
         0x0003 line=160
-      locals        : 
-        0x0000 - 0x0005 reg=1 receiver LTestInvocationKinds; 
-        0x0000 - 0x0005 reg=2 x I 
-        0x0000 - 0x0005 reg=3 y I 
+      locals        :
+        0x0000 - 0x0005 reg=1 receiver LTestInvocationKinds;
+        0x0000 - 0x0005 reg=2 x I
+        0x0000 - 0x0005 reg=3 y I
 
     #11              : (in LTestInvocationKinds;)
       name          : 'setInstanceField'
@@ -2947,13 +2947,13 @@
 002cd6: 5a20 0200                              |0005: iput-wide v0, v2, LTestInvocationKinds;.instance_field:D // field@0002
 002cda: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=94
         0x0003 line=95
         0x0007 line=96
-      locals        : 
-        0x0000 - 0x0008 reg=2 instance LTestInvocationKinds; 
-        0x0000 - 0x0008 reg=3 value D 
+      locals        :
+        0x0000 - 0x0008 reg=2 instance LTestInvocationKinds;
+        0x0000 - 0x0008 reg=3 value D
 
     #12              : (in LTestInvocationKinds;)
       name          : 'setStaticField'
@@ -2969,11 +2969,11 @@
 002cec: 7100 4d00 0000                         |0000: invoke-static {}, LTestInvocationKinds;.assertNotReached:()V // method@004d
 002cf2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=48
         0x0003 line=49
-      locals        : 
-        0x0000 - 0x0004 reg=0 value I 
+      locals        :
+        0x0000 - 0x0004 reg=0 value I
 
     #13              : (in LTestInvocationKinds;)
       name          : 'test'
@@ -2997,14 +2997,14 @@
 002d2c: 7100 5c00 0000                         |0014: invoke-static {}, LTestInvocationKinds;.testConstructor:()V // method@005c
 002d32: 0e00                                   |0017: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=212
         0x000b line=213
         0x000e line=214
         0x0011 line=215
         0x0014 line=216
         0x0017 line=217
-      locals        : 
+      locals        :
 
     #14              : (in LTestInvocationKinds;)
       name          : 'testConstructor'
@@ -3033,14 +3033,14 @@
 002d7a: 6e20 b200 2100                         |001b: invoke-virtual {v1, v2}, Ljava/io/PrintStream;.println:(Ljava/lang/Object;)V // method@00b2
 002d80: 0e00                                   |001e: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=205
         0x0007 line=206
         0x000c line=207
         0x0015 line=208
         0x001e line=209
-      locals        : 
-        0x000c - 0x001f reg=0 receiver LTestInvocationKinds$Widget; 
+      locals        :
+        0x000c - 0x001f reg=0 receiver LTestInvocationKinds$Widget;
 
     #15              : (in LTestInvocationKinds;)
       name          : 'testInstanceFieldAccessors'
@@ -3071,7 +3071,7 @@
 002de4: 7140 4a00 2143                         |0028: invoke-static {v1, v2, v3, v4}, LTestInvocationKinds;.assertEquals:(DD)V // method@004a
 002dea: 0e00                                   |002b: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=133
         0x0007 line=134
         0x000c line=135
@@ -3080,8 +3080,8 @@
         0x001d line=138
         0x0024 line=139
         0x002b line=140
-      locals        : 
-        0x000c - 0x002c reg=0 instance LTestInvocationKinds; 
+      locals        :
+        0x000c - 0x002c reg=0 instance LTestInvocationKinds;
 
     #16              : (in LTestInvocationKinds;)
       name          : 'testInvokeVirtual'
@@ -3107,15 +3107,15 @@
 002e26: 6e20 b100 1200                         |0015: invoke-virtual {v2, v1}, Ljava/io/PrintStream;.println:(I)V // method@00b1
 002e2c: 0e00                                   |0018: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=168
         0x0007 line=169
         0x000c line=170
         0x0013 line=171
         0x0018 line=172
-      locals        : 
-        0x000c - 0x0019 reg=0 receiver LTestInvocationKinds; 
-        0x0013 - 0x0019 reg=1 result I 
+      locals        :
+        0x000c - 0x0019 reg=0 receiver LTestInvocationKinds;
+        0x0013 - 0x0019 reg=1 result I
 
     #17              : (in LTestInvocationKinds;)
       name          : 'testStaticFieldAccessors'
@@ -3150,7 +3150,7 @@
 002e96: 7120 4b00 1000                         |002b: invoke-static {v0, v1}, LTestInvocationKinds;.assertEquals:(II)V // method@004b
 002e9c: 0e00                                   |002e: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=122
         0x0007 line=123
         0x000b line=124
@@ -3160,7 +3160,7 @@
         0x0022 line=128
         0x0027 line=129
         0x002e line=130
-      locals        : 
+      locals        :
 
   Virtual methods   -
     #0              : (in LTestInvocationKinds;)
@@ -3180,12 +3180,12 @@
 002b24: 0130                                   |0004: move v0, v3
 002b26: 0f00                                   |0005: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=164
-      locals        : 
-        0x0000 - 0x0006 reg=1 this LTestInvocationKinds; 
-        0x0000 - 0x0006 reg=2 x I 
-        0x0000 - 0x0006 reg=3 y I 
+      locals        :
+        0x0000 - 0x0006 reg=1 this LTestInvocationKinds;
+        0x0000 - 0x0006 reg=2 x I
+        0x0000 - 0x0006 reg=3 y I
 
   source_file_idx   : 148 (TestInvocationKinds.java)
 
@@ -3280,14 +3280,14 @@
 0030b8: 6901 0500                              |0022: sput-object v1, LTestInvokeCustomWithConcurrentThreads;.barrier:Ljava/util/concurrent/CyclicBarrier; // field@0005
 0030bc: 0e00                                   |0024: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=30
         0x0008 line=32
         0x000f line=41
         0x0015 line=44
         0x0019 line=47
         0x001d line=50
-      locals        : 
+      locals        :
 
     #1              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : '<init>'
@@ -3303,10 +3303,10 @@
 0030d0: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 0030d6: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=52
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestInvokeCustomWithConcurrentThreads; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestInvokeCustomWithConcurrentThreads;
 
     #2              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'access$000'
@@ -3322,9 +3322,9 @@
 00305c: 6200 0800                              |0000: sget-object v0, LTestInvokeCustomWithConcurrentThreads;.nextIndex:Ljava/util/concurrent/atomic/AtomicInteger; // field@0008
 003060: 1100                                   |0002: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
-      locals        : 
+      locals        :
 
     #3              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'getThreadIndex'
@@ -3345,9 +3345,9 @@
 002f26: 0a00                                   |000b: move-result v0
 002f28: 0f00                                   |000c: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=55
-      locals        : 
+      locals        :
 
     #4              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'linkerMethod'
@@ -3408,7 +3408,7 @@
 003044: 4601 0102                              |005e: aget-object v1, v1, v2
 003048: 1101                                   |0060: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=87
         0x0002 line=88
         0x0006 line=89
@@ -3420,11 +3420,11 @@
         0x0046 line=99
         0x004b line=101
         0x0058 line=102
-      locals        : 
-        0x0006 - 0x0061 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0061 reg=5 caller Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0061 reg=6 name Ljava/lang/String; 
-        0x0000 - 0x0061 reg=7 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0006 - 0x0061 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0061 reg=5 caller Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0061 reg=6 name Ljava/lang/String;
+        0x0000 - 0x0061 reg=7 methodType Ljava/lang/invoke/MethodType;
 
     #5              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'notUsed'
@@ -3439,10 +3439,10 @@
 002f2c:                                        |[002f2c] TestInvokeCustomWithConcurrentThreads.notUsed:(I)I
 002f3c: 0f00                                   |0000: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=59
-      locals        : 
-        0x0000 - 0x0001 reg=0 x I 
+      locals        :
+        0x0000 - 0x0001 reg=0 x I
 
     #6              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'setCalled'
@@ -3466,12 +3466,12 @@
 002f74: 1200                                   |0012: const/4 v0, #int 0 // #0
 002f76: 0f00                                   |0013: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=79
         0x0007 line=80
         0x0012 line=81
-      locals        : 
-        0x0000 - 0x0014 reg=2 index I 
+      locals        :
+        0x0000 - 0x0014 reg=2 index I
 
     #7              : (in LTestInvokeCustomWithConcurrentThreads;)
       name          : 'test'
@@ -3601,7 +3601,7 @@
 0032ce: 7120 6600 2500                         |00e1: invoke-static {v5, v2}, LTestInvokeCustomWithConcurrentThreads;.assertEquals:(II)V // method@0066
 0032d4: 0e00                                   |00e4: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=107
         0x0006 line=108
         0x000f line=109
@@ -3640,18 +3640,18 @@
         0x00de line=157
         0x00e1 line=158
         0x00e4 line=159
-      locals        : 
-        0x0002 - 0x001b reg=1 i I 
-        0x001e - 0x0034 reg=3 i I 
-        0x0035 - 0x003f reg=3 i I 
-        0x0040 - 0x0044 reg=3 winners I 
-        0x0041 - 0x0044 reg=4 votes I 
-        0x0044 - 0x0066 reg=3 i I 
-        0x0090 - 0x00b2 reg=7 i I 
-        0x00bc - 0x00de reg=7 i I 
-        0x001d - 0x00e5 reg=1 threads [Ljava/lang/Thread; 
-        0x0044 - 0x00e5 reg=4 winners I 
-        0x0044 - 0x00e5 reg=5 votes I 
+      locals        :
+        0x0002 - 0x001b reg=1 i I
+        0x001e - 0x0034 reg=3 i I
+        0x0035 - 0x003f reg=3 i I
+        0x0040 - 0x0044 reg=3 winners I
+        0x0041 - 0x0044 reg=4 votes I
+        0x0044 - 0x0066 reg=3 i I
+        0x0090 - 0x00b2 reg=7 i I
+        0x00bc - 0x00de reg=7 i I
+        0x001d - 0x00e5 reg=1 threads [Ljava/lang/Thread;
+        0x0044 - 0x00e5 reg=4 winners I
+        0x0044 - 0x00e5 reg=5 votes I
 
   Virtual methods   -
     #0              : (in LTestInvokeCustomWithConcurrentThreads;)
@@ -3671,13 +3671,13 @@
 0030f2: 7110 6b00 0000                         |0005: invoke-static {v0}, LTestInvokeCustomWithConcurrentThreads;.notUsed:(I)I // method@006b
 0030f8: 0e00                                   |0008: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=63
         0x0005 line=64
         0x0008 line=65
-      locals        : 
-        0x0005 - 0x0009 reg=0 x I 
-        0x0000 - 0x0009 reg=1 this LTestInvokeCustomWithConcurrentThreads; 
+      locals        :
+        0x0005 - 0x0009 reg=0 x I
+        0x0000 - 0x0009 reg=1 this LTestInvokeCustomWithConcurrentThreads;
 
   source_file_idx   : 149 (TestInvokeCustomWithConcurrentThreads.java)
 
@@ -3749,9 +3749,9 @@
 003416: 6700 0f00                              |0001: sput v0, LTestLinkerMethodMinimalArguments;.forceFailureType:I // field@000f
 00341a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=26
-      locals        : 
+      locals        :
 
     #1              : (in LTestLinkerMethodMinimalArguments;)
       name          : '<init>'
@@ -3767,10 +3767,10 @@
 00342c: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 003432: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=25
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestLinkerMethodMinimalArguments; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestLinkerMethodMinimalArguments;
 
     #2              : (in LTestLinkerMethodMinimalArguments;)
       name          : '_add'
@@ -3796,14 +3796,14 @@
 00330e: 7020 b400 1000                         |0013: invoke-direct {v0, v1}, Ljava/lang/ArithmeticException;.<init>:(Ljava/lang/String;)V // method@00b4
 003314: 2700                                   |0016: throw v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=51
         0x0005 line=55
         0x0008 line=52
         0x000f line=53
-      locals        : 
-        0x0000 - 0x0017 reg=2 a I 
-        0x0000 - 0x0017 reg=3 b I 
+      locals        :
+        0x0000 - 0x0017 reg=2 a I
+        0x0000 - 0x0017 reg=3 b I
 
     #3              : (in LTestLinkerMethodMinimalArguments;)
       name          : 'add'
@@ -3820,12 +3820,12 @@
 00332e: 12f0                                   |0003: const/4 v0, #int -1 // #ff
 003330: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=45
         0x0003 line=46
-      locals        : 
-        0x0000 - 0x0005 reg=1 a I 
-        0x0000 - 0x0005 reg=2 b I 
+      locals        :
+        0x0000 - 0x0005 reg=1 a I
+        0x0000 - 0x0005 reg=2 b I
 
     #4              : (in LTestLinkerMethodMinimalArguments;)
       name          : 'linkerMethod'
@@ -3879,7 +3879,7 @@
 0033f2: 1101                                   |0057: return-object v1
 0033f4: 0001 0200 0100 0000 1800 0000 0900 ... |0058: packed-switch-data (8 units)
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=61
         0x0018 line=62
         0x001a line=63
@@ -3889,11 +3889,11 @@
         0x0030 line=71
         0x0038 line=66
         0x0056 line=68
-      locals        : 
-        0x001e - 0x0060 reg=0 mh_add Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0060 reg=4 caller Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0060 reg=5 name Ljava/lang/String; 
-        0x0000 - 0x0060 reg=6 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x001e - 0x0060 reg=0 mh_add Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0060 reg=4 caller Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0060 reg=5 name Ljava/lang/String;
+        0x0000 - 0x0060 reg=6 methodType Ljava/lang/invoke/MethodType;
 
     #5              : (in LTestLinkerMethodMinimalArguments;)
       name          : 'test'
@@ -3940,17 +3940,17 @@
 0034c4: 6e20 b300 1000                         |0040: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 0034ca: 0e00                                   |0043: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=78
         0x000a line=79
         0x0012 line=80
         0x0014 line=81
         0x001d line=82
         0x0043 line=83
-      locals        : 
-        0x0000 - 0x0044 reg=3 failureType I 
-        0x0000 - 0x0044 reg=4 x I 
-        0x0000 - 0x0044 reg=5 y I 
+      locals        :
+        0x0000 - 0x0044 reg=3 failureType I
+        0x0000 - 0x0044 reg=4 x I
+        0x0000 - 0x0044 reg=5 y I
 
   Virtual methods   -
   source_file_idx   : 151 (TestLinkerMethodMinimalArguments.java)
@@ -4004,9 +4004,9 @@
 00362a: 6700 1000                              |0001: sput v0, LTestLinkerMethodMultipleArgumentTypes;.bootstrapRunCount:I // field@0010
 00362e: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=28
-      locals        : 
+      locals        :
 
     #1              : (in LTestLinkerMethodMultipleArgumentTypes;)
       name          : '<init>'
@@ -4022,10 +4022,10 @@
 003640: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 003646: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=26
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestLinkerMethodMultipleArgumentTypes; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestLinkerMethodMultipleArgumentTypes;
 
     #2              : (in LTestLinkerMethodMultipleArgumentTypes;)
       name          : '_add'
@@ -4041,11 +4041,11 @@
 0034f4: 9000 0102                              |0000: add-int v0, v1, v2
 0034f8: 0f00                                   |0002: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=74
-      locals        : 
-        0x0000 - 0x0003 reg=1 a I 
-        0x0000 - 0x0003 reg=2 b I 
+      locals        :
+        0x0000 - 0x0003 reg=1 a I
+        0x0000 - 0x0003 reg=2 b I
 
     #3              : (in LTestLinkerMethodMultipleArgumentTypes;)
       name          : 'add'
@@ -4062,12 +4062,12 @@
 003512: 12f0                                   |0003: const/4 v0, #int -1 // #ff
 003514: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=68
         0x0003 line=69
-      locals        : 
-        0x0000 - 0x0005 reg=1 a I 
-        0x0000 - 0x0005 reg=2 b I 
+      locals        :
+        0x0000 - 0x0005 reg=1 a I
+        0x0000 - 0x0005 reg=2 b I
 
     #4              : (in LTestLinkerMethodMultipleArgumentTypes;)
       name          : 'linkerMethod'
@@ -4131,7 +4131,7 @@
 00360e: 7020 d200 df00                         |0073: invoke-direct {v15, v13}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003614: 110f                                   |0076: return-object v15
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=93
         0x0022 line=94
         0x0028 line=95
@@ -4146,22 +4146,22 @@
         0x0069 line=104
         0x006b line=105
         0x0071 line=106
-      locals        : 
-        0x0000 - 0x0000 reg=28 (null) Ljava/lang/Class; 
-        0x0071 - 0x0077 reg=13 mh_add Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0077 reg=16 caller Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0077 reg=17 name Ljava/lang/String; 
-        0x0000 - 0x0077 reg=18 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0077 reg=19 v1 I 
-        0x0000 - 0x0077 reg=20 v2 I 
-        0x0000 - 0x0077 reg=21 v3 I 
-        0x0000 - 0x0077 reg=22 v4 I 
-        0x0000 - 0x0077 reg=23 v5 I 
-        0x0000 - 0x0077 reg=24 v6 F 
-        0x0000 - 0x0077 reg=25 v7 D 
-        0x0000 - 0x0077 reg=27 v8 Ljava/lang/String; 
+      locals        :
+        0x0000 - 0x0000 reg=28 (null) Ljava/lang/Class;
+        0x0071 - 0x0077 reg=13 mh_add Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0077 reg=16 caller Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0077 reg=17 name Ljava/lang/String;
+        0x0000 - 0x0077 reg=18 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0077 reg=19 v1 I
+        0x0000 - 0x0077 reg=20 v2 I
+        0x0000 - 0x0077 reg=21 v3 I
+        0x0000 - 0x0077 reg=22 v4 I
+        0x0000 - 0x0077 reg=23 v5 I
+        0x0000 - 0x0077 reg=24 v6 F
+        0x0000 - 0x0077 reg=25 v7 D
+        0x0000 - 0x0077 reg=27 v8 Ljava/lang/String;
         0x0000 - 0x0077 reg=28 v9 Ljava/lang/Class; Ljava/lang/Class<*>;
-        0x0000 - 0x0077 reg=29 v10 J 
+        0x0000 - 0x0077 reg=29 v10 J
 
     #5              : (in LTestLinkerMethodMultipleArgumentTypes;)
       name          : 'test'
@@ -4183,13 +4183,13 @@
 003672: 6e20 b100 1000                         |000d: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(I)V // method@00b1
 003678: 0e00                                   |0010: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=114
         0x0009 line=115
         0x0010 line=116
-      locals        : 
-        0x0000 - 0x0011 reg=2 x I 
-        0x0000 - 0x0011 reg=3 y I 
+      locals        :
+        0x0000 - 0x0011 reg=2 x I
+        0x0000 - 0x0011 reg=3 y I
 
   Virtual methods   -
     #0              : (in LTestLinkerMethodMultipleArgumentTypes;)
@@ -4206,10 +4206,10 @@
 0034dc: 6000 1000                              |0000: sget v0, LTestLinkerMethodMultipleArgumentTypes;.bootstrapRunCount:I // field@0010
 0034e0: 0f00                                   |0002: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=110
-      locals        : 
-        0x0000 - 0x0003 reg=1 this LTestLinkerMethodMultipleArgumentTypes; 
+      locals        :
+        0x0000 - 0x0003 reg=1 this LTestLinkerMethodMultipleArgumentTypes;
 
   source_file_idx   : 153 (TestLinkerMethodMultipleArgumentTypes.java)
 
@@ -4254,10 +4254,10 @@
 0036f4: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 0036fa: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=23
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestLinkerUnrelatedBSM; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestLinkerUnrelatedBSM;
 
     #1              : (in LTestLinkerUnrelatedBSM;)
       name          : '_addf'
@@ -4273,11 +4273,11 @@
 00368c: a600 0102                              |0000: add-float v0, v1, v2
 003690: 0f00                                   |0002: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=47
-      locals        : 
-        0x0000 - 0x0003 reg=1 a F 
-        0x0000 - 0x0003 reg=2 b F 
+      locals        :
+        0x0000 - 0x0003 reg=1 a F
+        0x0000 - 0x0003 reg=2 b F
 
     #2              : (in LTestLinkerUnrelatedBSM;)
       name          : '_subf'
@@ -4293,11 +4293,11 @@
 0036a4: a700 0102                              |0000: sub-float v0, v1, v2
 0036a8: 0f00                                   |0002: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=73
-      locals        : 
-        0x0000 - 0x0003 reg=1 a F 
-        0x0000 - 0x0003 reg=2 b F 
+      locals        :
+        0x0000 - 0x0003 reg=1 a F
+        0x0000 - 0x0003 reg=2 b F
 
     #3              : (in LTestLinkerUnrelatedBSM;)
       name          : 'addf'
@@ -4314,12 +4314,12 @@
 0036c2: 1210                                   |0003: const/4 v0, #int 1 // #1
 0036c4: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=42
         0x0003 line=43
-      locals        : 
-        0x0000 - 0x0005 reg=1 a F 
-        0x0000 - 0x0005 reg=2 b F 
+      locals        :
+        0x0000 - 0x0005 reg=1 a F
+        0x0000 - 0x0005 reg=2 b F
 
     #4              : (in LTestLinkerUnrelatedBSM;)
       name          : 'subf'
@@ -4336,12 +4336,12 @@
 0036de: 1210                                   |0003: const/4 v0, #int 1 // #1
 0036e0: 0f00                                   |0004: return v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=68
         0x0003 line=69
-      locals        : 
-        0x0000 - 0x0005 reg=1 a F 
-        0x0000 - 0x0005 reg=2 b F 
+      locals        :
+        0x0000 - 0x0005 reg=1 a F
+        0x0000 - 0x0005 reg=2 b F
 
     #5              : (in LTestLinkerUnrelatedBSM;)
       name          : 'test'
@@ -4371,12 +4371,12 @@
 003748: 7120 8900 0100                         |001e: invoke-static {v1, v0}, LTestLinkerUnrelatedBSM;.assertEquals:(FF)V // method@0089
 00374e: 0e00                                   |0021: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=77
         0x000b line=78
         0x0018 line=79
         0x0021 line=80
-      locals        : 
+      locals        :
 
   Virtual methods   -
   source_file_idx   : 154 (TestLinkerUnrelatedBSM.java)
@@ -4467,10 +4467,10 @@
 003a8c: 7010 3200 0000                         |0000: invoke-direct {v0}, LTestBase;.<init>:()V // method@0032
 003a92: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=27
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTestVariableArityLinkerMethod; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTestVariableArityLinkerMethod;
 
     #1              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithBoxedArray'
@@ -4503,16 +4503,16 @@
 00379c: 7020 d200 0100                         |001e: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 0037a2: 1101                                   |0021: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=477
         0x0014 line=478
         0x001c line=479
-      locals        : 
-        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0022 reg=6 extraArgs [Ljava/lang/Integer; 
+      locals        :
+        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0022 reg=6 extraArgs [Ljava/lang/Integer;
 
     #2              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithClassAndFloatArray'
@@ -4547,18 +4547,18 @@
 0037f6: 7020 d200 0100                         |0021: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 0037fc: 1101                                   |0024: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=294
         0x0017 line=296
         0x001f line=297
-      locals        : 
-        0x0000 - 0x0000 reg=6 (null) Ljava/lang/Class; 
-        0x001f - 0x0025 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0025 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0025 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0025 reg=5 methodType Ljava/lang/invoke/MethodType; 
+      locals        :
+        0x0000 - 0x0000 reg=6 (null) Ljava/lang/Class;
+        0x001f - 0x0025 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0025 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0025 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0025 reg=5 methodType Ljava/lang/invoke/MethodType;
         0x0000 - 0x0025 reg=6 extraArg Ljava/lang/Class; Ljava/lang/Class<*>;
-        0x0000 - 0x0025 reg=7 arityArgs [F 
+        0x0000 - 0x0025 reg=7 arityArgs [F
 
     #3              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithClassArray'
@@ -4591,16 +4591,16 @@
 00384c: 7020 d200 0100                         |001e: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003852: 1101                                   |0021: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=367
         0x0014 line=368
         0x001c line=369
-      locals        : 
-        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0022 reg=6 arityArgs [Ljava/lang/Class; 
+      locals        :
+        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0022 reg=6 arityArgs [Ljava/lang/Class;
 
     #4              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithDoubleArray'
@@ -4633,16 +4633,16 @@
 0038a0: 7020 d200 0100                         |001e: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 0038a6: 1101                                   |0021: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=332
         0x0014 line=333
         0x001c line=334
-      locals        : 
-        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0022 reg=6 arityArgs [D 
+      locals        :
+        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0022 reg=6 arityArgs [D
 
     #5              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithFloatAndLongArray'
@@ -4679,19 +4679,19 @@
 003902: 7020 d200 0100                         |0025: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003908: 1101                                   |0028: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=257
         0x000e line=258
         0x0018 line=257
         0x001b line=259
         0x0023 line=260
-      locals        : 
-        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String; 
-        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0029 reg=7 extraArg F 
-        0x0000 - 0x0029 reg=8 arityArgs [J 
+      locals        :
+        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String;
+        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0029 reg=7 extraArg F
+        0x0000 - 0x0029 reg=8 arityArgs [J
 
     #6              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithIntAndStringArray'
@@ -4728,19 +4728,19 @@
 003966: 7020 d200 0100                         |0025: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 00396c: 1101                                   |0028: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=133
         0x000e line=138
         0x0018 line=133
         0x001b line=140
         0x0023 line=141
-      locals        : 
-        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String; 
-        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0029 reg=7 extraInt I 
-        0x0000 - 0x0029 reg=8 extraArityArgs [Ljava/lang/String; 
+      locals        :
+        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String;
+        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0029 reg=7 extraInt I
+        0x0000 - 0x0029 reg=8 extraArityArgs [Ljava/lang/String;
 
     #7              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithLongAndIntArray'
@@ -4777,17 +4777,17 @@
 0039ca: 7020 d200 0100                         |0025: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 0039d0: 1101                                   |0028: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=219
         0x001b line=220
         0x0023 line=221
-      locals        : 
-        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String; 
-        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0029 reg=7 extraArg J 
-        0x0000 - 0x0029 reg=9 arityArgs [I 
+      locals        :
+        0x0023 - 0x0029 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0029 reg=4 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0029 reg=5 methodName Ljava/lang/String;
+        0x0000 - 0x0029 reg=6 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0029 reg=7 extraArg J
+        0x0000 - 0x0029 reg=9 arityArgs [I
 
     #8              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithStringArray'
@@ -4820,16 +4820,16 @@
 003a20: 7020 d200 0100                         |001e: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003a26: 1101                                   |0021: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=61
         0x0014 line=62
         0x001c line=63
-      locals        : 
-        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0022 reg=6 arityArgs [Ljava/lang/String; 
+      locals        :
+        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0022 reg=6 arityArgs [Ljava/lang/String;
 
     #9              : (in LTestVariableArityLinkerMethod;)
       name          : 'bsmWithWiderArray'
@@ -4862,16 +4862,16 @@
 003a74: 7020 d200 0100                         |001e: invoke-direct {v1, v0}, Ljava/lang/invoke/ConstantCallSite;.<init>:(Ljava/lang/invoke/MethodHandle;)V // method@00d2
 003a7a: 1101                                   |0021: return-object v1
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=447
         0x0014 line=448
         0x001c line=449
-      locals        : 
-        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle; 
-        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup; 
-        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String; 
-        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType; 
-        0x0000 - 0x0022 reg=6 extraArgs [J 
+      locals        :
+        0x001c - 0x0022 reg=0 mh Ljava/lang/invoke/MethodHandle;
+        0x0000 - 0x0022 reg=3 lookup Ljava/lang/invoke/MethodHandles$Lookup;
+        0x0000 - 0x0022 reg=4 methodName Ljava/lang/String;
+        0x0000 - 0x0022 reg=5 methodType Ljava/lang/invoke/MethodType;
+        0x0000 - 0x0022 reg=6 extraArgs [J
 
     #10              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodA'
@@ -4889,10 +4889,10 @@
 003aac: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003ab2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=86
         0x0007 line=87
-      locals        : 
+      locals        :
 
     #11              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodB'
@@ -4910,10 +4910,10 @@
 003acc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003ad2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=105
         0x0007 line=106
-      locals        : 
+      locals        :
 
     #12              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodC'
@@ -4931,10 +4931,10 @@
 003aec: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003af2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=123
         0x0007 line=124
-      locals        : 
+      locals        :
 
     #13              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodD'
@@ -4952,10 +4952,10 @@
 003b0c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003b12: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=166
         0x0007 line=167
-      locals        : 
+      locals        :
 
     #14              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodE'
@@ -4973,10 +4973,10 @@
 003b2c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003b32: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=189
         0x0007 line=190
-      locals        : 
+      locals        :
 
     #15              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodF'
@@ -4994,10 +4994,10 @@
 003b4c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003b52: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=209
         0x0007 line=210
-      locals        : 
+      locals        :
 
     #16              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodG'
@@ -5015,10 +5015,10 @@
 003b6c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003b72: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=247
         0x0007 line=248
-      locals        : 
+      locals        :
 
     #17              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodH'
@@ -5036,10 +5036,10 @@
 003b8c: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003b92: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=284
         0x0007 line=285
-      locals        : 
+      locals        :
 
     #18              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodI'
@@ -5057,10 +5057,10 @@
 003bac: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003bb2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=323
         0x0007 line=324
-      locals        : 
+      locals        :
 
     #19              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodJ'
@@ -5078,10 +5078,10 @@
 003bcc: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003bd2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=358
         0x0007 line=359
-      locals        : 
+      locals        :
 
     #20              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodK'
@@ -5099,10 +5099,10 @@
 003bec: 6e20 b300 1000                         |0004: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003bf2: 0e00                                   |0007: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=392
         0x0007 line=393
-      locals        : 
+      locals        :
 
     #21              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodO'
@@ -5118,10 +5118,10 @@
 003c04: 7100 8e00 0000                         |0000: invoke-static {}, LTestVariableArityLinkerMethod;.assertNotReached:()V // method@008e
 003c0a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=413
         0x0003 line=414
-      locals        : 
+      locals        :
 
     #22              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodP'
@@ -5137,10 +5137,10 @@
 003c1c: 7100 8e00 0000                         |0000: invoke-static {}, LTestVariableArityLinkerMethod;.assertNotReached:()V // method@008e
 003c22: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=441
         0x0003 line=442
-      locals        : 
+      locals        :
 
     #23              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodQ'
@@ -5156,10 +5156,10 @@
 003c34: 7100 8e00 0000                         |0000: invoke-static {}, LTestVariableArityLinkerMethod;.assertNotReached:()V // method@008e
 003c3a: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=468
         0x0003 line=469
-      locals        : 
+      locals        :
 
     #24              : (in LTestVariableArityLinkerMethod;)
       name          : 'methodR'
@@ -5175,10 +5175,10 @@
 003c4c: 7100 8e00 0000                         |0000: invoke-static {}, LTestVariableArityLinkerMethod;.assertNotReached:()V // method@008e
 003c52: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=501
         0x0003 line=502
-      locals        : 
+      locals        :
 
     #25              : (in LTestVariableArityLinkerMethod;)
       name          : 'printBsmArgs'
@@ -5273,7 +5273,7 @@
 003d9a: 6e20 b300 1000                         |009b: invoke-virtual {v0, v1}, Ljava/io/PrintStream;.println:(Ljava/lang/String;)V // method@00b3
 003da0: 0e00                                   |009e: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=29
         0x0005 line=30
         0x000c line=31
@@ -5295,11 +5295,11 @@
         0x0093 line=31
         0x0097 line=52
         0x009e line=53
-      locals        : 
-        0x002b - 0x008b reg=1 array Ljava/lang/Object; 
-        0x000d - 0x0097 reg=0 i I 
-        0x0000 - 0x009f reg=4 method Ljava/lang/String; 
-        0x0000 - 0x009f reg=5 args [Ljava/lang/Object; 
+      locals        :
+        0x002b - 0x008b reg=1 array Ljava/lang/Object;
+        0x000d - 0x0097 reg=0 i I
+        0x0000 - 0x009f reg=4 method Ljava/lang/String;
+        0x0000 - 0x009f reg=5 args [Ljava/lang/Object;
 
     #26              : (in LTestVariableArityLinkerMethod;)
       name          : 'test'
@@ -5423,7 +5423,7 @@
           Ljava/lang/BootstrapMethodError; -> 0x008e
         0x00b3 - 0x00b9
           Ljava/lang/BootstrapMethodError; -> 0x00ba
-      positions     : 
+      positions     :
         0x0000 line=506
         0x0005 line=507
         0x0008 line=508
@@ -5472,13 +5472,13 @@
         0x00cb line=565
         0x00d2 line=566
         0x00df line=568
-      locals        : 
-        0x0002 - 0x0011 reg=1 i I 
-        0x0012 - 0x0020 reg=0 i I 
-        0x0037 - 0x005b reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x0063 - 0x0087 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x008f - 0x00b3 reg=0 expected Ljava/lang/BootstrapMethodError; 
-        0x00bb - 0x00df reg=0 expected Ljava/lang/BootstrapMethodError; 
+      locals        :
+        0x0002 - 0x0011 reg=1 i I
+        0x0012 - 0x0020 reg=0 i I
+        0x0037 - 0x005b reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x0063 - 0x0087 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x008f - 0x00b3 reg=0 expected Ljava/lang/BootstrapMethodError;
+        0x00bb - 0x00df reg=0 expected Ljava/lang/BootstrapMethodError;
 
   Virtual methods   -
   source_file_idx   : 156 (TestVariableArityLinkerMethod.java)
diff --git a/test/dexdump/invoke-polymorphic.txt b/test/dexdump/invoke-polymorphic.txt
index e279d01..59a4c03 100644
--- a/test/dexdump/invoke-polymorphic.txt
+++ b/test/dexdump/invoke-polymorphic.txt
@@ -62,10 +62,10 @@
 0001bc: 7010 0200 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
 0001c2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=9
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LMain; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LMain;
 
     #1              : (in LMain;)
       name          : 'main'
@@ -92,19 +92,19 @@
 000206: fa54 0300 1032 0400                    |0019: invoke-polymorphic {v0, v1, v2, v3, v4}, Ljava/lang/invoke/MethodHandle;.invoke:([Ljava/lang/Object;)Ljava/lang/Object;, (Ljava/lang/String;DI)V // method@0003, proto@0004
 00020e: 0e00                                   |001d: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0006 line=31
         0x0007 line=32
         0x0008 line=33
         0x0011 line=34
         0x0016 line=35
         0x001d line=56
-      locals        : 
-        0x0007 - 0x001e reg=0 handle Ljava/lang/invoke/MethodHandle; 
-        0x0008 - 0x001e reg=5 o Ljava/lang/Object; 
-        0x0011 - 0x001e reg=7 s Ljava/lang/String; 
-        0x0016 - 0x001e reg=8 x I 
-        0x0000 - 0x001e reg=9 args [Ljava/lang/String; 
+      locals        :
+        0x0007 - 0x001e reg=0 handle Ljava/lang/invoke/MethodHandle;
+        0x0008 - 0x001e reg=5 o Ljava/lang/Object;
+        0x0011 - 0x001e reg=7 s Ljava/lang/String;
+        0x0016 - 0x001e reg=8 x I
+        0x0000 - 0x001e reg=9 args [Ljava/lang/String;
 
   Virtual methods   -
   source_file_idx   : 12 (Main.java)
diff --git a/test/dexdump/quoting.txt b/test/dexdump/quoting.txt
index 9d5347a..2316b74 100644
--- a/test/dexdump/quoting.txt
+++ b/test/dexdump/quoting.txt
@@ -58,10 +58,10 @@
 000158: 7010 0300 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0003
 00015e: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=2
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LQuoting; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LQuoting;
 
   Virtual methods   -
     #0              : (in LQuoting;)
@@ -86,11 +86,11 @@
 000194: 0c00                                   |0012: move-result-object v0
 000196: 1100                                   |0013: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=5
-      locals        : 
-        0x0000 - 0x0014 reg=2 this LQuoting; 
-        0x0000 - 0x0014 reg=3 (null) Ljava/lang/String; 
+      locals        :
+        0x0000 - 0x0014 reg=2 this LQuoting;
+        0x0000 - 0x0014 reg=3 (null) Ljava/lang/String;
 
     #1              : (in LQuoting;)
       name          : 'unicode'
@@ -106,10 +106,10 @@
 0001a8: 1a00 0000                              |0000: const-string v0, "\b\f\n\r\t\\\"'😜☈'\"" // string@0000
 0001ac: 1100                                   |0002: return-object v0
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=10
-      locals        : 
-        0x0000 - 0x0003 reg=1 this LQuoting; 
+      locals        :
+        0x0000 - 0x0003 reg=1 this LQuoting;
 
   source_file_idx   : 9 (Quoting.java)
 
diff --git a/test/dexdump/staticfields.txt b/test/dexdump/staticfields.txt
index 9afed2f..27acd30 100644
--- a/test/dexdump/staticfields.txt
+++ b/test/dexdump/staticfields.txt
@@ -117,10 +117,10 @@
 0001bc: 7010 0100 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0001
 0001c2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=24
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LStaticFields; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LStaticFields;
 
   Virtual methods   -
   source_file_idx   : 11 (StaticFields.java)
diff --git a/test/dexdump/values.txt b/test/dexdump/values.txt
index c40fa64..0c50549 100644
--- a/test/dexdump/values.txt
+++ b/test/dexdump/values.txt
@@ -329,9 +329,9 @@
 0003be: 6900 2c00                              |0001: sput-object v0, LTest;.mObject:Ljava/lang/Object; // field@002c
 0003c2: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=66
-      locals        : 
+      locals        :
 
     #1              : (in LTest;)
       name          : '<init>'
@@ -347,10 +347,10 @@
 0003d4: 7010 0200 0000                         |0000: invoke-direct {v0}, Ljava/lang/Object;.<init>:()V // method@0002
 0003da: 0e00                                   |0003: return-void
       catches       : (none)
-      positions     : 
+      positions     :
         0x0000 line=1
-      locals        : 
-        0x0000 - 0x0004 reg=0 this LTest; 
+      locals        :
+        0x0000 - 0x0004 reg=0 this LTest;
 
   Virtual methods   -
   source_file_idx   : 13 (Test.java)