From 8054f18287e2e20b203aec984720a68cbcd17967 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Sat, 14 Mar 2015 00:23:02 +0300
Subject: [PATCH] Minor in JS backend: add @Nullable to JsNameRef#getQualifier
 and JsNameRef#getSymbol.

---
 .../com/google/dart/compiler/backend/js/ast/JsNameRef.java    | 2 ++
 .../org/jetbrains/kotlin/js/inline/context/FunctionContext.kt | 4 ++--
 .../org/jetbrains/kotlin/js/inline/util/invocationUtils.kt    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java
index 5ff31b2eef5..1a76477b268 100644
--- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java
+++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java
@@ -50,11 +50,13 @@ public final class JsNameRef extends JsExpressionImpl implements HasName {
         return name;
     }
 
+    @Nullable
     @Override
     public Symbol getSymbol() {
         return name;
     }
 
+    @Nullable
     public JsExpression getQualifier() {
         return qualifier;
     }
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt
index 288ea6a0b3e..c6bbc51b0c7 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt
@@ -70,7 +70,7 @@ abstract class FunctionContext(
             val staticRef = callName.staticRef
             if (staticRef !is JsFunction) continue
 
-            val functionCalled = staticRef as JsFunction
+            val functionCalled = staticRef
             if (isFunctionCreator(functionCalled)) {
                 declareFunctionConstructorCall(call)
             }
@@ -120,7 +120,7 @@ abstract class FunctionContext(
 
         /** remove ending `.call()` */
         if (isCallInvocation(call)) {
-            callQualifier = (callQualifier as JsNameRef).getQualifier()
+            callQualifier = (callQualifier as JsNameRef).getQualifier()!!
         }
 
         /** in case 4, 5 get ref (reduce 4, 5 to 2, 3 accordingly) */
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt
index 27952db058b..83334952a7c 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt
@@ -42,7 +42,7 @@ public fun getSimpleName(call: JsInvocation): JsName? {
  * @returns first name ident (iterating through qualifier chain)
  */
 public fun getSimpleIdent(call: JsInvocation): String? {
-    var qualifier = call.getQualifier()
+    var qualifier: JsExpression? = call.getQualifier()
     
     while (qualifier != null) {
         when (qualifier) {