From c45d08b7e5405e68370a16ce835595f578bb55d6 Mon Sep 17 00:00:00 2001
From: Alex Tkachman <alex.tkachman@gmail.com>
Date: Mon, 12 Dec 2011 16:21:02 +0200
Subject: [PATCH] fix for KT-796/797 candidate/resultingDescriptor misuse

---
 .../src/org/jetbrains/jet/codegen/ExpressionCodegen.java  | 2 +-
 compiler/testData/codegen/regressions/kt796_797.jet       | 8 ++++++++
 compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java  | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 compiler/testData/codegen/regressions/kt796_797.jet

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index 9eef892f33e..c9374b6dfa7 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -2199,7 +2199,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
                 if(getterDescriptor.getReceiverParameter().exists()) {
                     index++;
                 }
-                for (TypeParameterDescriptor typeParameterDescriptor : getterDescriptor.getTypeParameters()) {
+                for (TypeParameterDescriptor typeParameterDescriptor : resolvedGetCall.getCandidateDescriptor().getTypeParameters()) {
                     if(typeParameterDescriptor.isReified()) {
                         generateTypeInfo(resolvedGetCall.getTypeArguments().get(typeParameterDescriptor), null);
                         index++;
diff --git a/compiler/testData/codegen/regressions/kt796_797.jet b/compiler/testData/codegen/regressions/kt796_797.jet
new file mode 100644
index 00000000000..03ae120b510
--- /dev/null
+++ b/compiler/testData/codegen/regressions/kt796_797.jet
@@ -0,0 +1,8 @@
+fun <T> Array<T>?.get(i : Int?) = this.sure().get(i.sure())
+fun <T> array(vararg t : T) : Array<T> = t
+
+fun box() : String {
+    val a : Array<String>? = array<String>("Str", "Str2")
+    val i : Int? = 1
+    return if(a[i] == "Str2") "OK" else "fail"
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java b/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
index e08b515771c..4a68f35e678 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
@@ -74,4 +74,8 @@ public class VarArgTest extends CodegenTestCase {
         createEnvironmentWithFullJdk();
         blackBoxFile("regressions/kt581.jet");
     }
+
+    public void testKt797() {
+        blackBoxFile("regressions/kt796_797.jet");
+    }
 }