From 85bfbaa8a8c49936405caa9cea1ee64613f4f747 Mon Sep 17 00:00:00 2001
From: Roman Golyshev <roman.golyshev@jetbrains.com>
Date: Tue, 24 Mar 2020 15:12:38 +0300
Subject: [PATCH] Check if returned `typeParameters` are null

- See EA-141456, EA-212070
---
 .../kotlin/descriptors/impl/FunctionDescriptorImpl.java    | 7 ++++++-
 .../kotlin/descriptors/impl/PropertyDescriptorImpl.java    | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java
index 7729c06faa3..04e49a9923e 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java
@@ -287,7 +287,12 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
     @Override
     @NotNull
     public List<TypeParameterDescriptor> getTypeParameters() {
-        return typeParameters;
+        List<TypeParameterDescriptor> parameters = typeParameters;
+        // Diagnostics for EA-141456
+        if (parameters == null) {
+            throw new IllegalStateException("typeParameters == null for " + this);
+        }
+        return parameters;
     }
 
     @Override
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java
index 8b9bef1cdb0..83370bbd695 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java
@@ -152,7 +152,12 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
     @NotNull
     @Override
     public List<TypeParameterDescriptor> getTypeParameters() {
-        return typeParameters;
+        List<TypeParameterDescriptor> parameters = typeParameters;
+        // Diagnostics for EA-212070
+        if (parameters == null) {
+            throw new IllegalStateException("typeParameters == null for " + this.toString());
+        }
+        return parameters;
     }
 
     @Override