Merge pull request #9 from theseus-rs/fix-instruction-serialization

fix: correct tableswitch and lookupswitch serialization

.github/workflows/ci.yml

@@ -94,7 +94,7 @@ jobs:
 
       - name: Upload to codecov.io
         if: ${{ startsWith(matrix.os, 'ubuntu-') }}
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: lcov.info
           fail_ci_if_error: true

Cargo.toml

@@ -25,9 +25,9 @@ flate2 = "1.0.30"
 indoc = "2.0.5"
 reqwest = "0.12.5"
 tar = "0.4.41"
-thiserror = "1.0.61"
-tokio = "1.38.0"
-zip = "2.1.3"
+thiserror = "1.0.63"
+tokio = "1.39.1"
+zip = "2.1.5"
 
 [workspace.metadata.release]
 shared-version = true

ristretto_classfile/src/attributes/instruction.rs

@@ -820,8 +820,7 @@ impl Instruction {
                 high,
                 offsets,
             } => {
-                let current_position = i32::try_from(bytes.position())?;
-                let position = u32::try_from(current_position + 1)?;
+                let position = i32::try_from(bytes.position())?;
                 let padding = (4 - (position % 4)) % 4;
                 for _ in 0..padding {
                     bytes.write_u8(0)?;
@@ -834,8 +833,7 @@ impl Instruction {
                 }
             }
             Instruction::Lookupswitch { pairs, default } => {
-                let current_position = i32::try_from(bytes.position())?;
-                let position = u32::try_from(current_position + 1)?;
+                let position = i32::try_from(bytes.position())?;
                 let padding = (4 - (position % 4)) % 4;
                 for _ in 0..padding {
                     bytes.write_u8(0)?;
@@ -1229,6 +1227,8 @@ mod test {
         let mut bytes = Vec::new();
         buffer.set_position(0);
         buffer.read_to_end(&mut bytes)?;
+        assert_eq!(expected_bytes, bytes);
+
         let mut bytes = Cursor::new(expected_bytes.to_vec());
         assert_eq!(*instruction, Instruction::from_bytes(&mut bytes)?);
         Ok(())