From 6f745681fa39e18653996c19c3fe3a089efacf4f Mon Sep 17 00:00:00 2001 From: Mikhail Pyltsin Date: Tue, 12 Nov 2024 15:41:55 +0100 Subject: [PATCH] [java-decompiler] IDEA-363088 Broken line mapping for instanceOf - don't add an offset outside sequence (cherry picked from commit 326733956ba858cdfc4eb142c0eb6e8c2a8864cc) IJ-CR-149179 GitOrigin-RevId: e916a4db69c77b9f12381a39df472d4eb2cffe17 --- .../modules/decompiler/ExprProcessor.java | 4 +- .../engine/testData/results/Integer.dec | 12 -- .../testData/results/SwitchOnStatic.dec | 6 - .../testData/results/TestAnonymousClass.dec | 4 - .../engine/testData/results/TestClassLoop.dec | 9 - .../TestClassSimpleBytecodeMapping.dec | 1 - .../testData/results/TestClassTypes.dec | 4 - .../engine/testData/results/TestClassVar.dec | 4 - ...estComplexInstanceOfRecordPatternJavac.dec | 80 --------- .../engine/testData/results/TestConstType.dec | 2 - .../testData/results/TestEmptyBlocks.dec | 2 - .../testData/results/TestEnhancedForLoops.dec | 6 - .../engine/testData/results/TestFinally.dec | 5 - .../engine/testData/results/TestGenerics.dec | 4 - .../TestInstanceofPatternNotSupported.dec | 2 - .../results/TestInstanceofWithPattern.dec | 6 - .../testData/results/TestLocalsNames.dec | 2 - .../results/TestNamedSuspendFun2Kt.dec | 4 - ...TestSimpleInstanceOfRecordPatternJavac.dec | 100 ----------- .../results/TestSwitchClassReferencesEcj.dec | 20 --- .../TestSwitchClassReferencesFastExitEcj.dec | 168 +++++++----------- ...TestSwitchClassReferencesFastExitJavac.dec | 166 +++++++---------- .../TestSwitchClassReferencesJavac.dec | 20 --- .../results/TestSwitchGuarded2Javac.dec | 30 ---- .../testData/results/TestSwitchGuardedEcj.dec | 20 --- .../results/TestSwitchGuardedJavac.dec | 30 +--- .../TestSwitchNestedDeconstructionsJavac.dec | 109 +----------- .../testData/results/TestSwitchOnEnum.dec | 4 - .../results/TestSwitchOnEnumEclipse.dec | 4 - .../results/TestSwitchOnStringsEcj.dec | 18 -- .../results/TestSwitchOnStringsJavac.dec | 34 ---- .../TestSwitchPatternWithExpression.dec | 74 +------- .../testData/results/TestSwitchRules.dec | 8 - .../TestSwitchSimpleReferencesJavac.dec | 34 ---- ...hWithDeconstructionsWithoutNestedJavac.dec | 130 ++------------ .../results/TestSynchronizedUnprotected.dec | 7 - .../testData/results/TestTryCatchFinally.dec | 3 +- .../results/TestTryCatchFinallyJsrRet.dec | 4 - .../results/TestTryCatchFinallyMismatched.dec | 7 +- 39 files changed, 161 insertions(+), 986 deletions(-) diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java index 40b35942cf2a..2e4c62fb8070 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java @@ -277,8 +277,8 @@ public class ExprProcessor { if (offset >= 0) { offsets = new BitSet(); offsets.set(offset); - int end_offset = block.getOriginalOffset(i+1); - if (end_offset > offset) { + int end_offset = block.getOriginalOffset(i + 1); + if (end_offset > offset && seq.length() > i + 1) { offsets.set(offset, end_offset); } } diff --git a/plugins/java-decompiler/engine/testData/results/Integer.dec b/plugins/java-decompiler/engine/testData/results/Integer.dec index 52aee4200438..d2264599a654 100644 --- a/plugins/java-decompiler/engine/testData/results/Integer.dec +++ b/plugins/java-decompiler/engine/testData/results/Integer.dec @@ -927,8 +927,6 @@ class 'java/lang/Integer' { d 139 e 139 f 136 - 10 136 - 11 136 } method 'parseInt (Ljava/lang/String;I)I' { @@ -1390,8 +1388,6 @@ class 'java/lang/Integer' { 7 299 a 299 b 299 - c 299 - d 299 11 299 12 299 } @@ -1448,8 +1444,6 @@ class 'java/lang/Integer' { 26 329 27 329 28 330 - 29 330 - 2a 330 2e 331 2f 331 30 331 @@ -1553,8 +1547,6 @@ class 'java/lang/Integer' { b3 352 b4 352 b5 352 - b6 352 - b7 352 bb 352 bd 352 be 352 @@ -1568,8 +1560,6 @@ class 'java/lang/Integer' { d7 354 d8 354 dc 354 - dd 354 - de 354 e2 354 e3 354 e4 354 @@ -2111,8 +2101,6 @@ class 'java/lang/Integer$IntegerCache' { 5e 532 62 532 63 531 - 64 531 - 65 531 6f 535 70 535 71 535 diff --git a/plugins/java-decompiler/engine/testData/results/SwitchOnStatic.dec b/plugins/java-decompiler/engine/testData/results/SwitchOnStatic.dec index bec8cc53ba59..9858f71ffd9b 100644 --- a/plugins/java-decompiler/engine/testData/results/SwitchOnStatic.dec +++ b/plugins/java-decompiler/engine/testData/results/SwitchOnStatic.dec @@ -64,8 +64,6 @@ class 'SwitchOnStatic' { 5b 9 5c 9 5d 9 - 5e 9 - 5f 9 63 10 64 10 65 10 @@ -92,8 +90,6 @@ class 'SwitchOnStatic' { 1f 21 20 21 21 21 - 22 21 - 23 21 27 22 28 22 29 22 @@ -121,8 +117,6 @@ class 'SwitchOnStatic' { 23 34 24 34 25 34 - 26 34 - 27 34 2b 35 2c 35 2d 35 diff --git a/plugins/java-decompiler/engine/testData/results/TestAnonymousClass.dec b/plugins/java-decompiler/engine/testData/results/TestAnonymousClass.dec index 642cd8a7ea46..96ece0f295c6 100644 --- a/plugins/java-decompiler/engine/testData/results/TestAnonymousClass.dec +++ b/plugins/java-decompiler/engine/testData/results/TestAnonymousClass.dec @@ -163,10 +163,6 @@ class 'pkg/TestAnonymousClass' { c 48 d 54 e 54 - f 54 - 10 54 - 11 54 - 12 54 16 56 17 56 18 56 diff --git a/plugins/java-decompiler/engine/testData/results/TestClassLoop.dec b/plugins/java-decompiler/engine/testData/results/TestClassLoop.dec index 137a4edd73da..55fb740b842f 100644 --- a/plugins/java-decompiler/engine/testData/results/TestClassLoop.dec +++ b/plugins/java-decompiler/engine/testData/results/TestClassLoop.dec @@ -81,8 +81,6 @@ class 'pkg/TestClassLoop' { 1 5 2 5 3 5 - 4 5 - 5 5 } method 'testFinally ()V' { @@ -100,7 +98,6 @@ class 'pkg/TestClassLoop' { 28 18 29 18 2a 18 - 2b 18 } method 'testFinallyContinue ()V' { @@ -124,8 +121,6 @@ class 'pkg/TestClassLoop' { 2d 33 2e 33 2f 33 - 30 33 - 31 33 32 34 37 39 38 39 @@ -173,8 +168,6 @@ class 'pkg/TestClassLoop' { 24 53 25 53 28 54 - 29 54 - 2a 54 2e 56 2f 56 30 56 @@ -195,8 +188,6 @@ class 'pkg/TestClassLoop' { 4e 69 4f 69 50 51 - 51 51 - 52 51 56 73 57 73 58 73 diff --git a/plugins/java-decompiler/engine/testData/results/TestClassSimpleBytecodeMapping.dec b/plugins/java-decompiler/engine/testData/results/TestClassSimpleBytecodeMapping.dec index 706965c11a03..e58bbcf749d3 100644 --- a/plugins/java-decompiler/engine/testData/results/TestClassSimpleBytecodeMapping.dec +++ b/plugins/java-decompiler/engine/testData/results/TestClassSimpleBytecodeMapping.dec @@ -123,7 +123,6 @@ class 'pkg/TestClassSimpleBytecodeMapping' { 25 26 26 26 27 26 - 28 26 2e 29 } diff --git a/plugins/java-decompiler/engine/testData/results/TestClassTypes.dec b/plugins/java-decompiler/engine/testData/results/TestClassTypes.dec index a90e113aaabe..ef497fd44f30 100644 --- a/plugins/java-decompiler/engine/testData/results/TestClassTypes.dec +++ b/plugins/java-decompiler/engine/testData/results/TestClassTypes.dec @@ -104,8 +104,6 @@ class 'pkg/TestClassTypes' { 2f 28 30 28 31 28 - 32 28 - 33 28 34 29 37 31 38 31 @@ -113,8 +111,6 @@ class 'pkg/TestClassTypes' { 3a 31 3b 31 3c 31 - 3d 31 - 3e 31 3f 32 42 35 43 35 diff --git a/plugins/java-decompiler/engine/testData/results/TestClassVar.dec b/plugins/java-decompiler/engine/testData/results/TestClassVar.dec index 88e414ecfe39..04255cbfc6dd 100644 --- a/plugins/java-decompiler/engine/testData/results/TestClassVar.dec +++ b/plugins/java-decompiler/engine/testData/results/TestClassVar.dec @@ -53,8 +53,6 @@ class 'pkg/TestClassVar' { 1e 11 1f 11 20 11 - 21 11 - 22 11 26 12 27 12 28 12 @@ -89,8 +87,6 @@ class 'pkg/TestClassVar' { 10 29 11 29 14 29 - 15 29 - 16 29 1a 32 1b 32 1c 32 diff --git a/plugins/java-decompiler/engine/testData/results/TestComplexInstanceOfRecordPatternJavac.dec b/plugins/java-decompiler/engine/testData/results/TestComplexInstanceOfRecordPatternJavac.dec index 535f488393b1..88742edeb8bd 100644 --- a/plugins/java-decompiler/engine/testData/results/TestComplexInstanceOfRecordPatternJavac.dec +++ b/plugins/java-decompiler/engine/testData/results/TestComplexInstanceOfRecordPatternJavac.dec @@ -111,22 +111,6 @@ class 'pkg/TestComplexInstanceOfRecordPatternJavac' { 3d 12 3e 12 3f 13 - 40 13 - 41 13 - 42 13 - 43 13 - 44 13 - 45 13 - 46 13 - 47 13 - 48 13 - 49 13 - 4a 13 - 4b 13 - 4c 13 - 4d 13 - 4e 13 - 4f 13 } method 'instanceOfTest2 (Ljava/lang/Object;)V' { @@ -156,22 +140,6 @@ class 'pkg/TestComplexInstanceOfRecordPatternJavac' { 48 21 49 21 4a 22 - 4b 22 - 4c 22 - 4d 22 - 4e 22 - 4f 22 - 50 22 - 51 22 - 52 22 - 53 22 - 54 22 - 55 22 - 56 22 - 57 22 - 58 22 - 59 22 - 5a 22 } method 'instanceOfTest3 (Ljava/lang/Object;)V' { @@ -201,22 +169,6 @@ class 'pkg/TestComplexInstanceOfRecordPatternJavac' { 3d 30 3e 30 3f 31 - 40 31 - 41 31 - 42 31 - 43 31 - 44 31 - 45 31 - 46 31 - 47 31 - 48 31 - 49 31 - 4a 31 - 4b 31 - 4c 31 - 4d 31 - 4e 31 - 4f 31 } method 'instanceOfTest3_2 (Ljava/lang/Object;)V' { @@ -246,22 +198,6 @@ class 'pkg/TestComplexInstanceOfRecordPatternJavac' { 3d 39 3e 39 3f 40 - 40 40 - 41 40 - 42 40 - 43 40 - 44 40 - 45 40 - 46 40 - 47 40 - 48 40 - 49 40 - 4a 40 - 4b 40 - 4c 40 - 4d 40 - 4e 40 - 4f 40 } method 'instanceOfTest4 (Ljava/lang/Object;)V' { @@ -313,22 +249,6 @@ class 'pkg/TestComplexInstanceOfRecordPatternJavac' { bd 52 be 52 bf 53 - c0 53 - c1 53 - c2 53 - c3 53 - c4 53 - c5 53 - c6 53 - c7 53 - c8 53 - c9 53 - ca 53 - cb 53 - cc 53 - cd 53 - ce 53 - cf 53 } } diff --git a/plugins/java-decompiler/engine/testData/results/TestConstType.dec b/plugins/java-decompiler/engine/testData/results/TestConstType.dec index e628eb42f268..6d939a64e08c 100644 --- a/plugins/java-decompiler/engine/testData/results/TestConstType.dec +++ b/plugins/java-decompiler/engine/testData/results/TestConstType.dec @@ -106,8 +106,6 @@ class 'pkg/TestConstType' { 1d 9 1e 9 1f 9 - 20 9 - 21 9 22 10 25 12 26 12 diff --git a/plugins/java-decompiler/engine/testData/results/TestEmptyBlocks.dec b/plugins/java-decompiler/engine/testData/results/TestEmptyBlocks.dec index b24de0182d42..4e200cf5228d 100644 --- a/plugins/java-decompiler/engine/testData/results/TestEmptyBlocks.dec +++ b/plugins/java-decompiler/engine/testData/results/TestEmptyBlocks.dec @@ -30,8 +30,6 @@ class 'TestEmptyBlocks' { 9 9 a 9 d 9 - e 9 - f 9 1a 12 1b 12 1c 12 diff --git a/plugins/java-decompiler/engine/testData/results/TestEnhancedForLoops.dec b/plugins/java-decompiler/engine/testData/results/TestEnhancedForLoops.dec index b1b5663b18a5..ac7e94318afe 100644 --- a/plugins/java-decompiler/engine/testData/results/TestEnhancedForLoops.dec +++ b/plugins/java-decompiler/engine/testData/results/TestEnhancedForLoops.dec @@ -53,8 +53,6 @@ class 'pkg/TestEnhancedForLoops' { 38 9 39 9 3a 8 - 3b 8 - 3c 8 40 12 } @@ -74,8 +72,6 @@ class 'pkg/TestEnhancedForLoops' { 24 16 25 16 26 16 - 27 16 - 28 16 2c 19 } @@ -103,8 +99,6 @@ class 'pkg/TestEnhancedForLoops' { 2c 23 2d 23 2e 23 - 2f 23 - 30 23 34 26 } } diff --git a/plugins/java-decompiler/engine/testData/results/TestFinally.dec b/plugins/java-decompiler/engine/testData/results/TestFinally.dec index 610af2babf08..4d7bdac40175 100644 --- a/plugins/java-decompiler/engine/testData/results/TestFinally.dec +++ b/plugins/java-decompiler/engine/testData/results/TestFinally.dec @@ -40,9 +40,6 @@ class 'pkg/TestFinally' { 71 13 72 13 73 13 - 74 13 - 75 13 - 76 13 83 13 84 13 85 13 @@ -68,8 +65,6 @@ class 'pkg/TestFinally' { 99 15 9a 15 9b 15 - 9c 15 - 9d 15 a4 20 } diff --git a/plugins/java-decompiler/engine/testData/results/TestGenerics.dec b/plugins/java-decompiler/engine/testData/results/TestGenerics.dec index 927e8d1972fc..1044b1b9e8ac 100644 --- a/plugins/java-decompiler/engine/testData/results/TestGenerics.dec +++ b/plugins/java-decompiler/engine/testData/results/TestGenerics.dec @@ -150,8 +150,6 @@ class 'pkg/TestGenerics' { 23 33 24 33 25 33 - 26 33 - 27 33 2b 36 } @@ -189,8 +187,6 @@ class 'pkg/TestGenerics' { 27 40 28 40 29 40 - 2a 40 - 2b 40 2f 43 } diff --git a/plugins/java-decompiler/engine/testData/results/TestInstanceofPatternNotSupported.dec b/plugins/java-decompiler/engine/testData/results/TestInstanceofPatternNotSupported.dec index 44f737678917..49316e35e32c 100644 --- a/plugins/java-decompiler/engine/testData/results/TestInstanceofPatternNotSupported.dec +++ b/plugins/java-decompiler/engine/testData/results/TestInstanceofPatternNotSupported.dec @@ -48,8 +48,6 @@ class 'decompiler/TestInstanceofPatternNotSupported' { 1f 9 20 9 21 9 - 22 9 - 23 9 27 10 28 10 29 10 diff --git a/plugins/java-decompiler/engine/testData/results/TestInstanceofWithPattern.dec b/plugins/java-decompiler/engine/testData/results/TestInstanceofWithPattern.dec index eb3511e4b9c9..91ca8100514c 100644 --- a/plugins/java-decompiler/engine/testData/results/TestInstanceofWithPattern.dec +++ b/plugins/java-decompiler/engine/testData/results/TestInstanceofWithPattern.dec @@ -100,8 +100,6 @@ class 'decompiler/TestInstanceofWithPattern' { 10 8 11 8 12 8 - 13 8 - 14 8 18 10 19 10 1a 10 @@ -138,8 +136,6 @@ class 'decompiler/TestInstanceofWithPattern' { 1f 20 20 20 21 20 - 22 20 - 23 20 27 21 28 21 29 21 @@ -185,8 +181,6 @@ class 'decompiler/TestInstanceofWithPattern' { 21 31 22 31 23 31 - 24 31 - 25 31 29 36 2a 36 2b 36 diff --git a/plugins/java-decompiler/engine/testData/results/TestLocalsNames.dec b/plugins/java-decompiler/engine/testData/results/TestLocalsNames.dec index 6514052e1f04..2ad6d610b3be 100644 --- a/plugins/java-decompiler/engine/testData/results/TestLocalsNames.dec +++ b/plugins/java-decompiler/engine/testData/results/TestLocalsNames.dec @@ -79,8 +79,6 @@ class 'pkg/TestLocalsNames' { 7b 13 7c 13 81 10 - 82 10 - 83 10 87 16 88 16 89 16 diff --git a/plugins/java-decompiler/engine/testData/results/TestNamedSuspendFun2Kt.dec b/plugins/java-decompiler/engine/testData/results/TestNamedSuspendFun2Kt.dec index 1ef25b384bab..4f39ff9539af 100644 --- a/plugins/java-decompiler/engine/testData/results/TestNamedSuspendFun2Kt.dec +++ b/plugins/java-decompiler/engine/testData/results/TestNamedSuspendFun2Kt.dec @@ -235,8 +235,6 @@ class 'TestNamedSuspendFun2Kt' { 1c 50 1d 50 1e 50 - 1f 50 - 20 50 21 51 28 55 2c 55 @@ -438,8 +436,6 @@ class 'TestNamedSuspendFun2Kt' { 129 106 12a 106 12b 106 - 12c 106 - 12d 106 133 120 134 120 138 120 diff --git a/plugins/java-decompiler/engine/testData/results/TestSimpleInstanceOfRecordPatternJavac.dec b/plugins/java-decompiler/engine/testData/results/TestSimpleInstanceOfRecordPatternJavac.dec index b4f768da98c1..547f64e77535 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSimpleInstanceOfRecordPatternJavac.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSimpleInstanceOfRecordPatternJavac.dec @@ -150,22 +150,6 @@ class 'pkg/TestSimpleInstanceOfRecordPatternJavac' { 20 11 21 11 22 12 - 23 12 - 24 12 - 25 12 - 26 12 - 27 12 - 28 12 - 29 12 - 2a 12 - 2b 12 - 2c 12 - 2d 12 - 2e 12 - 2f 12 - 30 12 - 31 12 - 32 12 } method 'tryInstanceOfTest1 (Ljava/lang/Object;)V' { @@ -249,22 +233,6 @@ class 'pkg/TestSimpleInstanceOfRecordPatternJavac' { 3a 47 3b 47 3c 48 - 3d 48 - 3e 48 - 3f 48 - 40 48 - 41 48 - 42 48 - 43 48 - 44 48 - 45 48 - 46 48 - 47 48 - 48 48 - 49 48 - 4a 48 - 4b 48 - 4c 48 } method 'instanceOfTest3 (Ljava/lang/Object;)V' { @@ -325,22 +293,6 @@ class 'pkg/TestSimpleInstanceOfRecordPatternJavac' { 52 61 53 61 54 62 - 55 62 - 56 62 - 57 62 - 58 62 - 59 62 - 5a 62 - 5b 62 - 5c 62 - 5d 62 - 5e 62 - 5f 62 - 60 62 - 61 62 - 62 62 - 63 62 - 64 62 } method 'instanceOfTest4 (Ljava/lang/Object;)V' { @@ -412,22 +364,6 @@ class 'pkg/TestSimpleInstanceOfRecordPatternJavac' { 7b 77 7c 77 7d 78 - 7e 78 - 7f 78 - 80 78 - 81 78 - 82 78 - 83 78 - 84 78 - 85 78 - 86 78 - 87 78 - 88 78 - 89 78 - 8a 78 - 8b 78 - 8c 78 - 8d 78 } method 'instanceOfTestDouble1 (Ljava/lang/Object;Ljava/lang/Object;)V' { @@ -462,22 +398,6 @@ class 'pkg/TestSimpleInstanceOfRecordPatternJavac' { 3e 89 3f 89 40 90 - 41 90 - 42 90 - 43 90 - 44 90 - 45 90 - 46 90 - 47 90 - 48 90 - 49 90 - 4a 90 - 4b 90 - 4c 90 - 4d 90 - 4e 90 - 4f 90 - 50 90 } method 'instanceOfTestDouble2 (Ljava/lang/Object;Ljava/lang/Object;)V' { @@ -511,22 +431,6 @@ class 'pkg/TestSimpleInstanceOfRecordPatternJavac' { 49 101 4a 101 4b 102 - 4c 102 - 4d 102 - 4e 102 - 4f 102 - 50 102 - 51 102 - 52 102 - 53 102 - 54 102 - 55 102 - 56 102 - 57 102 - 58 102 - 59 102 - 5a 102 - 5b 102 } method 'instanceOfTestDoubleNegate2 (Ljava/lang/Object;Ljava/lang/Object;)V' { @@ -547,8 +451,6 @@ class 'pkg/TestSimpleInstanceOfRecordPatternJavac' { 1f 107 20 107 21 107 - 22 107 - 23 107 42 108 43 108 44 108 @@ -566,8 +468,6 @@ class 'pkg/TestSimpleInstanceOfRecordPatternJavac' { 50 109 51 109 52 110 - 53 110 - 54 110 } } diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesEcj.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesEcj.dec index e04656a055fe..1d3258f138ae 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesEcj.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesEcj.dec @@ -51,8 +51,6 @@ class 'pkg/TestSwitchClassReferencesEcj' { 34 5 35 5 36 5 - 37 5 - 38 5 40 6 41 6 42 6 @@ -61,8 +59,6 @@ class 'pkg/TestSwitchClassReferencesEcj' { 45 6 46 6 47 6 - 48 6 - 49 6 50 7 51 7 52 7 @@ -80,8 +76,6 @@ class 'pkg/TestSwitchClassReferencesEcj' { 30 15 31 15 32 15 - 33 15 - 34 15 3c 16 3d 16 3e 16 @@ -90,14 +84,10 @@ class 'pkg/TestSwitchClassReferencesEcj' { 41 16 42 16 43 16 - 44 16 - 45 16 4c 17 4d 17 4e 17 50 17 - 51 17 - 52 17 56 14 57 14 58 14 @@ -117,8 +107,6 @@ class 'pkg/TestSwitchClassReferencesEcj' { 2c 25 2d 25 2e 25 - 2f 25 - 30 25 38 26 39 26 3a 26 @@ -127,16 +115,12 @@ class 'pkg/TestSwitchClassReferencesEcj' { 3d 26 3e 26 3f 26 - 40 26 - 41 26 45 24 46 24 47 24 48 24 49 24 4a 24 - 4b 24 - 4c 24 50 27 51 27 52 27 @@ -156,8 +140,6 @@ class 'pkg/TestSwitchClassReferencesEcj' { 30 34 31 34 32 34 - 33 34 - 34 34 3c 35 3d 35 3e 35 @@ -166,8 +148,6 @@ class 'pkg/TestSwitchClassReferencesEcj' { 41 35 42 35 43 35 - 44 35 - 45 35 49 36 4a 36 4b 36 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesFastExitEcj.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesFastExitEcj.dec index 50696ba0dcb5..7c3eeb3980c6 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesFastExitEcj.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesFastExitEcj.dec @@ -11,14 +11,14 @@ public class TestSwitchClassReferencesFastExitEcj { case String s:// 9 System.out.println("s");// 10 System.exit(0);// 11 - ++i;// 12 13 14 15 16 17 18 + ++i;// 12 break; - case Integer in: - System.out.println("ii"); - continue label16; + case Integer in:// 13 + System.out.println("ii");// 14 + continue label16;// 15 default: - System.out.println("s"); - return;// 6 + System.out.println("s");// 17 + return;// 18 } } } @@ -34,14 +34,14 @@ public class TestSwitchClassReferencesFastExitEcj { case String s:// 29 System.out.println("s");// 30 System.exit(0);// 31 - ++i;// 32 34 35 36 38 39 40 + ++i;// 32 break; - case Integer in: - System.out.println("ii"); - continue label16; + case Integer in:// 34 + System.out.println("ii");// 35 + continue label16;// 36 default: - System.out.println("s"); - return;// 26 + System.out.println("s");// 39 + return;// 40 } } } @@ -69,53 +69,31 @@ class 'pkg/TestSwitchClassReferencesFastExitEcj' { 40 12 41 12 42 13 - 43 13 - 44 13 - 45 13 - 46 13 - 47 13 - 48 13 - 49 13 - 4a 13 - 4b 13 - 4c 13 - 4d 13 - 4e 13 - 4f 13 - 50 13 - 51 13 - 52 13 - 53 13 - 54 13 - 55 13 - 56 13 - 57 13 - 58 13 - 59 13 - 5a 13 - 5b 13 - 5c 13 - 5d 13 - 5e 13 - 5f 13 - 60 13 - 61 13 - 62 13 - 63 13 + 49 15 + 4a 15 + 4b 16 + 4c 16 + 4d 16 + 4e 16 + 4f 16 + 50 16 + 53 17 + 59 19 + 5a 19 + 5b 19 + 5c 19 + 5d 19 + 5e 19 + 5f 19 + 60 19 + 61 20 64 14 - 65 20 - 66 20 67 8 68 8 69 8 6a 8 6b 8 6c 8 - 6d 20 - 6e 20 - 6f 20 - 70 20 - 71 20 } method 'testObject2 (Ljava/lang/Object;)V' { @@ -138,83 +116,61 @@ class 'pkg/TestSwitchClassReferencesFastExitEcj' { 40 35 41 35 42 36 - 43 36 - 44 36 - 45 36 - 46 36 - 47 36 - 48 36 - 49 36 - 4a 36 - 4b 36 - 4c 36 - 4d 36 - 4e 36 - 4f 36 - 50 36 - 51 36 - 52 36 - 53 36 - 54 36 - 55 36 - 56 36 - 57 36 - 58 36 - 59 36 - 5a 36 - 5b 36 - 5c 36 - 5d 36 - 5e 36 - 5f 36 - 60 36 - 61 36 - 62 36 - 63 36 + 49 38 + 4a 38 + 4b 39 + 4c 39 + 4d 39 + 4e 39 + 4f 39 + 50 39 + 53 40 + 59 42 + 5a 42 + 5b 42 + 5c 42 + 5d 42 + 5e 42 + 5f 42 + 60 42 + 61 43 64 37 - 65 43 - 66 43 67 31 68 31 69 31 6a 31 6b 31 6c 31 - 6d 43 - 6e 43 - 6f 43 - 70 43 - 71 43 } } Lines mapping: -6 <-> 21 7 <-> 7 8 <-> 10 9 <-> 11 10 <-> 12 11 <-> 13 12 <-> 14 -13 <-> 14 -14 <-> 14 -15 <-> 14 -16 <-> 14 -17 <-> 14 -18 <-> 14 -26 <-> 44 +13 <-> 16 +14 <-> 17 +15 <-> 18 +17 <-> 20 +18 <-> 21 27 <-> 30 28 <-> 33 29 <-> 34 30 <-> 35 31 <-> 36 32 <-> 37 -34 <-> 37 -35 <-> 37 -36 <-> 37 -38 <-> 37 -39 <-> 37 -40 <-> 37 +34 <-> 39 +35 <-> 40 +36 <-> 41 +39 <-> 43 +40 <-> 44 Not mapped: +6 +16 22 +26 +38 45 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesFastExitJavac.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesFastExitJavac.dec index b0e9a4568fc9..ec39aeaec9a4 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesFastExitJavac.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesFastExitJavac.dec @@ -11,14 +11,14 @@ public class TestSwitchClassReferencesFastExitJavac { case String s:// 10 System.out.println("s");// 11 System.exit(0);// 12 - ++i;// 13 14 15 16 17 18 19 + ++i;// 13 break; - case Integer in: - System.out.println("ii"); - continue label15; + case Integer in:// 14 + System.out.println("ii");// 15 + continue label15;// 16 default: - System.out.println("s"); - return; + System.out.println("s");// 18 + return;// 19 } } } @@ -34,14 +34,14 @@ public class TestSwitchClassReferencesFastExitJavac { case String s:// 30 System.out.println("s");// 31 System.exit(0);// 32 - ++i;// 33 35 36 37 39 40 41 + ++i;// 33 break; - case Integer in: - System.out.println("ii"); - continue label15; + case Integer in:// 35 + System.out.println("ii");// 36 + continue label15;// 37 default: - System.out.println("s"); - return; + System.out.println("s");// 40 + return;// 41 } } } @@ -75,48 +75,25 @@ class 'pkg/TestSwitchClassReferencesFastExitJavac' { 44 12 45 12 46 13 - 47 13 - 48 13 - 49 13 - 4a 13 - 4b 13 - 4c 13 - 4d 13 - 4e 13 - 4f 13 - 50 13 - 51 13 - 52 13 - 53 13 - 54 13 - 55 13 - 56 13 - 57 13 - 58 13 - 59 13 - 5a 13 - 5b 13 - 5c 13 - 5d 13 - 5e 13 - 5f 13 - 60 13 - 61 13 - 62 13 - 63 13 - 64 13 - 65 13 - 66 13 - 67 13 - 68 20 - 69 20 - 6a 20 + 4d 15 + 4e 15 + 4f 16 + 50 16 + 51 16 + 52 16 + 53 16 + 54 16 + 57 17 + 5d 19 + 5e 19 + 5f 19 + 60 19 + 61 19 + 62 19 + 63 19 + 64 19 + 65 20 6b 14 - 6c 20 - 6d 20 - 6e 20 - 6f 20 - 70 20 } method 'testObject2 (Ljava/lang/Object;)V' { @@ -145,48 +122,25 @@ class 'pkg/TestSwitchClassReferencesFastExitJavac' { 44 35 45 35 46 36 - 47 36 - 48 36 - 49 36 - 4a 36 - 4b 36 - 4c 36 - 4d 36 - 4e 36 - 4f 36 - 50 36 - 51 36 - 52 36 - 53 36 - 54 36 - 55 36 - 56 36 - 57 36 - 58 36 - 59 36 - 5a 36 - 5b 36 - 5c 36 - 5d 36 - 5e 36 - 5f 36 - 60 36 - 61 36 - 62 36 - 63 36 - 64 36 - 65 36 - 66 36 - 67 36 - 68 43 - 69 43 - 6a 43 + 4d 38 + 4e 38 + 4f 39 + 50 39 + 51 39 + 52 39 + 53 39 + 54 39 + 57 40 + 5d 42 + 5e 42 + 5f 42 + 60 42 + 61 42 + 62 42 + 63 42 + 64 42 + 65 43 6b 37 - 6c 43 - 6d 43 - 6e 43 - 6f 43 - 70 43 } } @@ -197,24 +151,24 @@ Lines mapping: 11 <-> 12 12 <-> 13 13 <-> 14 -14 <-> 14 -15 <-> 14 -16 <-> 14 -17 <-> 14 -18 <-> 14 -19 <-> 14 +14 <-> 16 +15 <-> 17 +16 <-> 18 +18 <-> 20 +19 <-> 21 28 <-> 30 29 <-> 33 30 <-> 34 31 <-> 35 32 <-> 36 33 <-> 37 -35 <-> 37 -36 <-> 37 -37 <-> 37 -39 <-> 37 -40 <-> 37 -41 <-> 37 +35 <-> 39 +36 <-> 40 +37 <-> 41 +40 <-> 43 +41 <-> 44 Not mapped: +17 23 +39 46 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesJavac.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesJavac.dec index 3b3cbb3bfb49..631ce204c336 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesJavac.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchClassReferencesJavac.dec @@ -51,8 +51,6 @@ class 'pkg/TestSwitchClassReferencesJavac' { 34 5 35 5 36 5 - 37 5 - 38 5 40 6 41 6 42 6 @@ -61,8 +59,6 @@ class 'pkg/TestSwitchClassReferencesJavac' { 45 6 46 6 47 6 - 48 6 - 49 6 50 7 51 7 52 7 @@ -80,8 +76,6 @@ class 'pkg/TestSwitchClassReferencesJavac' { 3a 15 3b 15 3c 15 - 3d 15 - 3e 15 46 16 47 16 48 16 @@ -90,14 +84,10 @@ class 'pkg/TestSwitchClassReferencesJavac' { 4b 16 4c 16 4d 16 - 4e 16 - 4f 16 56 17 57 17 58 17 5a 17 - 5b 17 - 5c 17 60 14 61 14 62 14 @@ -117,8 +107,6 @@ class 'pkg/TestSwitchClassReferencesJavac' { 2c 25 2d 25 2e 25 - 2f 25 - 30 25 38 26 39 26 3a 26 @@ -127,16 +115,12 @@ class 'pkg/TestSwitchClassReferencesJavac' { 3d 26 3e 26 3f 26 - 40 26 - 41 26 45 24 46 24 47 24 48 24 49 24 4a 24 - 4b 24 - 4c 24 50 27 51 27 52 27 @@ -156,8 +140,6 @@ class 'pkg/TestSwitchClassReferencesJavac' { 34 34 35 34 36 34 - 37 34 - 38 34 40 35 41 35 42 35 @@ -166,8 +148,6 @@ class 'pkg/TestSwitchClassReferencesJavac' { 45 35 46 35 47 35 - 48 35 - 49 35 4d 36 4e 36 4f 36 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchGuarded2Javac.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchGuarded2Javac.dec index a146250a3760..fe646a162e37 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchGuarded2Javac.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchGuarded2Javac.dec @@ -189,7 +189,6 @@ class 'pkg/TestSwitchGuarded2Javac' { 5c 17 5d 17 5e 17 - 5f 17 6e 20 6f 21 70 21 @@ -203,7 +202,6 @@ class 'pkg/TestSwitchGuarded2Javac' { 85 23 86 23 87 23 - 88 23 8f 18 } @@ -249,8 +247,6 @@ class 'pkg/TestSwitchGuarded2Javac' { 5f 38 60 38 61 38 - 62 38 - 63 38 64 39 6b 40 6c 40 @@ -274,8 +270,6 @@ class 'pkg/TestSwitchGuarded2Javac' { 87 42 88 42 89 42 - 8a 42 - 8b 42 93 45 94 45 95 45 @@ -291,16 +285,12 @@ class 'pkg/TestSwitchGuarded2Javac' { a6 46 a7 46 a8 46 - a9 46 - aa 46 ab 47 b1 49 b2 49 b3 49 b4 49 b5 49 - b6 49 - b7 49 b8 50 bb 53 bc 53 @@ -351,8 +341,6 @@ class 'pkg/TestSwitchGuarded2Javac' { 11f 63 120 63 121 63 - 122 63 - 123 63 124 64 12b 65 12c 65 @@ -376,8 +364,6 @@ class 'pkg/TestSwitchGuarded2Javac' { 147 67 148 67 149 67 - 14a 67 - 14b 67 153 70 154 70 155 70 @@ -393,16 +379,12 @@ class 'pkg/TestSwitchGuarded2Javac' { 166 71 167 71 168 71 - 169 71 - 16a 71 16b 72 171 74 172 74 173 74 174 74 175 74 - 176 74 - 177 74 178 75 17b 78 17c 78 @@ -443,8 +425,6 @@ class 'pkg/TestSwitchGuarded2Javac' { 42 89 43 89 44 89 - 45 89 - 46 89 47 90 4d 92 4e 92 @@ -485,8 +465,6 @@ class 'pkg/TestSwitchGuarded2Javac' { 9e 103 9f 103 a0 103 - a1 103 - a2 103 a3 104 a9 106 aa 106 @@ -545,8 +523,6 @@ class 'pkg/TestSwitchGuarded2Javac' { 5f 122 60 122 61 122 - 62 122 - 63 122 64 123 6b 124 6c 124 @@ -570,8 +546,6 @@ class 'pkg/TestSwitchGuarded2Javac' { 87 126 88 126 89 126 - 8a 126 - 8b 126 93 129 94 129 95 129 @@ -587,16 +561,12 @@ class 'pkg/TestSwitchGuarded2Javac' { a6 130 a7 130 a8 130 - a9 130 - aa 130 ab 131 b1 133 b2 133 b3 133 b4 133 b5 133 - b6 133 - b7 133 b8 134 bb 137 bc 137 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchGuardedEcj.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchGuardedEcj.dec index 383d241b0732..fab57c4f284b 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchGuardedEcj.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchGuardedEcj.dec @@ -84,8 +84,6 @@ class 'pkg/TestSwitchGuardedEcj' { 4d 8 4e 8 4f 8 - 50 8 - 51 8 59 9 5a 9 5b 9 @@ -94,8 +92,6 @@ class 'pkg/TestSwitchGuardedEcj' { 5e 9 5f 9 60 9 - 61 9 - 62 9 6a 10 6b 10 6c 10 @@ -104,8 +100,6 @@ class 'pkg/TestSwitchGuardedEcj' { 6f 10 70 10 71 10 - 72 10 - 73 10 7a 11 7b 11 7c 11 @@ -143,8 +137,6 @@ class 'pkg/TestSwitchGuardedEcj' { 4d 20 4e 20 4f 20 - 50 20 - 51 20 59 22 5a 22 5b 23 @@ -153,8 +145,6 @@ class 'pkg/TestSwitchGuardedEcj' { 5e 23 5f 23 60 23 - 61 23 - 62 23 6a 25 6b 25 6c 26 @@ -163,8 +153,6 @@ class 'pkg/TestSwitchGuardedEcj' { 6f 26 70 26 71 26 - 72 26 - 73 26 7a 29 7b 29 7c 29 @@ -194,8 +182,6 @@ class 'pkg/TestSwitchGuardedEcj' { 4d 40 4e 40 4f 40 - 50 40 - 51 40 52 41 59 42 5a 42 @@ -205,8 +191,6 @@ class 'pkg/TestSwitchGuardedEcj' { 5e 43 5f 43 60 43 - 61 43 - 62 43 63 44 6a 45 6b 45 @@ -216,16 +200,12 @@ class 'pkg/TestSwitchGuardedEcj' { 6f 46 70 46 71 46 - 72 46 - 73 46 74 47 7a 49 7b 49 7c 49 7d 49 7e 49 - 7f 49 - 80 49 81 50 84 37 85 37 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchGuardedJavac.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchGuardedJavac.dec index 035ab1024ef1..a9d31530e754 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchGuardedJavac.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchGuardedJavac.dec @@ -17,8 +17,8 @@ public class TestSwitchGuardedJavac { public static void testObject2(Object o) { switch (o) {// 20 - case String s when s.isEmpty() && s.getBytes().length == 2:// 21 - System.out.println("empty s"); + case String s when s.isEmpty() && s.getBytes().length == 2: + System.out.println("empty s");// 21 return;// 26 case String s:// 22 System.out.println("s"); @@ -84,8 +84,6 @@ class 'pkg/TestSwitchGuardedJavac' { 49 8 4a 8 4b 8 - 4c 8 - 4d 8 55 9 56 9 57 9 @@ -94,8 +92,6 @@ class 'pkg/TestSwitchGuardedJavac' { 5a 9 5b 9 5c 9 - 5d 9 - 5e 9 66 10 67 10 68 10 @@ -104,15 +100,11 @@ class 'pkg/TestSwitchGuardedJavac' { 6b 10 6c 10 6d 10 - 6e 10 - 6f 10 76 11 77 11 78 11 79 11 7a 11 - 7b 11 - 7c 11 80 14 81 14 82 14 @@ -145,8 +137,6 @@ class 'pkg/TestSwitchGuardedJavac' { 49 20 4a 20 4b 20 - 4c 20 - 4d 20 55 22 56 22 57 23 @@ -155,8 +145,6 @@ class 'pkg/TestSwitchGuardedJavac' { 5a 23 5b 23 5c 23 - 5d 23 - 5e 23 66 25 67 25 68 26 @@ -165,15 +153,11 @@ class 'pkg/TestSwitchGuardedJavac' { 6b 26 6c 26 6d 26 - 6e 26 - 6f 26 76 29 77 29 78 29 79 29 7a 29 - 7b 29 - 7c 29 80 21 } @@ -204,8 +188,6 @@ class 'pkg/TestSwitchGuardedJavac' { 51 40 52 40 53 40 - 54 40 - 55 40 56 41 5d 42 5e 42 @@ -215,8 +197,6 @@ class 'pkg/TestSwitchGuardedJavac' { 62 43 63 43 64 43 - 65 43 - 66 43 67 44 6e 45 6f 45 @@ -226,16 +206,12 @@ class 'pkg/TestSwitchGuardedJavac' { 73 46 74 46 75 46 - 76 46 - 77 46 78 47 7e 49 7f 49 80 49 81 49 82 49 - 83 49 - 84 49 85 50 8b 54 8c 54 @@ -259,7 +235,7 @@ Lines mapping: 16 <-> 15 17 <-> 16 20 <-> 19 -21 <-> 20 +21 <-> 21 22 <-> 23 23 <-> 26 24 <-> 30 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchNestedDeconstructionsJavac.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchNestedDeconstructionsJavac.dec index e54547e177a2..7bdfd254578e 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchNestedDeconstructionsJavac.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchNestedDeconstructionsJavac.dec @@ -45,7 +45,7 @@ public class TestSwitchNestedDeconstructionsJavac { public static void testStringString(Object o) { switch (o) {// 45 case R2(String s1, String s2): - if (s2.isEmpty()) {// 47 + if (s2.isEmpty()) {// 46 47 System.out.println("3");// 48 } break; @@ -55,7 +55,7 @@ public class TestSwitchNestedDeconstructionsJavac { } System.out.println("1");// 53 - }// 46 + } public static void testNestedLevel2(Object o) { switch (o) {// 57 @@ -107,11 +107,11 @@ public class TestSwitchNestedDeconstructionsJavac { switch (o) {// 94 case R1(R1(String s)) when s.hashCode() == 5 -> System.out.println("123456789");// 95 96 case R1(String s) when s.hashCode() == 3 -> System.out.println("3");// 98 99 - default -> System.out.println("3"); + default -> System.out.println("3");// 101 } System.out.println("1");// 103 - }// 101 + } public static void testDoubleLongCase(Object o) { switch (o) {// 107 @@ -255,8 +255,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { b6 10 b7 10 b8 10 - b9 10 - ba 10 c5 14 c6 14 c7 14 @@ -276,8 +274,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { df 16 e0 16 e1 16 - e2 16 - e3 16 eb 20 ec 20 ed 20 @@ -298,8 +294,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 106 22 107 22 108 22 - 109 22 - 10a 22 114 26 115 26 124 26 @@ -318,8 +312,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 13d 28 13e 28 13f 28 - 140 28 - 141 28 157 33 158 33 168 33 @@ -332,15 +324,11 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 171 34 172 34 173 34 - 174 34 - 175 34 17c 39 17d 39 17e 39 17f 39 180 39 - 181 39 - 182 39 197 13 } @@ -358,24 +346,18 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 5b 47 5c 47 5d 47 - 5e 47 - 5f 47 63 48 64 48 65 48 66 48 67 48 68 48 - 69 48 - 6a 48 6e 52 6f 52 70 52 71 52 72 52 73 52 - 74 52 - 75 52 76 53 79 56 7a 56 @@ -386,22 +368,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 7f 56 80 56 81 57 - 82 57 - 83 57 - 84 57 - 85 57 - 86 57 - 87 57 - 88 57 - 89 57 - 8a 57 - 8b 57 - 8c 57 - 8d 57 - 8e 57 - 8f 57 - 90 57 - 91 57 } method 'testNestedLevel2 (Ljava/lang/Object;)V' { @@ -428,8 +394,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 8c 63 8d 63 8e 63 - 8f 63 - 90 63 94 68 95 68 c3 67 @@ -450,15 +414,11 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { de 69 df 69 e0 69 - e1 69 - e2 69 ee 74 ef 74 f0 74 f1 74 f2 74 - f3 74 - f4 74 109 66 } @@ -486,8 +446,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 90 83 91 83 92 83 - 93 83 - 94 83 b4 87 b5 87 b6 87 @@ -509,8 +467,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { d0 89 d1 89 d2 89 - d3 89 - d4 89 e9 93 ea 93 eb 93 @@ -531,15 +487,11 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 104 95 105 95 106 95 - 107 95 - 108 95 114 100 115 100 116 100 117 100 118 100 - 119 100 - 11a 100 12f 86 } @@ -559,8 +511,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 83 107 84 107 85 107 - 86 107 - 87 107 92 108 93 108 94 108 @@ -574,16 +524,12 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { a4 108 a5 108 a6 108 - a7 108 - a8 108 b1 109 b2 109 b3 109 b4 109 b5 109 b6 109 - b7 109 - b8 109 bc 112 bd 112 be 112 @@ -593,22 +539,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { c2 112 c3 112 c4 113 - c5 113 - c6 113 - c7 113 - c8 113 - c9 113 - ca 113 - cb 113 - cc 113 - cd 113 - ce 113 - cf 113 - d0 113 - d1 113 - d2 113 - d3 113 - d4 113 } method 'testDoubleLongCase (Ljava/lang/Object;)V' { @@ -633,8 +563,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { b5 119 b6 119 b7 119 - b8 119 - b9 119 c4 122 c5 122 c6 122 @@ -654,8 +582,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { de 124 df 124 e0 124 - e1 124 - e2 124 ea 127 eb 127 ec 127 @@ -675,8 +601,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 104 129 105 129 106 129 - 107 129 - 108 129 112 132 113 132 122 132 @@ -694,8 +618,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 13a 134 13b 134 13c 134 - 13d 134 - 13e 134 154 138 155 138 165 138 @@ -708,15 +630,11 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 16e 139 16f 139 170 139 - 171 139 - 172 139 179 143 17a 143 17b 143 17c 143 17d 143 - 17e 143 - 17f 143 180 144 183 147 193 147 @@ -739,8 +657,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 235 150 236 150 237 150 - 238 150 - 239 150 244 154 245 154 246 154 @@ -760,8 +676,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 25e 156 25f 156 260 156 - 261 156 - 262 156 26a 160 26b 160 26c 160 @@ -781,8 +695,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 284 162 285 162 286 162 - 287 162 - 288 162 292 166 293 166 2a2 166 @@ -800,8 +712,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 2ba 168 2bb 168 2bc 168 - 2bd 168 - 2be 168 2d4 173 2d5 173 2e5 173 @@ -814,15 +724,11 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 2ee 174 2ef 174 2f0 174 - 2f1 174 - 2f2 174 2f9 179 2fa 179 2fb 179 2fc 179 2fd 179 - 2fe 179 - 2ff 179 314 153 } @@ -849,7 +755,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { 8b 190 8c 190 8d 190 - 8e 190 b2 193 b3 193 b4 193 @@ -868,8 +773,6 @@ class 'pkg/TestSwitchNestedDeconstructionsJavac' { d0 196 d1 196 d2 196 - d3 196 - d4 196 e9 191 } } @@ -947,7 +850,7 @@ Lines mapping: 40 <-> 40 42 <-> 14 45 <-> 46 -46 <-> 58 +46 <-> 48 47 <-> 48 48 <-> 49 51 <-> 53 @@ -978,7 +881,7 @@ Lines mapping: 96 <-> 108 98 <-> 109 99 <-> 109 -101 <-> 114 +101 <-> 110 103 <-> 113 107 <-> 117 108 <-> 118 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchOnEnum.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchOnEnum.dec index 06e7e1a2ca01..1ed7021dbdca 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchOnEnum.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchOnEnum.dec @@ -71,8 +71,6 @@ class 'pkg/TestSwitchOnEnum$Example' { 27 22 28 22 29 22 - 2a 22 - 2b 22 2c 23 2f 25 30 25 @@ -88,8 +86,6 @@ class 'pkg/TestSwitchOnEnum$Example' { 5b 30 5c 30 5d 30 - 5e 30 - 5f 30 60 31 63 33 64 33 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchOnEnumEclipse.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchOnEnumEclipse.dec index 0729506010e7..fa39fe5bdf1c 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchOnEnumEclipse.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchOnEnumEclipse.dec @@ -72,8 +72,6 @@ class 'pkg/TestSwitchOnEnumEclipse$Example' { 23 23 24 23 25 23 - 26 23 - 27 23 28 24 2b 26 2c 26 @@ -89,8 +87,6 @@ class 'pkg/TestSwitchOnEnumEclipse$Example' { 53 31 54 31 55 31 - 56 31 - 57 31 58 32 5b 34 5c 34 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchOnStringsEcj.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchOnStringsEcj.dec index 7dbd3601ad44..e893bc57a00d 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchOnStringsEcj.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchOnStringsEcj.dec @@ -159,8 +159,6 @@ class 'pkg/TestSwitchOnStringsEcj' { 32 24 33 24 34 24 - 35 24 - 36 24 37 25 3a 27 3b 27 @@ -193,8 +191,6 @@ class 'pkg/TestSwitchOnStringsEcj' { 42 37 43 37 44 37 - 45 37 - 46 37 4a 40 4b 40 4c 40 @@ -228,16 +224,12 @@ class 'pkg/TestSwitchOnStringsEcj' { 46 51 47 51 48 51 - 49 51 - 4a 51 4b 52 4e 54 4f 54 50 54 51 54 52 54 - 53 54 - 54 54 55 55 58 58 59 58 @@ -270,15 +262,11 @@ class 'pkg/TestSwitchOnStringsEcj' { 56 68 57 68 58 68 - 59 68 - 5a 68 5e 71 5f 71 60 71 61 71 62 71 - 63 71 - 64 71 68 74 69 74 6a 74 @@ -312,24 +300,18 @@ class 'pkg/TestSwitchOnStringsEcj' { 5a 85 5b 85 5c 85 - 5d 85 - 5e 85 5f 86 62 88 63 88 64 88 65 88 66 88 - 67 88 - 68 88 69 89 6c 91 6d 91 6e 91 6f 91 70 91 - 71 91 - 72 91 73 92 76 95 77 95 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchOnStringsJavac.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchOnStringsJavac.dec index fc92b383b45c..305c192b806f 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchOnStringsJavac.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchOnStringsJavac.dec @@ -196,8 +196,6 @@ class 'pkg/TestSwitchOnStringsJavac' { 46 25 47 25 48 25 - 49 25 - 4a 25 4e 26 4f 26 50 26 @@ -229,8 +227,6 @@ class 'pkg/TestSwitchOnStringsJavac' { 62 35 63 35 64 35 - 65 35 - 66 35 6a 36 6b 36 6c 36 @@ -264,15 +260,11 @@ class 'pkg/TestSwitchOnStringsJavac' { 62 45 63 45 64 45 - 65 45 - 66 45 6a 46 6b 46 6c 46 6d 46 6e 46 - 6f 46 - 70 46 74 47 75 47 76 47 @@ -304,15 +296,11 @@ class 'pkg/TestSwitchOnStringsJavac' { 7a 56 7b 56 7c 56 - 7d 56 - 7e 56 82 57 83 57 84 57 85 57 86 57 - 87 57 - 88 57 8c 58 8d 58 8e 58 @@ -346,22 +334,16 @@ class 'pkg/TestSwitchOnStringsJavac' { 7a 67 7b 67 7c 67 - 7d 67 - 7e 67 82 68 83 68 84 68 85 68 86 68 - 87 68 - 88 68 8c 69 8d 69 8e 69 8f 69 90 69 - 91 69 - 92 69 96 70 97 70 98 70 @@ -411,29 +393,21 @@ class 'pkg/TestSwitchOnStringsJavac' { 9e 81 9f 81 a0 81 - a1 81 - a2 81 a6 82 a7 82 a8 82 a9 82 aa 82 - ab 82 - ac 82 b0 83 b1 83 b2 83 b3 83 b4 83 - b5 83 - b6 83 ba 84 bb 84 bc 84 bd 84 be 84 - bf 84 - c0 84 c4 85 c5 85 c6 85 @@ -453,8 +427,6 @@ class 'pkg/TestSwitchOnStringsJavac' { d6 88 d7 89 d8 89 - d9 89 - da 89 de 93 df 93 e0 93 @@ -490,8 +462,6 @@ class 'pkg/TestSwitchOnStringsJavac' { 185 102 186 102 187 102 - 188 102 - 189 102 18d 106 18e 106 18f 106 @@ -530,8 +500,6 @@ class 'pkg/TestSwitchOnStringsJavac' { 1f3 124 1f4 124 1f5 124 - 1f6 124 - 1f7 124 1fb 125 1fc 125 1fd 125 @@ -541,8 +509,6 @@ class 'pkg/TestSwitchOnStringsJavac' { 201 125 202 125 205 128 - 206 128 - 207 128 20b 131 20c 131 20d 131 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchPatternWithExpression.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchPatternWithExpression.dec index 0ff17b4fd444..e5618129435e 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchPatternWithExpression.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchPatternWithExpression.dec @@ -48,12 +48,12 @@ public class TestSwitchPatternWithExpression { var19 = a;// 47 break; case AA(B(String a)): - var19 = a; + var19 = a;// 48 } String aa = var19; System.out.println(aa + "1");// 50 - return;// 48 + return; } private static String getX4(I i) { @@ -78,13 +78,13 @@ public class TestSwitchPatternWithExpression { var13 = a;// 63 break; case B(String a): - var13 = a; + var13 = a;// 64 break; } String string = var13; System.out.println(string + "2");// 66 - }// 64 + } private static String getX5(I i) { String var13; @@ -112,9 +112,9 @@ public class TestSwitchPatternWithExpression { break; } - String string = var13; + String string = var13;// 80 System.out.println(string + "2");// 82 - }// 80 + } private static String getX3(I i) { String var12; @@ -273,22 +273,6 @@ class 'decompiler/TestSwitchPatternWithExpression' { 9e 54 9f 54 a0 55 - a1 55 - a2 55 - a3 55 - a4 55 - a5 55 - a6 55 - a7 55 - a8 55 - a9 55 - aa 55 - ab 55 - ac 55 - ad 55 - ae 55 - af 55 - b0 55 } method 'getX4 (Ldecompiler/TestSwitchPatternWithExpression$I;)Ljava/lang/String;' { @@ -326,22 +310,6 @@ class 'decompiler/TestSwitchPatternWithExpression' { 6a 85 6b 85 6c 86 - 6d 86 - 6e 86 - 6f 86 - 70 86 - 71 86 - 72 86 - 73 86 - 74 86 - 75 86 - 76 86 - 77 86 - 78 86 - 79 86 - 7a 86 - 7b 86 - 7c 86 } method 'getX5 (Ldecompiler/TestSwitchPatternWithExpression$I;)Ljava/lang/String;' { @@ -350,10 +318,6 @@ class 'decompiler/TestSwitchPatternWithExpression' { 43 92 44 92 49 92 - 4a 92 - 4b 92 - 4c 92 - 4d 92 4e 93 5e 95 5f 95 @@ -368,10 +332,6 @@ class 'decompiler/TestSwitchPatternWithExpression' { 43 107 44 107 49 107 - 4a 107 - 4b 107 - 4c 107 - 4d 107 4e 108 5e 110 5f 110 @@ -389,22 +349,6 @@ class 'decompiler/TestSwitchPatternWithExpression' { 6f 115 70 115 71 116 - 72 116 - 73 116 - 74 116 - 75 116 - 76 116 - 77 116 - 78 116 - 79 116 - 7a 116 - 7b 116 - 7c 116 - 7d 116 - 7e 116 - 7f 116 - 80 116 - 81 116 } method 'getX3 (Ldecompiler/TestSwitchPatternWithExpression$I;)Ljava/lang/String;' { @@ -584,7 +528,7 @@ Lines mapping: 41 <-> 38 46 <-> 46 47 <-> 48 -48 <-> 56 +48 <-> 51 50 <-> 55 54 <-> 61 55 <-> 63 @@ -592,7 +536,7 @@ Lines mapping: 58 <-> 71 62 <-> 76 63 <-> 78 -64 <-> 87 +64 <-> 81 66 <-> 86 70 <-> 91 71 <-> 93 @@ -600,7 +544,7 @@ Lines mapping: 74 <-> 101 78 <-> 106 79 <-> 108 -80 <-> 117 +80 <-> 115 82 <-> 116 86 <-> 121 87 <-> 123 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchRules.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchRules.dec index a168ccaad501..1e41e17bc8be 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchRules.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchRules.dec @@ -67,16 +67,12 @@ class 'pkg/TestSwitchRules' { 5b 11 5c 11 5d 11 - 5e 11 - 5f 11 63 12 64 12 65 12 66 12 67 12 68 12 - 69 12 - 6a 12 6e 13 6f 13 70 13 @@ -95,8 +91,6 @@ class 'pkg/TestSwitchRules' { 5e 22 5f 22 60 22 - 61 22 - 62 22 66 21 67 21 68 21 @@ -115,8 +109,6 @@ class 'pkg/TestSwitchRules' { 5b 31 5c 31 5d 31 - 5e 31 - 5f 31 60 32 63 34 64 34 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchSimpleReferencesJavac.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchSimpleReferencesJavac.dec index 2f0ef48edd0e..0a500269e703 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchSimpleReferencesJavac.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchSimpleReferencesJavac.dec @@ -154,8 +154,6 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 2b 6 2c 6 2d 6 - 2e 6 - 2f 6 30 7 33 9 34 9 @@ -169,8 +167,6 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 3e 11 3f 11 40 11 - 41 11 - 42 11 43 12 46 15 47 15 @@ -190,16 +186,12 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 2f 22 30 22 31 22 - 32 22 - 33 22 37 23 38 23 39 23 3a 23 3b 23 3c 23 - 3d 23 - 3e 23 44 24 45 24 46 24 @@ -216,24 +208,18 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 27 32 28 32 29 32 - 2a 32 - 2b 32 2f 33 30 33 31 33 32 33 33 33 34 33 - 35 33 - 36 33 3a 31 3b 31 3c 31 3d 31 3e 31 3f 31 - 40 31 - 41 31 47 34 48 34 49 34 @@ -250,8 +236,6 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 2a 44 2b 44 2c 44 - 2d 44 - 2e 44 2f 45 32 48 33 48 @@ -271,8 +255,6 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 27 57 28 57 29 57 - 2a 57 - 2b 57 2c 58 2f 61 30 61 @@ -292,8 +274,6 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 2a 71 2b 71 2c 71 - 2d 71 - 2e 71 2f 72 32 75 33 75 @@ -316,8 +296,6 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 26 83 27 83 28 83 - 29 83 - 2a 83 2e 84 2f 84 30 84 @@ -339,8 +317,6 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 34 93 35 93 36 93 - 37 93 - 38 93 3c 91 3d 91 3e 91 @@ -362,8 +338,6 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 34 103 35 103 36 103 - 37 103 - 38 103 3c 101 3d 101 3e 101 @@ -382,16 +356,12 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 2a 113 2b 113 2c 113 - 2d 113 - 2e 113 32 111 33 111 34 111 35 111 36 111 37 111 - 38 111 - 39 111 3f 114 40 114 41 114 @@ -411,8 +381,6 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 26 122 27 122 28 122 - 29 122 - 2a 122 2e 123 2f 123 30 123 @@ -431,8 +399,6 @@ class 'pkg/TestSwitchSimpleReferencesJavac' { 27 131 28 131 29 131 - 2a 131 - 2b 131 2c 132 2f 135 30 135 diff --git a/plugins/java-decompiler/engine/testData/results/TestSwitchWithDeconstructionsWithoutNestedJavac.dec b/plugins/java-decompiler/engine/testData/results/TestSwitchWithDeconstructionsWithoutNestedJavac.dec index f9d9ad027563..fd4777a3966e 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSwitchWithDeconstructionsWithoutNestedJavac.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSwitchWithDeconstructionsWithoutNestedJavac.dec @@ -7,7 +7,7 @@ public class TestSwitchWithDeconstructionsWithoutNestedJavac { public static void testStringString(Object o) { switch (o) {// 13 case R1(String s1, String s2): - if (s2.isEmpty()) {// 15 + if (s2.isEmpty()) {// 14 15 System.out.println("2");// 16 } break; @@ -17,11 +17,11 @@ public class TestSwitchWithDeconstructionsWithoutNestedJavac { } System.out.println("1");// 21 - }// 14 + } public static void testStringObjectWhen(Object o) { switch (o) {// 25 - case R1(String s1, Object var11) when s1.hashCode() == 3: + case R1(String s1, Object var11) when s1.hashCode() == 3:// 26 if (s1.hashCode() == 1) {// 27 System.out.println("2");// 28 System.out.println("2");// 29 @@ -34,12 +34,12 @@ public class TestSwitchWithDeconstructionsWithoutNestedJavac { } System.out.println("1");// 35 - }// 26 + } public static void testStringObject(Object o) { label34: switch (o) {// 39 - case R1(String s1, Object var11) when s1.isEmpty():// 41 + case R1(String s1, Object var11) when s1.isEmpty():// 40 41 System.out.println("1");// 42 default: System.out.println("3");// 45 @@ -47,12 +47,12 @@ public class TestSwitchWithDeconstructionsWithoutNestedJavac { } System.out.println("1");// 47 - }// 40 + } public static void testObjectString(Object o) { switch (o) {// 51 case R1(Object s1, String s2): - if (s1.hashCode() == 1) {// 53 + if (s1.hashCode() == 1) {// 52 53 System.out.println("1");// 54 } break; @@ -62,12 +62,12 @@ public class TestSwitchWithDeconstructionsWithoutNestedJavac { } System.out.println("1");// 59 - }// 52 + } public static void testObjectObject(Object o) { switch (o) {// 63 case R1(Object s1, Object var11): - if (s1.hashCode() == 1) {// 65 + if (s1.hashCode() == 1) {// 64 65 System.out.println("1");// 66 } break; @@ -76,7 +76,7 @@ public class TestSwitchWithDeconstructionsWithoutNestedJavac { } System.out.println("1");// 71 - }// 64 + } static record R1(Object o, Object o2) { R1(Object o, Object o2) { @@ -113,24 +113,18 @@ class 'pkg/TestSwitchWithDeconstructionsWithoutNestedJavac' { 5b 9 5c 9 5d 9 - 5e 9 - 5f 9 63 10 64 10 65 10 66 10 67 10 68 10 - 69 10 - 6a 10 6e 14 6f 14 70 14 71 14 72 14 73 14 - 74 14 - 75 14 76 15 79 18 7a 18 @@ -141,22 +135,6 @@ class 'pkg/TestSwitchWithDeconstructionsWithoutNestedJavac' { 7f 18 80 18 81 19 - 82 19 - 83 19 - 84 19 - 85 19 - 86 19 - 87 19 - 88 19 - 89 19 - 8a 19 - 8b 19 - 8c 19 - 8d 19 - 8e 19 - 8f 19 - 90 19 - 91 19 } method 'testStringObjectWhen (Ljava/lang/Object;)V' { @@ -198,16 +176,12 @@ class 'pkg/TestSwitchWithDeconstructionsWithoutNestedJavac' { 72 27 73 27 74 27 - 75 27 - 76 27 7a 31 7b 31 7c 31 7d 31 7e 31 7f 31 - 80 31 - 81 31 82 32 85 35 86 35 @@ -218,22 +192,6 @@ class 'pkg/TestSwitchWithDeconstructionsWithoutNestedJavac' { 8b 35 8c 35 8d 36 - 8e 36 - 8f 36 - 90 36 - 91 36 - 92 36 - 93 36 - 94 36 - 95 36 - 96 36 - 97 36 - 98 36 - 99 36 - 9a 36 - 9b 36 - 9c 36 - 9d 36 } method 'testStringObject (Ljava/lang/Object;)V' { @@ -255,16 +213,12 @@ class 'pkg/TestSwitchWithDeconstructionsWithoutNestedJavac' { 5b 42 5c 42 5d 42 - 5e 42 - 5f 42 63 44 64 44 65 44 66 44 67 44 68 44 - 69 44 - 6a 44 6b 45 6e 48 6f 48 @@ -275,22 +229,6 @@ class 'pkg/TestSwitchWithDeconstructionsWithoutNestedJavac' { 74 48 75 48 76 49 - 77 49 - 78 49 - 79 49 - 7a 49 - 7b 49 - 7c 49 - 7d 49 - 7e 49 - 7f 49 - 80 49 - 81 49 - 82 49 - 83 49 - 84 49 - 85 49 - 86 49 } method 'testObjectString (Ljava/lang/Object;)V' { @@ -316,16 +254,12 @@ class 'pkg/TestSwitchWithDeconstructionsWithoutNestedJavac' { 5c 55 5d 55 5e 55 - 5f 55 - 60 55 64 59 65 59 66 59 67 59 68 59 69 59 - 6a 59 - 6b 59 6c 60 6f 63 70 63 @@ -336,22 +270,6 @@ class 'pkg/TestSwitchWithDeconstructionsWithoutNestedJavac' { 75 63 76 63 77 64 - 78 64 - 79 64 - 7a 64 - 7b 64 - 7c 64 - 7d 64 - 7e 64 - 7f 64 - 80 64 - 81 64 - 82 64 - 83 64 - 84 64 - 85 64 - 86 64 - 87 64 } method 'testObjectObject (Ljava/lang/Object;)V' { @@ -370,8 +288,6 @@ class 'pkg/TestSwitchWithDeconstructionsWithoutNestedJavac' { 49 70 4a 70 4b 70 - 4c 70 - 4d 70 51 74 52 74 53 74 @@ -387,22 +303,6 @@ class 'pkg/TestSwitchWithDeconstructionsWithoutNestedJavac' { 5f 77 60 77 61 78 - 62 78 - 63 78 - 64 78 - 65 78 - 66 78 - 67 78 - 68 78 - 69 78 - 6a 78 - 6b 78 - 6c 78 - 6d 78 - 6e 78 - 6f 78 - 70 78 - 71 78 } } @@ -442,13 +342,13 @@ Lines mapping: 6 <-> 5 8 <-> 92 13 <-> 8 -14 <-> 20 +14 <-> 10 15 <-> 10 16 <-> 11 19 <-> 15 21 <-> 19 25 <-> 23 -26 <-> 37 +26 <-> 24 27 <-> 25 28 <-> 26 29 <-> 27 @@ -456,19 +356,19 @@ Lines mapping: 33 <-> 32 35 <-> 36 39 <-> 41 -40 <-> 50 +40 <-> 42 41 <-> 42 42 <-> 43 45 <-> 45 47 <-> 49 51 <-> 53 -52 <-> 65 +52 <-> 55 53 <-> 55 54 <-> 56 57 <-> 60 59 <-> 64 63 <-> 68 -64 <-> 79 +64 <-> 70 65 <-> 70 66 <-> 71 69 <-> 75 diff --git a/plugins/java-decompiler/engine/testData/results/TestSynchronizedUnprotected.dec b/plugins/java-decompiler/engine/testData/results/TestSynchronizedUnprotected.dec index e39892624ea5..8116115b495f 100644 --- a/plugins/java-decompiler/engine/testData/results/TestSynchronizedUnprotected.dec +++ b/plugins/java-decompiler/engine/testData/results/TestSynchronizedUnprotected.dec @@ -40,13 +40,6 @@ class 'pkg/TestSynchronizedUnprotected' { 11 18 12 18 15 20 - 16 20 - 17 20 - 18 20 - 19 20 - 1a 20 - 1b 20 - 1c 20 } } diff --git a/plugins/java-decompiler/engine/testData/results/TestTryCatchFinally.dec b/plugins/java-decompiler/engine/testData/results/TestTryCatchFinally.dec index fc7405c28693..bd221821820d 100644 --- a/plugins/java-decompiler/engine/testData/results/TestTryCatchFinally.dec +++ b/plugins/java-decompiler/engine/testData/results/TestTryCatchFinally.dec @@ -60,7 +60,6 @@ class 'pkg/TestTryCatchFinally' { 2e 12 2f 12 30 12 - 31 12 38 15 } @@ -103,7 +102,7 @@ class 'pkg/TestTryCatchFinally' { 36 34 37 34 38 34 - 39 34 + 39 37 3a 37 3b 37 3c 37 diff --git a/plugins/java-decompiler/engine/testData/results/TestTryCatchFinallyJsrRet.dec b/plugins/java-decompiler/engine/testData/results/TestTryCatchFinallyJsrRet.dec index 0cfcad56023e..5a7e74689166 100644 --- a/plugins/java-decompiler/engine/testData/results/TestTryCatchFinallyJsrRet.dec +++ b/plugins/java-decompiler/engine/testData/results/TestTryCatchFinallyJsrRet.dec @@ -63,7 +63,6 @@ class 'pkg/TestTryCatchFinallyJsrRet' { 27 12 28 12 29 12 - 2a 12 35 15 } @@ -96,8 +95,6 @@ class 'pkg/TestTryCatchFinallyJsrRet' { 1f 32 20 32 21 32 - 22 32 - 23 32 2a 34 2b 34 2c 34 @@ -105,7 +102,6 @@ class 'pkg/TestTryCatchFinallyJsrRet' { 2e 34 2f 34 30 34 - 31 34 37 30 38 30 39 30 diff --git a/plugins/java-decompiler/engine/testData/results/TestTryCatchFinallyMismatched.dec b/plugins/java-decompiler/engine/testData/results/TestTryCatchFinallyMismatched.dec index c6f08b986e41..1e2b0c20f6e7 100644 --- a/plugins/java-decompiler/engine/testData/results/TestTryCatchFinallyMismatched.dec +++ b/plugins/java-decompiler/engine/testData/results/TestTryCatchFinallyMismatched.dec @@ -105,7 +105,7 @@ class 'pkg/TestTryCatchFinallyMismatched' { 44 14 45 14 46 14 - 47 14 + 47 17 48 17 49 17 4a 17 @@ -135,7 +135,6 @@ class 'pkg/TestTryCatchFinallyMismatched' { 21 26 22 26 23 26 - 24 26 } method 'test3 (Ljava/lang/String;)I' { @@ -185,7 +184,7 @@ class 'pkg/TestTryCatchFinallyMismatched' { 5c 43 5d 43 5e 43 - 5f 43 + 5f 46 60 46 61 46 62 46 @@ -242,7 +241,7 @@ class 'pkg/TestTryCatchFinallyMismatched' { 5c 58 5d 58 5e 58 - 5f 58 + 5f 61 60 61 61 61 62 61