From de7c790c1dbfbd4786c62fb72b4cc46510cf0f6d Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 21 Apr 2016 12:49:00 +0300 Subject: [PATCH] Use fq-names instead of descriptors when computing ambigious names Because there can be different descriptors that are essentially equal (from different modules) See J2K test: testNullableField Original commit: a1d4214a39fc0fe9f238966d7637b1bb8bc0ee0c --- .../pureKotlin/conflictingPlatformDeclarations/build.log | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index c3d008be68b..6c49ba3e152 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -12,8 +12,8 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: List): kotlin.Unit - fun function(list: List): kotlin.Unit + fun function(list: List): Unit + fun function(list: List): Unit Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: List): kotlin.Unit - fun function(list: List): kotlin.Unit \ No newline at end of file + fun function(list: List): Unit + fun function(list: List): Unit \ No newline at end of file