From 9dc3dab179cc00620d72a2d59d1732ed1ca306e1 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Tue, 23 Jul 2019 15:47:48 +0300 Subject: [PATCH] [kotlin compiler][update] 1.3.60-dev-206 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * a048a110749 - (tag: build-1.3.60-dev-206) Enabled/disabled some tests for K/N (3 дня назад) * c4da5cb95c7 - [IR] Added IrType.isKSuspendFunction() (3 дня назад) * e3988046634 - (tag: build-1.3.60-dev-205) Show the actual Kotlin version in error message in nativeLibrariesUtil.kt (3 дня назад) * 4e2989e884f - (tag: build-1.3.60-dev-202) CreateExpectActualFix: fix package for files with root package from non-root directory #KT-28746 Fixed (3 дня назад) * c76ca988eb1 - KotlinCreateTestIntention: disallow intention for `expect` classes #KT-26242 Fixed (3 дня назад) * 311cfc3806a - UnimplementedKotlinInterfaceMemberAnnotator: shouldn't report methods with @JvmStatic #KT-27208 Fixed (3 дня назад) * cf07585b119 - UnimplementedKotlinInterfaceMemberAnnotator: cleanup code (3 дня назад) * ad1b795a699 - (tag: build-1.3.60-dev-185) Disable KaptImportingTest in IDEA 183 and below (3 дня назад) * 6e10126c6fc - Fix matching file paths under Windows in NewMultiplatformKaptProjectImportingTest (3 дня назад) * 22c5e208a6a - (tag: build-1.3.60-dev-180) ReplaceGuardClause inspection: do not report when 'if' expression is used as expression (4 дня назад) * a6690e4e353 - ReplaceGuardClause inspection: do not remove 'else' branch (4 дня назад) * a3a3c52c24c - ReplaceGuardClause inspection: fix highlight range (4 дня назад) * 35e4295e169 - (tag: build-1.3.60-dev-179) IR: deduplicate code in DeepCopyWithWrappedDescriptors/DeepCopyIrTreeWithDescriptors (4 дня назад) * 96efae2b48f - IR: fix endless recursion in IrTypeSystemContext.isMarkedNullable (4 дня назад) * 72fdb47f130 - (tag: build-1.3.60-dev-176) Fix maven import tests by adding java-ide-customization dependency [KT-32833] (4 дня назад) * 0993fb82fe4 - (tag: build-1.3.60-dev-175) multiplatformUtil: `implementedModules` shouldn't ignore android test module Relates to #KT-30799 (4 дня назад) * 8294e5afc21 - (tag: build-1.3.60-dev-171) Increase heap size for gradle importing tests due to memory leak in the gradle daemon #KT-32731 Fixed (4 дня назад) * db743aa6e81 - Calculation of supported platforms in AndroidSourceSetDataService fixed for IDEA versions 183 and below. A deep copy of MPP model for Android source sets is created (4 дня назад) * d69fbf11776 - (tag: build-1.3.60-dev-169) Fix serialization of iml files for IDEA 192 #KT-32629 Fixed (4 дня назад) * 74e49d91cac - (tag: build-1.3.60-dev-159, origin/rr/kishmakov/fix-cidr-plugins) Proper implement 'classForImplicitThis' (4 дня назад) * a9f0d1a53b3 - (tag: build-1.3.60-dev-155) AddOperatorModifierInspection: decrease severity to INFORMATION #KT-32796 Fixed (4 дня назад) * b99efb9a2ba - (tag: build-1.3.60-dev-154) [NI] Look for type variables in captured flexible types (4 дня назад) * 58b4ab35f07 - [NI] Fix passing callable references to suspend functions as functional parameter (4 дня назад) * 127be9be03f - (tag: build-1.3.60-dev-151) psi2ir: Fix KT-30796 ErrorType for '?:' in OI (4 дня назад) * 959b720e3f3 - (tag: build-1.3.60-dev-149, tag: build-1.3.60-dev-145, origin/rr/ayalyshev/KT-32105) Cleanup: specify description for Gradle Kotlin/Multiplatform wizard (5 дней назад) * 0f6c381cd77 - (tag: build-1.3.60-dev-136, tag: build-1.3.60-dev-135, tag: build-1.3.60-dev-131) Fixed a corner case for invalidate package cache for default package (7 дней назад) * 5ed6573a60f - (tag: build-1.3.60-dev-129, origin/rr/kishmakov/standalone-fix) Fix testLazyScriptDefinitionProvider: (7 дней назад) * 853f2a9c3f4 - Fix flaky failures in main-kts IT (7 дней назад) * c0804000eb5 - Shorten temp paths used in tests (7 дней назад) * ee0f55d8e11 - Fix gradle IT with scripting discovery (7 дней назад) * 747c488a78f - Fix entries closing on saving compiled script to jar: (7 дней назад) * 5b3164ee874 - Ignoring resolver tests that failing on TC: (7 дней назад) * 823cb70ba0e - Fix script definition matching for REPL console (7 дней назад) * 425deb42ecb - Convert paths to unix format before matching with filePathPattern (7 дней назад) * 7d6bb023a8d - (tag: build-1.3.60-dev-121) Invalid script dependencies should be removed from fileAttributes to avoid 'all red file highlighting' (7 дней назад) * dd437b585bf - Scratch tests: check output after repl stop because error output is printed only after repl process termination (7 дней назад) * b9968ee1af4 - Do not call onFinish for executor that wasn't started (7 дней назад) * 2fa7ef24825 - Tests, refactoring: replace invokeLater with TransactionGuard to avoid situations that project isDisposed during inlays printing (7 дней назад) * ec1bef639fd - Tests, refactoring: do not search for psi file twice (7 дней назад) * fe662fcb2e6 - Provide a mesaage for NPE in scratch tests (7 дней назад) * a32b1970e61 - KT-31295: Disable module selection toolbar for `.ws.kts` files (7 дней назад) * e54b43bab11 - KT-31295: Enable support for `.ws.kts` files as for scratch files (7 дней назад) * 232c7fdd0e4 - KT-31295: Add `New Kotlin Worksheet` action (7 дней назад) * f6b03dc02f4 - (tag: build-1.3.60-dev-118) Add Show Kotlin Gradle DSL Logs Action (KT-31440) (7 дней назад) * dd3f8ecaacd - (tag: build-1.3.60-dev-116) IR BE Common: Provisional IrFunctionExpression lowering (7 дней назад) * 92984b2626e - Serialize/deserialize IrFunctionExpression (7 дней назад) * ffd9b45ef33 - IrFunctionExpression: add 'origin' (7 дней назад) * 41b59f9b9a6 - IrFunctionExpression: update fir2ir tests (7 дней назад) * ed2b4a8bec2 - Introduce IrFunctionExpression IR element (7 дней назад) * 022275b781e - (tag: build-1.3.60-dev-115, origin/rr/ig/native-composite-test) Do not invalidate package caches on generic events, KT-25264 (7 дней назад) * 3e9765f5bb1 - (tag: build-1.3.60-dev-112) Don't over-cache own methods list in KtUltraLightClass (8 дней назад) * 73356cbb4b1 - Check self before complex equivalence check in light parameter (8 дней назад) * 484c4ca268c - Try to postpone activating decompiler from light element equivalence (8 дней назад) * 9fd46c105dc - Reformat and cleanup in asJava/elements (8 дней назад) * 353ca9752f6 - Better validity check for kotlin light element (8 дней назад) * 60c4eb68ff4 - (tag: build-1.3.60-dev-111, tag: build-1.3.60-dev-109, tag: build-1.3.60-dev-105) Add condition for `checkNonParenthesizedAnnotationsOnFunctionalType` call to except error reporting in stub mode (8 дней назад) * 4bad92d28c9 - (tag: build-1.3.60-dev-101) Fixed bug in LateinitLowering (8 дней назад) * 407e5a5270d - (tag: build-1.3.60-dev-98, tag: build-1.3.60-dev-88, origin/rr/kishmakov/plugin-submit) Use same models in MPP and CIDR (8 дней назад) * 2cc6bf31e0e - (tag: build-1.3.60-dev-84) Add link to license folder into README.md (8 дней назад) * a2d284c7690 - (tag: build-1.3.60-dev-81) ScriptDefinitionsManager shouldn't be ready if definitions aren't initialized yet (KT-32554) (8 дней назад) * e40cdef2579 - Scripts: pass script definition as parameter to loader (KT-32554) (8 дней назад) * 763f1e8606b - Scripts: check that file is non-script starting script compilation configuration update (8 дней назад) * c14f842aa0c - (tag: build-1.3.60-dev-72, tag: build-1.3.60-dev-66) Fix dependency between idea core environment and jdom (9 дней назад) * 20fedb040f9 - Update 192 branch to 2019.2 BETA2 (192.5728.12) (9 дней назад) * 59c5bcc11ce - Fix Jsr305HighlightingTest in 192 - don't ask project for not initialized fixture (9 дней назад) * 9e002b3ff89 - Fix inability to instantiate UsefulTestCase because of JdomSerializer (9 дней назад) * 5341de253f9 - (tag: build-1.3.60-dev-65) JVM IR: run FileClass & ExpectDeclarationsRemoving phases on whole module (9 дней назад) * e867830eab0 - JVM IR: inline JvmBackend, JvmCodegen (9 дней назад) * 9d639bc9a48 - Minor, remove code duplication in WrappedDescriptors (9 дней назад) * 0423d0f41ee - JVM_IR: specify facadeClassGenerator properly in Psi2IrTranslator (9 дней назад) * 1d3b1ed0cbd - (tag: build-1.3.60-dev-56) CIDR: Filter aux library order entries that do not represent K/N libraries (9 дней назад) * 10b79816ab7 - Always analyze KTS with JVM platform (9 дней назад) * 80d2e2ac0d9 - Make [Jvm|Js]IdePlatformKind and [Jvm|Js]IdePlatformKindTooling available in all IDEs (9 дней назад) * f37c81f1be0 - Dependency on K/N platform-deps is no more required in plugin.xml (9 дней назад) * 7ee5583c894 - (tag: build-1.3.60-dev-39) Fix error message for non-parenthesized annotations on functional types (9 дней назад) * 6a679d86ab3 - (tag: build-1.3.60-dev-36) Support non-parenthesized annotations on functional types without receiver ^KT-31734 Fixed (9 дней назад) * 60e3787800d - (tag: build-1.3.60-dev-33) Tests for Sealed Class move + Fix invalid move declaration test (9 дней назад) * 91d603292c7 - #KT-27389 : Change JavaSourceRoot usages to Kotlin analogs (9 дней назад) * 895b49c0b92 - Disable default search in comments and strings when renaming (9 дней назад) * 145a4b24ca9 - #KT-29622: Support sealed classes with non-nested impls move (9 дней назад) * a16551557ca - #KT-29622: Support sealed classes with nested impls move (9 дней назад) * a8e0dfabc72 - (tag: build-1.3.60-dev-32) Add `-XX:+HeapDumpOnOutOfMemoryError` for gradle in import tests (9 дней назад) * 9595c815f12 - (tag: build-1.3.60-dev-31) JVM IR: invent names for SAM wrapper classes (9 дней назад) * a15575d5467 - JVM IR: do not use KotlinTypeMapper in IrTypeMapper.mapType (9 дней назад) * 1e16c0a447b - JVM IR: minimize public API of IrTypeMapper (9 дней назад) * 59ce76e9fd2 - JVM IR: do not use misleading names for callable reference classes (9 дней назад) * 29fa1793d3b - JVM IR: add InventNamesForLocalClasses pass (9 дней назад) * 529efff8cb8 - IR: introduce IrAttributeContainer (9 дней назад) * d399144b80e - Use TypeSystemCommonBackendContext in mapBuiltInType (9 дней назад) * 13bc5f0c470 - Use TypeSystemCommonBackendContext in computeExpandedTypeForInlineClass (9 дней назад) * c27d9c4546c - Use TypeSystemCommonBackendContext in KotlinTypeMapper.writeGenericArguments (9 дней назад) * 2585ce0aa78 - Introduce TypeSystemCommonBackendContext, use in KotlinTypeMapper.getVarianceForWildcard (9 дней назад) * 0460b2990fa - Use TypeSystemContext in KotlinTypeMapper.hasNothingInNonContravariantPosition (9 дней назад) * 1896537091c - Minor, extract inline class type mapping to separate file (9 дней назад) * bd8c09bfb51 - JVM IR: move CollectionToArray creation to JvmSymbols (9 дней назад) * 15e0fd93bd5 - Minor, rename IrBuiltIns.IrTypeMapper -> BuiltInIrTypePair (9 дней назад) * f9a1e582b21 - Minor, somewhat simplify ClassCodegen construction (9 дней назад) * edaff968ad6 - Minor optimization in MutableList.transformFlat (9 дней назад) * 945e058586b - (tag: build-1.3.60-dev-28) Document return value of removeAll and retainAll with predicate (9 дней назад) * 7d173ed3856 - (tag: build-1.3.60-dev-17) GradleBuildScript: throw exception when trying to change level of language features to disable in multiplatform & fix tests (9 дней назад) * 0d49ffa831b - UpdateConfigurationQuickFixTest: update tests (9 дней назад) * cb432acfb76 - BuildScriptManipulator: implement new syntax for enable experimental features in MPP #KT-28295 Fixed (9 дней назад) * 88870319626 - GradleConfiguratorTest: fix `configureJvmEAPWithBuildGradleKts` test (9 дней назад) * 46dfff7d822 - KotlinBuildScriptManipulator: cleanup code (9 дней назад) * b1d1a4b2e18 - FeatureSupportIntentionActionsFactory: add the missing branch `else` (9 дней назад) * 28215186ca4 - (tag: build-1.3.60-dev-15) IR serialization: migrate to new generated Java classes structure (9 дней назад) * 8baa7dfe227 - Generated Java classes for Kotlin IR protobuf (9 дней назад) * 2305bea2b51 - Generate IR protobuf classes as multiple Java files (9 дней назад) * d6eee37481b - GenerateProtoBuf: support java_multiple_files mode (9 дней назад) * 19dfbfa42cd - Cleanup: make comments more informative (9 дней назад) * 1cdcde86e38 - Extract adding of sourceSets to subclass, cause superclass is also used in other wizards where this procedure breaks build.gradle #KT-32105 Fixed (9 дней назад) * 5b660636505 - Add clarifications about single/multi targeting to framework descriptions (9 дней назад) * a864715cb8d - Refactoring: extract and pull up duplicated code from JVM- and JS- related subclassed (9 дней назад) * 9d6367a9be2 - Add Kotlin/MPP to Gradle group of New Project Wizards #KT-32105 Fixed (9 дней назад) * 7ccf21c5c81 - (tag: build-1.3.60-dev-8) FIR resolve: fix vararg parameter types (9 дней назад) * 592cf4f4e8f - Make FirNamedReferenceWithCandidate not resolved, fix receiver completion (9 дней назад) * 08f44d4f14f - FIR resolve: add early protection against cyclic property resolve (9 дней назад) * 1222449dc83 - FIR resolve: perform inference completion for property access (9 дней назад) * 99680a2ad75 - FIR: refactor & simplify invoke resolve a bit (9 дней назад) * fff954ed3f5 - FIR: skip extra non-valid groups during candidate resolve (9 дней назад) * b813f22cfe8 - Extract part of utility FIR transformers into TransformUtils (9 дней назад) * 0ac23eef933 - Minor (FIR resolve): replace session with fileSession (9 дней назад) * 3da11cc85b1 - Use no-op substitutor instead of substitutor with empty map (9 дней назад) * 2d74dac4f2f - FIR: set constructor parameter scope correctly for designated transformer (9 дней назад) * b8c3947827d - Measure unresolved function call & qualified access # in FIR bench (9 дней назад) * af45e1c5dc9 - (tag: build-1.3.60-dev-5) [JS BE] Do not produce source mapping for fake KtElement (9 дней назад) * 12736edfc17 - (tag: build-1.3.60-dev-1, tag: build-1.3.50-dev-2275) Revert "Add Kotlin/MPP to Gradle group of New Project Wizards #KT-32105 Fixed" (10 дней назад) * eb608770e7f - Revert "Refactoring: extract and pull up duplicated code from JVM- and JS- related subclassed" (10 дней назад) * 067978e6130 - Revert "Add clarifications about single/multi targeting to framework descriptions" (10 дней назад) * b1e371a2dd6 - (tag: build-1.3.50-dev-2268) MPP: don't return `Main` modules from `implementedModules` for `Test` modules #KT-28529 Fixed #KT-30799 Fixed (10 дней назад) * 60421c441e8 - IDE: add warn on java files outside java source roots #KT-28121 Fixed (10 дней назад) * 4928f3ff570 - CreateExpectedFix: fix KNPE from init block #KT-32639 Fixed (10 дней назад) * f38e4d618e3 - (tag: build-1.3.50-dev-2266) Support Array::class literal, forbid Array::class on non-JVM (10 дней назад) * 8103f0ba60b - (tag: build-1.3.50-dev-2265) Fix compilation in AbstractAndroidBytecodeShapeTest.kt (10 дней назад) * 496765f41e2 - (tag: build-1.3.50-dev-2255) Support target templates in bytecode tests (10 дней назад) * de1e27c5845 - Make all progression headers inclusive, and decrement last for last-exclusive progressions (i.e., "until" progressions and loop over array indices). (10 дней назад) * 39f6416757e - (tag: build-1.3.50-dev-2252) Show progress on remove unused imports, KT-30748 (10 дней назад) * cfab89385f5 - (tag: build-1.3.50-dev-2249) Do not override path calculation in light virtual files in tests: (10 дней назад) * 0c1d8e29b9e - (tag: build-1.3.50-dev-2246) Fix creation of empty source sets in tests (10 дней назад) * 1336f655355 - Improve diagnostics in importing tests and fix android test (10 дней назад) * afd2af01cda - NewMultiplatformProjectImportingTest - bunched (10 дней назад) * 4386518c4d2 - (tag: build-1.3.50-dev-2244) Add intrinsic for ULong/UInt.toString on Java 8+ (10 дней назад) * b7917978b8a - (tag: build-1.3.50-dev-2243) New J2K: correctly create AST for Java call of Kotlin data class derived members (10 дней назад) * d29d7fb2572 - New J2K: do not resolve unary expressions method symbols (10 дней назад) * 84872e064fa - New J2K: use test data for nj2k conversion tests from nj2k tests data instead of old one (10 дней назад) * 101a3a9420a - (tag: build-1.3.50-dev-2242) Add clarifications about single/multi targeting to framework descriptions (10 дней назад) * f742e000f82 - Refactoring: extract and pull up duplicated code from JVM- and JS- related subclassed (10 дней назад) * 6b3117cc2c5 - Add Kotlin/MPP to Gradle group of New Project Wizards #KT-32105 Fixed (10 дней назад) * 5e8192bf74b - (tag: build-1.3.50-dev-2220) Make kotlin-test-js integration test tasks incremental (11 дней назад) * 385366384c2 - (tag: build-1.3.50-dev-2219) Psi2ir: ignore unresolved annotations (11 дней назад) * 9062f4229ba - (tag: build-1.3.50-dev-2218) QuickDoc: Show sample code containing type parameters correctly (11 дней назад) * 2ef575d94e4 - (tag: build-1.3.50-dev-2204) Fix nullability in the instrumenter, avoid exceptions on tests setup (11 дней назад) * 4caddd2c1ca - (tag: build-1.3.50-dev-2196, tag: build-1.3.50-dev-2188) KT-31291: Wrap ASM version in a method to avoid having it inlined (11 дней назад) * 6619106af23 - Improve incremental KAPT logging (11 дней назад) * 5cab6fd6cf4 - KAPT: Mark incremental cache as LocalState (11 дней назад) * 251d8ccd97b - KT-31840: Fix caching for incremental annotation processing (11 дней назад) * 6963424dfc2 - (tag: build-1.3.50-dev-2185) psi2ir: Empty 'if' branches have type 'kotlin.Unit' (11 дней назад) * 0774f800a08 - (tag: build-1.3.50-dev-2184) Split android box tests by flavours (11 дней назад) * 7c77565bb8b - (tag: build-1.3.50-dev-2176) Add changelog for 1.3.41 (13 дней назад) * aee1dd23798 - (tag: build-1.3.50-dev-2173) Gradle, test runner: fix failed test (typo) (2 недели назад) * abb1a9892b0 - (tag: build-1.3.50-dev-2172) Gradle, webpack: use only archivesBaseName as outputFileName (2 недели назад) * 6658c1da2ff - IDE, Wizards, JS for browser: create index.html in resources (2 недели назад) * 4fc942c5e91 - (tag: build-1.3.50-dev-2171) KT-16602: Improve mutable sorting samples, fix sample references (2 недели назад) * 38d26b1d923 - (tag: build-1.3.50-dev-2170) KT-16602: Provide samples for sorting API usage (2 недели назад) * 3f5d64e6359 - (tag: build-1.3.50-dev-2158) Add sample of hashMapOf (2 недели назад) * cd6abcd4c9b - (tag: build-1.3.50-dev-2155) Expect modifier definitions is not exposed by UL-classes (2 недели назад) * 0602a6da720 - Fix invalid FakeJvmFieldConstant inspection for UL classes (2 недели назад) * a9aa60491e2 - Fix UL-classes test renders and test data (2 недели назад) * 4b1226e3d79 - Set correct nullability and Companion support to annotations (2 недели назад) * eea469939e0 - Kotlin meta-annotation converter for UL-annotations (2 недели назад) * afe784e79e4 - Add UL-annotations support (2 недели назад) * 4fed6249427 - (tag: build-1.3.50-dev-2154) Append for commit: switch ScriptReportSink to new scripting API (2 недели назад) * 63767b4dca5 - Performance: do not check file type for scripts with standard extension (2 недели назад) * 2577dfa06ab - (tag: build-1.3.50-dev-2152) docs: added KDoc for Comparator, fixed KDoc for comparison binarySearch() (2 недели назад) * 09b3b2e5b7c - (tag: build-1.3.50-dev-2151) Enable adroid_arm64 on mingw hosts (2 недели назад) * fc45948da69 - (tag: build-1.3.50-dev-2150) CreateActualFix: should create source root directory if it doesn't exist #KT-27555 Fixed (2 недели назад) * f310bd3324f - RemoveRedundantQualifierNameInspection: apply on idea module (2 недели назад) * 229b8cb6a36 - RemoveRedundantQualifierNameInspection: shouldn't analysis import and package directives (2 недели назад) * 694c231689e - RemoveRedundantQualifierNameInspection: fix false negative for java constructor #KT-32506 Fixed (2 недели назад) * bd50454a73b - (tag: build-1.3.50-dev-2145) Change default for script displayName parameter to empty, generate name from base class in definition (2 недели назад) * 0cc40440fbb - Implement filePathPattern in the script configuration with handling (2 недели назад) * dface77b5cb - (tag: build-1.3.50-dev-2143, tag: build-1.3.50-dev-2140) NodeJS Test runner: update build time dependencies (2 недели назад) * 38ff228bc83 - (tag: build-1.3.50-dev-2139, origin/rr/gradle/snrostov/fixes2) Gradle, Tests runner: handle case when test runtime exits abnormally (2 недели назад) * 96dcafdf352 - (tag: build-1.3.50-eap-2, tag: build-1.3.50-dev-2137, tag: build-1.3.50-dev-2132, tag: build-1.3.50-dev-2128) Document order of array elements initialization (KT-32353) (2 недели назад) * dfcd28da2cf - (tag: build-1.3.50-dev-2126) Use the direct test descriptor parent for test start events in Gradle (2 недели назад) * f6679f27f4c - Add test tasks to the Gradle model built for MPP (2 недели назад) * 9b326707381 - (tag: build-1.3.50-dev-2125, tag: build-1.3.50-dev-2122) Build: Use stripMetadata task for result jar when relocation is enabled (2 недели назад) * efafb6585ee - (tag: build-1.3.50-dev-2118) [JS IR BE] Refactored `js("...")` function (2 недели назад) * 946bc75cda5 - [JS IR BE] Code clean up (2 недели назад) * f9336555da4 - [IR] Remove code duplication in IrTypeCheckerContext (2 недели назад) * c08b88281cd - (tag: build-1.3.50-dev-2111) Remove accidetial usages of the internal jdk classes (2 недели назад) * 1396b3e6821 - Return default configuration when refinement failed on resolving script descriptor (2 недели назад) * ab938efa68f - Attempt to fix Windows detection in main-kts tests (2 недели назад) * 382e55284cd - Fix legacy definitions error propagation (2 недели назад) * 10e19bccb17 - Abort script evaluation if environment is created with errors (2 недели назад) * c9a4328febc - Fix compiled scripts saving tests: (2 недели назад) * 9c004c3a528 - Refactor scripting compiler plugin - move cli dependent parts out of the -impl jar (2 недели назад) * 9ae0ff03faf - Improve script and REPL result handling: (2 недели назад) * dc4370ff084 - Implement support for new script customizations in command line compiler (2 недели назад) * 1ab255eafb8 - Use kotlin home for automatic loading of the scripting plugin (2 недели назад) --- .../jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt | 7 +++++++ .../org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt | 1 + gradle.properties | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt index 109375b05cf..961d6da5cab 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt @@ -113,6 +113,13 @@ internal val lateinitPhase = makeKonanFileLoweringPhase( prerequisite = setOf(inlinePhase) ) +// TODO make all lambda-related stuff work with IrFunctionExpression and drop this phase (see kotlin: dd3f8ecaacd) +internal val provisionalFunctionExpressionPhase = makeKonanModuleLoweringPhase( + { ProvisionalFunctionExpressionLowering() }, + name = "FunctionExpression-before-inliner", + description = "Transform IrFunctionExpression to a local function reference" +) + internal val stringConcatenationPhase = makeKonanFileLoweringPhase( ::StringConcatenationLowering, name = "StringConcatenation", diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt index fe528284793..0f3d76612b6 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt @@ -239,6 +239,7 @@ internal val allLoweringsPhase = namedIrModulePhase( description = "IR Lowering", lower = removeExpectDeclarationsPhase then lowerBeforeInlinePhase then + provisionalFunctionExpressionPhase then inlinePhase then lowerAfterInlinePhase then interopPart1Phase then diff --git a/gradle.properties b/gradle.properties index ed1e8de087b..2eca3a9ba4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,8 +18,8 @@ buildKotlinVersion=1.3.50-dev-787 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-787,branch:default:any,pinned:true/artifacts/content/maven remoteRoot=konan_tests -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-2110,branch:default:any,pinned:true/artifacts/content/maven -kotlinVersion=1.3.50-dev-2110 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-206,branch:default:any,pinned:true/artifacts/content/maven +kotlinVersion=1.3.60-dev-206 kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-2110,branch:default:any,pinned:true/artifacts/content/maven kotlinStdlibVersion=1.3.50-dev-2110 testKotlinCompilerVersion=1.3.50-dev-2110