commit b073a18e3fac05e647ddc6b45128a6158b34de2c
author cushon <cushon@google.com> Wed Sep 12 10:06:20 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Sep 12 10:07:59 2018 -0700
tree 9c940d017f650acacce46f375933cbaefe740158
parent 66e10972140d399dd018e7211636ccafffcfb9f2

Fix NestHost length computation
Fixes #5987

PiperOrigin-RevId: 212658573

third_party/ijar/classfile.cc

diff --git a/third_party/ijar/classfile.cc b/third_party/ijar/classfile.cc
index b77e769..7c03f51 100644
--- a/third_party/ijar/classfile.cc
+++ b/third_party/ijar/classfile.cc
@@ -1201,7 +1201,7 @@
   }
 
   void Write(u1 *&p) {
-    WriteProlog(p, -1);
+    WriteProlog(p, 2);
     put_u2be(p, host_class_index_->slot());
   }
 

third_party/ijar/test/ijar_test.sh

diff --git a/third_party/ijar/test/ijar_test.sh b/third_party/ijar/test/ijar_test.sh
index 703ac90..20b1d64 100755
--- a/third_party/ijar/test/ijar_test.sh
+++ b/third_party/ijar/test/ijar_test.sh
@@ -521,9 +521,14 @@
 function test_nestmates_attribute() {
   # Check that Java 11 NestMates attributes are preserved
   $IJAR $NESTMATES_JAR $NESTMATES_IJAR || fail "ijar failed"
+
   $JAVAP -classpath $NESTMATES_IJAR -v NestTest >& $TEST_log \
     || fail "javap failed"
   expect_log "NestMembers" "NestMembers not preserved!"
+
+  $JAVAP -classpath $NESTMATES_IJAR -v 'NestTest$P' >& $TEST_log \
+    || fail "javap failed"
+  expect_log "NestHost" "NestHost not preserved!"
 }
 
 function test_source_debug_extension_attribute() {