azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cast Set to Collection to choose right overload of plus.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-07-08 16:12:46 +03:00
parent 690a536734
commit 35959c49b3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt
+1 -1
View File
@@ -99,7 +99,7 @@ public class WriteValueInstruction(
public val rValue: PseudoValue public val rValue: PseudoValue
) : AccessValueInstruction(assignment, lexicalScope, target, receiverValues) { ) : AccessValueInstruction(assignment, lexicalScope, target, receiverValues) {
override val inputValues: List<PseudoValue> override val inputValues: List<PseudoValue>
get() = receiverValues.keySet() + rValue get() = (receiverValues.keySet() as Collection<PseudoValue>) + rValue
override fun accept(visitor: InstructionVisitor) { override fun accept(visitor: InstructionVisitor) {
visitor.visitWriteValue(this) visitor.visitWriteValue(this)
compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
+1 -1
View File
@@ -59,7 +59,7 @@ public class CallInstruction private constructor(
val resolvedCall: ResolvedCall<*>, val resolvedCall: ResolvedCall<*>,
override val receiverValues: Map<PseudoValue, ReceiverValue>, override val receiverValues: Map<PseudoValue, ReceiverValue>,
public val arguments: Map<PseudoValue, ValueParameterDescriptor> 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 ( public constructor (
element: JetElement, element: JetElement,
lexicalScope: LexicalScope, lexicalScope: LexicalScope,