From 2ace90542955e46dbddce07fe0fd6b48f63867d8 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Thu, 26 Sep 2019 19:31:54 +0300
Subject: [PATCH] Fix IndexOutOfBoundsException (EA-211554) in
 SerializationPluginDeclarationChecker

---
 .../SerializationPluginDeclarationChecker.kt           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/diagnostic/SerializationPluginDeclarationChecker.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/diagnostic/SerializationPluginDeclarationChecker.kt
index efd37867dfd..eb39475f943 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/diagnostic/SerializationPluginDeclarationChecker.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/diagnostic/SerializationPluginDeclarationChecker.kt
@@ -164,7 +164,15 @@ open class SerializationPluginDeclarationChecker : DeclarationChecker {
         trace: BindingTrace,
         fallbackElement: PsiElement
     ) {
-        type.arguments.forEachIndexed { i, it -> checkType(module, it.type, element?.typeArgumentsAsTypes?.get(i), trace, fallbackElement) }
+        type.arguments.forEachIndexed { i, it ->
+            checkType(
+                module,
+                it.type,
+                element?.typeArgumentsAsTypes?.getOrNull(i),
+                trace,
+                fallbackElement
+            )
+        }
     }
 
     private fun AbstractSerialGenerator.checkType(