From 62b876af25d3bd9aa648a7fa5f4559c19583eaca Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 15 Jan 2015 12:55:05 +0300
Subject: [PATCH] IDEA-129734 IOOBE on decompiling certain method references

---
 .../decompiler/exps/InvocationExprent.java    |   6 +-
 testData/classes/pkg/TestClassLambda.class    | Bin 4037 -> 4553 bytes
 testData/results/TestClassLambda.dec          | 190 ++++++++++--------
 testData/src/pkg/TestClassLambda.java         |   6 +
 4 files changed, 111 insertions(+), 91 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 5ef7bf1..2effc82 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,7 +112,9 @@ public class InvocationExprent extends Exprent {
       }
       else {
         // FIXME: remove the first parameter completely from the list. It's the object type for a virtual lambda method.
-        instance = lstParameters.get(0);
+        if (!lstParameters.isEmpty()) {
+          instance = lstParameters.get(0);
+        }
       }
     }
     else if (opcode == CodeConstants.opc_invokestatic) {
diff --git a/testData/classes/pkg/TestClassLambda.class b/testData/classes/pkg/TestClassLambda.class
index c6e62aa1a4d3dedfcb82e31eec752f6c5f59822d..80c85059b2c7fe46d2dd01d6b0cd66ca8a8ee608 100644
GIT binary patch
literal 4553
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
Um)Cm^o{Q%NC@-zxy$rek0yDHyJ^%m!

delta 1803
zcmaKs`&U#|6vsbzVCD{&ql_cCWJXX>-pClffD{BPGZa)bvj;K=0Y+djT4pub`(1W3
z%bsSb6(ypLilz22Q!9J7TK(7$^(XX0tJ-Jgt}t5m!`)|}y}$c=_TFcoduHmX$<eca
z4j%_*@uNjC4Jj1SXtK;AiRBh6XtG$zD!)LkOXYfQ@MF;8$E8IQZI<BM{Up=o$4#4;
zPEFJ0$HUFq*JILaF`fn;yupu2L~9#U*~G0Tx7GXcYN`}kQrN;BCU;t7(ctASy+*aT
zTZ^q0_i(S5`z$iKUnli|&hbHQe#qoulSj7wwBz6&Bh?k1PMM;FQiE~p!<)jP?r={>
zXmL-Zy`#NP@hFd(Jg#_xCrzGGY~yJIUtMo+q(9OZ-mtVi(%IYApXR~#@l2Y@b|23w
zcJQ3Z^NO9k;G;~uFDhQ*Wl>)7Q6tN%ie0>>s32M?+kE+U8zhHY*R?5L=M5iw(%kIz
zu}|?PZz-y{)L?u(!Htow?oe%CUwHG9uKtMPZ3cY2BMk5Q*smDmfMSS)CWmzF9!Ynk
zuBJ#|S5Jpv-;*z9a#$sEgroNP<h=4>jwyzDU-1F^OpYr~aMHlj+1}mVTdw$!0mVnu
zC_dKO3F_>8_fXO&oU(s*2a<~T)c)PQQ`Xb=c2BOih|lz$p0Q7Os>FEK{=-vcX0p{F
zz0mG;W!NjswVoo*8D!XlDe3k(v)KsRe;GkbhkdTa7j}QjZ)IO9&hxF}D(V%BsZ(63
z#Uh<awHB9gxuRCv7D`Urtl7r*_G#-^kI4@Pd3Ku0w%w{ESR}KC45XoNTeR__$>oa-
z+4U-zIYVrg%qmQf5uGUZOB`=hg>$r5k1hn6&m`)|rjcAhl{+Y7Ox~&yRGv(DK8gZ4
zr%+Hc6DWz#mz^Q2HB2hfeYN_4><mWEFOdl^70WD#dCQm!vkQrLhInT?-u?gb&J^z~
z@y>C)zl@odrJ2Xd{KH(46;el~Am%!VX=AIR8ZkjKhI#VD<}*$@8=yuqUm$!HaePR;
z0g2POyNp4RiJU!g%R<4)kV^kFPWL5VWARZY8k{6^G=7nsBs_9f3e{0LO0Gc+`T%_e
zuA~8x7amYAy9J4q#ZxRhU6AFS7aW!-mX0(rQEH>`EEDpTK1&aW;5C1(L}~t<z_45-
zONN+qjI8LI!({s>$Cwg`krN{~#?;Y#%jI{pf+;i!pUj!VS1x?I&_IGH&NJ;IJc&jv
zmw1_2C%#g$Ng^uU50u8p+eMmQg1a%3_mUiMf-625iQpQpki*=#(ia%QBX7Xr$rc`6
zmnRTBLjLI9l?YZIjf4Gf&e3fD|0i7_1oHGQN^tS!CGyVqx%B&W;^#=o`Xx<pOR)u=
z)k9GxWd&P`58-NwQ8>Eulcn=h$RJ0;mPnY3rF<i+C3Ii$9bd~&{%YCZD3;ZNxrQ}d
u8`qjyOS7Ye9j%phw8m|%5|PlRx6<LL>$!>Uxce6R=y!rQ|3h;-&3^;3d=%yY

diff --git a/testData/results/TestClassLambda.dec b/testData/results/TestClassLambda.dec
index 5a3e115..5536579 100644
--- a/testData/results/TestClassLambda.dec
+++ b/testData/results/TestClassLambda.dec
@@ -1,10 +1,12 @@
 package pkg;
 
+import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.OptionalInt;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.IntBinaryOperator;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -13,179 +15,189 @@ public class TestClassLambda {
    public int field = 0;
 
    public void testLambda() {
-      List var1 = Arrays.asList(new Integer[]{Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3), Integer.valueOf(4), Integer.valueOf(5), Integer.valueOf(6), Integer.valueOf(7)});// 27
-      int var2 = (int)Math.random();// 28
-      var1.forEach((var2x) -> {// 30
+      List var1 = Arrays.asList(new Integer[]{Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3), Integer.valueOf(4), Integer.valueOf(5), Integer.valueOf(6), Integer.valueOf(7)});// 29
+      int var2 = (int)Math.random();// 30
+      var1.forEach((var2x) -> {// 32
          int var3 = 2 * var2x.intValue();
          System.out.println(var3 + var2 + this.field);
       });
    }
 
    public void testLambda1() {
-      int var1 = (int)Math.random();// 37
+      int var1 = (int)Math.random();// 39
       Runnable var2 = () -> {
          System.out.println("hello1" + var1);
-      };// 38
+      };// 40
       Runnable var3 = () -> {
          System.out.println("hello2" + var1);
-      };// 39
+      };// 41
    }
 
    public void testLambda2() {
-      reduce((var0, var1) -> {// 43
+      reduce((var0, var1) -> {// 45
          return Math.max(var0, var1);
       });
    }
 
    public void testLambda3() {
-      reduce(Math::max);// 47
+      reduce(Math::max);// 49
    }
 
    public void testLambda4() {
-      reduce(TestClassLambda::localMax);// 51
+      reduce(TestClassLambda::localMax);// 53
    }
 
    public void testLambda5() {
-      String var1 = "abcd";// 55
-      function(var1::toString);// 56
+      String var1 = "abcd";// 57
+      function(var1::toString);// 58
    }
 
    public void testLambda6() {
-      ArrayList var1 = new ArrayList();// 60
-      int var2 = var1.size() * 2;// 61
-      int var3 = var1.size() * 5;// 62
-      var1.removeIf((var2x) -> {// 63
+      ArrayList var1 = new ArrayList();// 62
+      int var2 = var1.size() * 2;// 63
+      int var3 = var1.size() * 5;// 64
+      var1.removeIf((var2x) -> {// 65
          return var2 >= var2x.length() && var2x.length() <= var3;
       });
    }
 
+   public static void testLambda7(Annotation[] var0) {
+      Arrays.stream(var0).map(Annotation::annotationType);// 69
+   }
+
    public static OptionalInt reduce(IntBinaryOperator var0) {
-      return null;// 67
+      return null;// 73
    }
 
    public static String function(Supplier<String> var0) {
-      return (String)var0.get();// 71
+      return (String)var0.get();// 77
    }
 
    public static int localMax(int var0, int var1) {
-      return 0;// 75
+      return 0;// 81
    }
 
    public void nestedLambdas() {
-      byte var1 = 5;// 79
+      byte var1 = 5;// 85
       Runnable var2 = () -> {
          Runnable var1x = () -> {
             System.out.println("hello2" + var1);
          };
          System.out.println("hello1" + var1);
-      };// 80
+      };// 86
    }
 }
 
 class 'pkg/TestClassLambda' {
    method 'testLambda ()V' {
-      7      15
-      8      15
-      e      15
-      f      15
-      15      15
-      16      15
-      1c      15
-      1d      15
-      23      15
-      24      15
-      2a      15
-      2c      15
-      33      15
-      35      15
-      39      15
-      3c      15
-      3d      16
-      40      16
-      41      16
-      4a      17
+      7      17
+      8      17
+      e      17
+      f      17
+      15      17
+      16      17
+      1c      17
+      1d      17
+      23      17
+      24      17
+      2a      17
+      2c      17
+      33      17
+      35      17
+      39      17
+      3c      17
+      3d      18
+      40      18
+      41      18
+      4a      19
    }
 
    method 'testLambda1 ()V' {
-      0      24
-      3      24
-      4      24
-      b      27
-      12      30
+      0      26
+      3      26
+      4      26
+      b      29
+      12      32
    }
 
    method 'testLambda2 ()V' {
-      5      34
+      5      36
    }
 
    method 'testLambda3 ()V' {
-      5      40
+      5      42
    }
 
    method 'testLambda4 ()V' {
-      5      44
+      5      46
    }
 
    method 'testLambda5 ()V' {
-      0      48
-      2      48
-      e      49
+      0      50
+      2      50
+      e      51
    }
 
    method 'testLambda6 ()V' {
-      7      53
-      9      54
-      e      54
-      f      54
-      10      54
-      12      55
-      17      55
-      18      55
-      19      55
-      22      56
+      7      55
+      9      56
+      e      56
+      f      56
+      10      56
+      12      57
+      17      57
+      18      57
+      19      57
+      22      58
+   }
+
+   method 'testLambda7 ([Ljava/lang/annotation/Annotation;)V' {
+      1      64
+      9      64
    }
 
    method 'reduce (Ljava/util/function/IntBinaryOperator;)Ljava/util/OptionalInt;' {
-      0      62
-      1      62
+      0      68
+      1      68
    }
 
    method 'function (Ljava/util/function/Supplier;)Ljava/lang/String;' {
-      1      66
-      6      66
-      9      66
+      1      72
+      6      72
+      9      72
    }
 
    method 'localMax (II)I' {
-      0      70
-      1      70
+      0      76
+      1      76
    }
 
    method 'nestedLambdas ()V' {
-      0      74
-      1      74
-      8      80
+      0      80
+      1      80
+      8      86
    }
 }
 
 Lines mapping:
-27 <-> 16
-28 <-> 17
-30 <-> 18
-37 <-> 25
-38 <-> 28
-39 <-> 31
-43 <-> 35
-47 <-> 41
-51 <-> 45
-55 <-> 49
-56 <-> 50
-60 <-> 54
-61 <-> 55
+29 <-> 18
+30 <-> 19
+32 <-> 20
+39 <-> 27
+40 <-> 30
+41 <-> 33
+45 <-> 37
+49 <-> 43
+53 <-> 47
+57 <-> 51
+58 <-> 52
 62 <-> 56
 63 <-> 57
-67 <-> 63
-71 <-> 67
-75 <-> 71
-79 <-> 75
-80 <-> 81
+64 <-> 58
+65 <-> 59
+69 <-> 65
+73 <-> 69
+77 <-> 73
+81 <-> 77
+85 <-> 81
+86 <-> 87
diff --git a/testData/src/pkg/TestClassLambda.java b/testData/src/pkg/TestClassLambda.java
index 1c29cd5..860a5cd 100644
--- a/testData/src/pkg/TestClassLambda.java
+++ b/testData/src/pkg/TestClassLambda.java
@@ -15,7 +15,9 @@
  */
 package pkg;
 
+import java.lang.annotation.Annotation;
 import java.util.*;
+import java.util.Arrays;
 import java.util.function.IntBinaryOperator;
 import java.util.function.Supplier;
 
@@ -63,6 +65,10 @@ public class TestClassLambda {
     list.removeIf(s -> (bottom >= s.length() && s.length() <= top));
   }
 
+  public static void testLambda7(Annotation[] annotations) {
+    Arrays.stream(annotations).map(Annotation::annotationType);
+  }
+
   public static OptionalInt reduce(IntBinaryOperator op) {
     return null;
   }