azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,801 Commits 1 Branch 0 Tags
7e4688da939485d9586be2854af0414c95a0c3a4
Commit Graph

9150 Commits

Author SHA1 Message Date
Dmitry Petrov 7e4688da93 psi2ir: add test for reference to var with non-accessible setter 2019-03-20 11:57:57 +03:00
Dmitry Petrov c86ef5da53 psi2ir: update testData for property references 2019-03-20 11:57:57 +03:00
Dmitry Petrov 9f48695dde psi2ir: no unbound field symbols in delegated property references 
#KT-30323 Fixed
 2019-03-20 11:57:57 +03:00
Dmitry Petrov bd9c5645cd IR: fix property reference symbol binding for generic properties 2019-03-20 11:57:57 +03:00
Ting-Yuan Huang f6cf434650 when: emit switch for String if possible 
Effectively, the following when structure:

  when (s) {
    s1, s2 -> e1,
    s3 -> e2,
    s4 -> e3,
    ...
    else -> e
  }

is implemented as:

  when (s.hashCode()) {
    h1 -> {
      if (s == s1)
        e1
      else if (s == s2)
        e1
      else if (s == s3)
        e2
      else
        e
    }
    h2 -> if (s == s3) e2 else e,
    ...
    else -> e
  }

where s1.hashCode() == s2.hashCode() == s3.hashCode() == h1,
      s4.hashCode() == h2.

A tableswitch or lookupswitch is used for the hash code lookup.

Change-Id: I087bf623dbb4a41d3cc64399a1b42342a50757a6
 2019-03-20 09:13:51 +01:00
pyos ed298c48b7 Unmute a test fixed by a combination of PR #2151 and #2184 2019-03-19 12:00:29 +01:00
pyos 6c68474489 JVM_IR: use correct signatures for local delegated property references 
Which is `<v#N>` where N is the index of that property in the containing
class.
 2019-03-19 12:00:29 +01:00
pyos 8c55376f0c Unmute almost all JVM_IR tests that use property references 2019-03-19 12:00:29 +01:00
pyos 82ccf81da8 Fix this remapping in inner class constructors 
Inner class constructors should use the argument instead of reading
outer `this` from a field because if such an access happens before a
delegating constructor call, e.g. when evaluating an argument, a JVM
bytecode validation error will be thrown. (The only operation on `this`
allowed before a delegating constructor call is SETFIELD, and only if
the field in question is declared in the same class.)
 2019-03-19 09:20:41 +01:00
Dmitriy Novozhilov d01b6ef900 Revert "[NI] Support @OnlyInputTypes annotation. #KT-29307 fixed" 
This reverts commit 90628112
With that annotation there is complex bug that breaks build of Kotlin compiler
 2019-03-18 18:53:38 +03:00
Ilmir Usmanov d154cf9a59 Fix test data 2019-03-18 14:04:04 +03:00
Ilmir Usmanov c68413b953 Do not generate StateMachineChecker if CHECK_STATE_MACHINE directive is 
not present.
Otherwise, since it uses suspend functions, it breaks IR tests.
 2019-03-18 14:04:03 +03:00
Ilmir Usmanov 7956ef18b2 Generate RETURN instead of ARETURN if (cross)inline suspend lambda returns Unit 
#KT-30073 Fixed
 2019-03-18 14:04:02 +03:00
Ilmir Usmanov cc9a0041e0 Check number of suspensions in crossinline tests 2019-03-18 14:04:01 +03:00
Ilmir Usmanov df52c5217d Add facility to check number of suspensions in coroutine tests 2019-03-18 14:04:01 +03:00
victor.petukhov 9a2178d96b Split 'nothingTypedSuspendFunction' test into two separate tests (for old and new coroutines) 2019-03-16 21:39:44 +03:00
victor.petukhov 29493a4977 Fix 'nothingTypedSuspendFunction' test after 70c35f4186 2019-03-16 14:15:08 +03:00
victor.petukhov 70c35f4186 Introduce warning about implicitly inferred Nothing as a type parameter 
^KT-20849 Fixed
 2019-03-15 19:28:38 +03:00
Roman Artemev 1f98eaa27b [JS IR BE] Fix Callable reference with vararg 
* Update tests
 2019-03-15 19:21:38 +03:00
Anton Bannykh a4c693ec29 [JS IR BE] updated inliner to the most recent version 
FunctionInlining.kt commit 364b7ae72a :
https://github.com/JetBrains/kotlin-native/blob/364b7ae72a49c2a1716c83c1bab0866dfe46fa25/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
 2019-03-15 14:56:33 +03:00
Dmitriy Novozhilov b07aed7a00 [NI] Fix determination of completion mode. #KT-30406 Fixed 2019-03-15 10:39:50 +03:00
Dmitriy Novozhilov 1c92c22dee [NI] Add support ExpectedTypeFromCast to new inference. #KT-30405 Fixed 2019-03-15 10:39:29 +03:00
Dmitriy Novozhilov 9062811231 [NI] Support @OnlyInputTypes annotation. #KT-29307 fixed 
Also KT-26698 fixed in new inference
 2019-03-15 10:39:11 +03:00
Dmitriy Novozhilov 0ba163d70b [NI] Fix testdata of inference lambdas with SAM conversions 
Tetdata was broken in 3e147af3c0
#KT-27565 related
 2019-03-15 10:39:11 +03:00
