From 35959c49b3181a09715bcac57aa3589dd8023099 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 8 Jul 2015 16:12:46 +0300
Subject: [PATCH] Cast Set to Collection to choose right overload of plus.

---
 .../cfg/pseudocode/instructions/eval/accessInstructions.kt      | 2 +-
 .../cfg/pseudocode/instructions/eval/operationInstructions.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt
index fe8d1c2422f..83cbede765f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt
@@ -99,7 +99,7 @@ public class WriteValueInstruction(
         public val rValue: PseudoValue
 ) : AccessValueInstruction(assignment, lexicalScope, target, receiverValues) {
     override val inputValues: List<PseudoValue>
-        get() = receiverValues.keySet() + rValue
+        get() = (receiverValues.keySet() as Collection<PseudoValue>) + rValue
 
     override fun accept(visitor: InstructionVisitor) {
         visitor.visitWriteValue(this)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
index 2daa3ef0394..436d43f16b9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
@@ -59,7 +59,7 @@ public class CallInstruction private constructor(
         val resolvedCall: ResolvedCall<*>,
         override val receiverValues: Map<PseudoValue, ReceiverValue>,
         public val arguments: Map<PseudoValue, ValueParameterDescriptor>
-) : OperationInstruction(element, lexicalScope, receiverValues.keySet() + arguments.keySet()), InstructionWithReceivers {
+) : OperationInstruction(element, lexicalScope, (receiverValues.keySet() as Collection<PseudoValue>) + arguments.keySet()), InstructionWithReceivers {
     public constructor (
             element: JetElement,
             lexicalScope: LexicalScope,