Mark Punzalan 3585792b3b Break out bytecodeText/conditions tests into smaller tests for if/while/do-while. 2019-03-15 08:32:22 +01:00
Mark Punzalan 9eb11ff3e9 Generate conditional jumps with optimizations for loops, if possible. 2019-03-15 08:32:22 +01:00
Mikhail Glukhikh 43d06f85e3 Add raw type comparison for Java (J2K mapping is taken into account) 
NB: Java enhancement scope does not perform substitution, so we could
have some duplicates inside "type enhancement" testData

Related to KT-29937
 2019-03-14 18:17:58 +03:00
Mikhail Glukhikh be412baf9f FIR type enhancement: fold flexible types when it's possible 
Related to KT-29937
 2019-03-14 18:08:01 +03:00
Mikhail Glukhikh 6c8aba8039 FIR: support callable symbols in dependencies provider 
This breaks mppFakeOverrides test because of bug in FIR fake overrides
 2019-03-14 18:07:32 +03:00
Mikhail Glukhikh 33fb3d154b FIR Java model: support static members & enum entries 
Related to KT-29218
 2019-03-14 18:07:17 +03:00
Mikhail Glukhikh 14fb495ab6 Support Java constructors in FIR (related to KT-29218) 2019-03-14 17:57:13 +03:00
Mikhail Glukhikh 7563a98999 FIR type enhancement: make J2K mapping and changed handling more exact 
Related to KT-29937
 2019-03-14 17:56:05 +03:00
Mikhail Glukhikh 226cf8e42c FIR Java types: handle wildcard types correctly 
Related to KT-29937, KT-29218
 2019-03-14 17:55:25 +03:00
Mikhail Glukhikh 6c79b184c0 FIR Java types: add Kotlin/Java mapping & mutability enhancements 
Related to KT-29937
 2019-03-14 17:55:10 +03:00
Mikhail Glukhikh e7ac88d326 FIR: implement Java fields (in provider, type enhancement, scopes) 
Related to KT-29218
 2019-03-14 17:54:53 +03:00
Mikhail Glukhikh 4255c9f774 Add FIR enhancement tests, fix some exceptions / problems around them 
Test data and tests themselves are based on
compiler/testData/loadJava/compiledJava
 2019-03-14 17:52:33 +03:00
Steven Schäfer 3f4c5c8d53 Resolve type aliases when looking for default arguments to actual methods. 
Change-Id: I059093c1af32fcd7a2de36c25160c352d6f03a3c
 2019-03-14 14:59:34 +01:00
Mads Ager 8b566fda76 JVM_IR: Perform asm type conversion for string concat arguments. 
This ensures that the Unit instance is loaded when string
concatenation contains a sub part that is a call of a Unit
return-type method.
 2019-03-13 10:01:21 +01:00
Ting-Yuan Huang 013ad4b8e4 JVM_IR: defer some branch optimizations to codegen. 
Specifically, defer the removal of hand-written "if (true|false)" from
JvmBuiltinOptimizationLowering into codegen so that appropriate debug
info (and a NOP) can be inserted.

Change-Id: Ia11af05ad8b4251946bd3e685fb7c3319f0f433f
 2019-03-13 08:48:20 +01:00
Ting-Yuan Huang 6bbb0269b1 IR: Set when.origin for IrIfElseImpl 
Change-Id: I38510b59e3dc936baadbfe3ef2702990493815e5
 2019-03-13 08:48:20 +01:00
Mikhael Bogdanov 1e3277d0e6 Set proper origin for cascaded if expression 2019-03-13 08:27:07 +01:00
Alexander Udalov a269e9bc00 JVM IR: fix typo in condition in KCallableNamePropertyLowering 
This however makes testLocalFunctionName fail because currently
isSubclassOf (incorrectly) returns false and therefore an anonymous
class is generated and the name is taken from there. The name there is
"box$OK" which is incorrect. The isSubclassOf issue is KT-28198 and will
be fixed separately; the incorrect name issue will be investigated later
 2019-03-12 18:49:41 +01:00
Mikhael Bogdanov dd59deb977 Mute failed test 2019-03-12 13:33:35 +01:00
Steven Schäfer 9ea39d2b7c Fix return types for while loops. 2019-03-12 09:33:00 +01:00
Steven Schäfer 4c8425caeb Run ExpectDeclarationsRemoving in the JVM_IR backend. 2019-03-12 09:29:00 +01:00
Alexander Udalov f9be21c935 Report warning on @Synchronized on inline methods 
Until KT-27310 is supported, we warn users that this has no effect.

 #KT-29884 Fixed
 2019-03-11 18:32:44 +01:00
Mikhail Zarechenskiy 1594c1fc6b [NI] Don't consider Nothing-constraint as proper to complete call 
Follow-up of 9b3e17f0. There we decided to complete call if a type
 variable from a return type has proper lower constraints, now we refine
 this rule wrt `Nothing`-like constraints to avoid inferring type variables
 to Nothing, which is quite useless

 #KT-30370 Fixed
 2019-03-11 19:14:29 +03:00
Alexander Udalov d8b364ea40 Mark KAnnotatedElement.hasAnnotation as experimental 
#KT-29041 Fixed
 2019-03-08 14:57:01 +01:00
Kerooker a342f844b8 Implements KAnnotatedElement.hasAnnotation() 
This commit fixes KT-29041, by adding a convenience method to verify if a certain `KAnnotatedElement` has an annotation or not
 2019-03-08 14:53:51 +01:00
Dmitriy Novozhilov cbf1d773f7 NI. Coerce return type of lambda function descriptor to Unit. #KT-30242 Fixed 2019-03-07 14:36:09 +03:00