From a345b3ce1c5803bd33bcfa920420d2cb36b52d1b Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Wed, 4 Sep 2019 14:50:09 +0300 Subject: [PATCH] [kotlin compiler][update] 1.3.60-dev-1867 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 870dbd158c5 - (HEAD -> master, tag: build-1.3.60-dev-1867, origin/master, origin/HEAD) KT-28910: Add tooltips for toolbar checkboxes in .kts scratch editor (4 hours ago) * f0f2fd56842 - KT-28910: Extract labels from scratch editor to KotlinBundle messages (4 hours ago) * 72b68ee683c - (tag: build-1.3.60-dev-1863) Fix proguarding of jline library in compiler (4 hours ago) * 3f28b71509b - (tag: build-1.3.60-dev-1854) [IR] Fix issue getting the length property from CharSequence bounded type parameter (18 hours ago) * eb5e91d6bbd - (tag: build-1.3.60-dev-1852) Do not use typeMapper to count number of coroutine parameters in MethodInliner (18 hours ago) * 2648fb2ddde - Do not use typeMapper.mapAsmMethod for erased invoke in MethodInliner (18 hours ago) * 4953f675630 - JVM IR: do not use KotlinTypeMapper indirectly via InlineCodegen (18 hours ago) * ad8b7ff6450 - Minor, extract PsiInlineCodegen to a separate file (18 hours ago) * bf5ca2ed843 - Cleanup compiler warnings in IR-related modules (18 hours ago) * 406462d422a - (tag: build-1.3.60-dev-1840) Regenerate FIR tree visitors and transformers (21 hours ago) * ac3864543cc - (tag: build-1.3.60-dev-1820) Add Family.TVOS, Family.WATCHOS and KonanTarget.ANDROID_X86, KonanTarget.WATCHOS_X86, KonanTarget.WATCHOS_ARM32. (24 hours ago) * 5bd88f3191c - (tag: build-1.3.60-dev-1815) [IR] ForLoopsLowering: fixed problems with type parameters (24 hours ago) * 21c7c89dbc8 - (tag: build-1.3.60-dev-1812) [JS KLIB IC] Support incremental klib generation for JS IR (25 hours ago) * d6facf2976f - [JS KLIB IC] Fix test runner (25 hours ago) * 3753b75609d - [JS KLIB IC] Implement incremental cache for IR (25 hours ago) * 7840cf70f02 - [IC] Add missed runtime dependency (25 hours ago) * 104a50f7861 - [KLIB] Update ABI version (25 hours ago) * 6bea4033389 - [KLIB] Fix ir serializer output format (25 hours ago) * c8c93289734 - [KLIB] Switch to monolithic layout (25 hours ago) * c8a3374829e - [KLIB] Do not store Date in klib manifest (25 hours ago) * 1cdff7810ee - [Psi2Ir] Fix Lazy Fake override field (25 hours ago) * f2a5ab8c163 - [IR SERIALIZATION] Fix zipped layout (25 hours ago) * 90504c797af - [IR SERIALIZATION] Add tests about klib linkage (25 hours ago) * 1e547dd1cdf - [IR SERIALIZATION] Add more informative error message (25 hours ago) * 31f3e668d22 - [IR SERIALIZATION] Cleanup mangler interface (25 hours ago) * 2e0ab8ba3fb - [IR SERIALIZATION] Fix `ONLY_DECLARATION_HEADERS` mode (25 hours ago) * 0c7454c9184 - [IR SERIALIZATION] Fix forward Declarations in deserializaer (25 hours ago) * 2bd3d90fe01 - [IR SERIALIZATION] Link depend modules lazily (25 hours ago) * aa8b58e396c - [IR SERIALIZATION] Get rid of `UniqIdKey` (25 hours ago) * aa313903cc9 - [IR SERIALIZATION] Support both Per-File and Monolitic klib layout (25 hours ago) * 125982841a7 - [IR SERIALIZATION] Fix clashes (25 hours ago) * 55f06ecff58 - [IR SERIALIZATION] Fix rebase (25 hours ago) * 16be3b6d6ec - [IR SERIALIZATION] Add `deserializaFullModule` API (25 hours ago) * d9affc5abb2 - [IR SERIALIZATION] Raname IrIrSeriazlizedIrFile -> SerializedIrFile (25 hours ago) * f6339bcf931 - [IR SERIALIZATION] Handle UniqId clashes (25 hours ago) * 5e14b94a889 - [IR SERIALIZATION] Do not track non-metadata descriptors in descriptor table (25 hours ago) * df5f6a2a128 - [IR SERIALIZATION] Refactored uniqId allocation (25 hours ago) * 19b5d57f0e0 - [IR PROTO] Delete unused proto.java files (25 hours ago) * b7b951c8c87 - [IR] Refactoring (25 hours ago) * ea42eb6a5c7 - [IR] Fix rebase (25 hours ago) * d50eb5ce523 - [IR SERIALIZATION] Make [de]serialization processes incremental (25 hours ago) * 96a2cc1f17c - [JS IR] Clean up Declaration Table code (25 hours ago) * f14107bf653 - [IR] Sort dependencies a bit early (25 hours ago) * 14651212666 - [IR] Split declaration & descriptor tables (25 hours ago) * a7714a55899 - [JS IR BE] Split IrModule/IrFile serializers (25 hours ago) * 15a49cf2aab - [IR BE] Rename IrModuleSerializer -> IrFileSerializer (25 hours ago) * 94a03c9cb42 - [IC KLIB] Serialization infrastructure refactoring (25 hours ago) * 5a45960c04e - [IR] Do not interact with file system during Ir Serialization (25 hours ago) * 85b1e0165b5 - (tag: build-1.3.60-dev-1810) [IR] For loop lowering for CharacterSequence.indices. (25 hours ago) * 63f43d9b2e7 - (tag: build-1.3.60-dev-1807, tag: build-1.3.60-dev-1805) Revert "Use lazySync instead of lazyPub to avoid raise on creation LightClasses" (26 hours ago) * d0c02a1a34e - (tag: build-1.3.60-dev-1804) PackageDirectoryMismatchInspection: fix exception from empty script file #KT-33437 Fixed (27 hours ago) * 102a3d60e03 - (tag: build-1.3.60-dev-1789) IR: Consistently copyAttributes in DeepCopyIrTreeWithSymbols (2 days ago) * 5fc6fa86197 - (tag: build-1.3.60-dev-1785) Unregistered bunch directives and files test (2 days ago) * 412c5625724 - Updated switch usage in README (2 days ago) * 4dc4acd25f8 - Move CoroutineNonBlockingContextChecker to common code (2 days ago) * 79a603768a1 - (tag: build-1.3.60-dev-1783) UltraLight implementation for local and anonymous declarations (2 days ago) * d6c54b845b4 - (tag: build-1.3.60-dev-1777) Use lazySync instead of lazyPub to avoid raise on creation LightClasses (2 days ago) * b856d605752 - (tag: build-1.3.60-dev-1773) Add required plugins for Android Studio 3.6 to runtime (2 days ago) * a6fb2bd7a74 - Update to AS 3.6.0.9 (2 days ago) * a65967a164c - (tag: build-1.3.60-dev-1769) Mention the `master` branch as the target of pull requests in contributing.md. (#2533) (2 days ago) * 7eac7d96dc2 - (tag: build-1.3.60-dev-1761) Fix NJ2K test related to KT-30136 (2 days ago) * 5b118b65fc8 - (tag: build-1.3.60-dev-1759) [FIR] Tests. Update testdata broken in 9508fc60 (2 days ago) * 54eb4cf928a - [FIR] Add synthetic else branch to `when` if it's missing to LightTreeFirBuilder (2 days ago) * 5c29af4b53d - (tag: build-1.3.60-dev-1757) [FIR] Tests. Update some outdated FIR testdata (2 days ago) * f494e0008cb - [FIR] Minor. Add kdoc to FirDataFlowAnalyzer (2 days ago) * 286a322b55b - [FIR] Remove DummyFirDataFlowAnalyzer (2 days ago) * 92acd30bd6c - [FIR] Refactor Condition classes (2 days ago) * 84787013dd8 - [FIR] Fix CFG form for boolean operators (2 days ago) * 63bd920f166 - [FIR] Tests. Make cfg graphs more strict (2 days ago) * a87891bec9b - [FIR] Some control flow graph building fixes (2 days ago) * 9508fc60c94 - [FIR] Remove FirUncheckedNotNullCastImpl from FIR (2 days ago) * c2602fda1fa - [FIR] Transform all qualified access nodes with smartcasts (2 days ago) * c1a8344b45a - [FIR] Add forgotten nullability for receivers of safe calls (2 days ago) * fd84202c084 - [FIR] Add fir node for qualified access with smartcast (2 days ago) * 04b6c48ae78 - [FIR] Disable smartcasts to Nothing? (2 days ago) * b58a03458e1 - [FIR] Tests. Improve style of control flow graphs (2 days ago) * 7851657b987 - [FIR] Store fir in DataFlowVariable (2 days ago) * 163c5d699fd - [FIR] Pass flow to right operand of && expression (2 days ago) * 59205cac135 - [FIR] Tests. Add orthogonal edge routing for cfg dumps (2 days ago) * b2e95eebabc - [FIR] Add processing of loops with constant boolean value in condition (2 days ago) * a60115c4529 - [FIR] Fix propagating deadness for loops and when expressions (2 days ago) * 006cb536e08 - [FIR] Add detecting dead edges for boolean operators with consts (2 days ago) * fd1347f2b78 - [FIR] Tests. Add instruction for configuring tool for cfg dump viewing (2 days ago) * b7e1e7704eb - [FIR] Tests. Change extension for testdata with cgf from `.cfg.dot` to `.dot` (2 days ago) * 7e43a0d9efb - [FIR] Add boolean constant folding for DFA (2 days ago) * 78f7211587f - [FIR] Add test for smartcast with return in elvis (2 days ago) * 98b3901f9c6 - [FIR] Fix bug in building cfg for || (2 days ago) * fc43c8a74b5 - [FIR] Add inlining of control flow graphs of in-place anonymous functions (2 days ago) * e72d8e675aa - [FIR] Add invocation kind to anonymous functions (2 days ago) * e937e4b2619 - [FIR] Add bound smartcasts (2 days ago) * e6c04c04542 - [FIR] hold one-to-one mapping for data flow variable and Fir (2 days ago) * bda8c7ee1ca - [FIR] Fix smartcasts on when subject (2 days ago) * 200c13baf54 - [FIR] Add tests for smartcasts (2 days ago) * 7a81c37f5cd - [FIR] Fix building cfg for binary or (2 days ago) * 2d3e9fe5399 - [FIR] Add creating simple type for type parameters symbols (2 days ago) * b1731749c0a - Add failing test for smart-cast branch (2 days ago) * b4a4d4d709e - [FIR] Add renderer to .dot for control flow graph tests (2 days ago) * 2e501e0f973 - [FIR] Implement Data Flow Analysis (2 days ago) * 216b9ad933d - [FIR] Add logic system for data flow analysis (2 days ago) * 6e0f4f140f8 - [FIR] Minor. Add set of type operations to FirOperation (2 days ago) * 6b4e95ec52c - [FIR] Add tests for control flow graph building (2 days ago) * fc982cc7e8e - [FIR] Add data flow analyzer that delegates to CFG builder (2 days ago) * 9f0781c9de6 - [FIR] Add references to control flow graph to FirFunction and FirProperty (2 days ago) * 56ac1201b64 - [FIR] Add abstract data flow analyzer with callbacks for body resolve transformer (2 days ago) * dcfc75a58f4 - [FIR] Add control flow graph and infrastructure for building it (2 days ago) * 198599f3c73 - [FIR] Add builtins types to FirSession (2 days ago) * 7d4c635e853 - [FIR] Minor. Add util functions for checks that type is builtin (2 days ago) * 38fa0122e81 - [FIR] Add synthetic else branch to `when` if it's missing (2 days ago) * e904e638e94 - (tag: build-1.3.60-dev-1751, origin/rr/ayalyshev/fus-completion-test) LookupCancelWatcher bunches update (3 days ago) * 7b769b74a1e - Add bunches for AS ans 183 (3 days ago) * a962dd7155c - Add a bunch for as33 (3 days ago) * fa1a558b76a - Exclude logging in case of non-kotlin files (3 days ago) * cd78f3d9d79 - Add finish_reason and invocation_count to context (3 days ago) * 3926b91bb14 - Add window appearance time. Fix final context data structure. (3 days ago) * 7afa75e802a - Set event context structure (3 days ago) * e99395e5480 - Register FUS collector for Code Completion (3 days ago) * ac7c89b3b58 - Completions stats physical part, collector part left (3 days ago) * edd2cedfd39 - (tag: build-1.3.60-dev-1742) Disable GradleConfiguratorPlatformSpecificTest in AS 3.6 (5 days ago) * 5fa2b62de40 - Fix test failures in AS 3.6 because of InjectedLanguageManager (KT-33606) (5 days ago) * c0270ef47b5 - More plugins registration for Android Studio 3.6 (5 days ago) * e28802fbfa3 - Fix test failure because of duplicates file templates in classpath (5 days ago) * 0eea2479fcb - (tag: build-1.3.60-dev-1740) Added possibility to override Path Chooser for MoveKotlinNestedClassesToUpperLevelModel (5 days ago) * 99972a08a13 - (tag: build-1.3.60-dev-1725, origin/4u7/compare-dist) [FIR] Fix table rendering (5 days ago) * 438c90b4770 - (tag: build-1.3.60-dev-1721) Silence fir bench output for diagnostic smoke tests (5 days ago) * 312e93859ba - Add more info to fir bench report & format as table (5 days ago) * dca88db16aa - (tag: build-1.3.60-dev-1718) remove unused org.jetbrains.kotlin.idea.inspections.gradle.KotlinPlatformGradleDetector EP (5 days ago) * 02a6a1ea499 - (tag: build-1.3.60-dev-1710) Fix ExtractDeclarationFromCurrentFileIntention assertion (5 days ago) * 9594e9b3b1b - (tag: build-1.3.60-dev-1706) [JS IR BE] Initial export generation (5 days ago) * 6670180782f - [JS IR BE] Use internal visibility for generated helper methods (5 days ago) * 22c53e14e62 - (tag: build-1.3.60-dev-1700) [IR][inliner] fixed occasional endless recursion in InlinerExpressionLocationHint::toString (5 days ago) * 8218ca5baeb - (tag: build-1.3.60-dev-1698) More 182 branch mentioning remove (5 days ago) * 8ae4293a0f4 - Remove 181 branch from build scripts (5 days ago) * 0ae9240e5f6 - Remove 182 and AS33 from build scripts (5 days ago) * 51cfafc619c - Minor: advance comment (5 days ago) * 3989f5244f2 - Minor: Fix comment about absent method (5 days ago) * d04749dd3f6 - Remove other specific code after removing 182 (5 days ago) * 63f0eae7e29 - Remove CodeStyleSettingsProviderCompat.java after removing 182 (5 days ago) * d1aca83dd50 - Remove getInvalidIcon default implementation after removing 182 (5 days ago) * edb83f4ed93 - Remove IconExtensionChooser and png icons after removing 182 (5 days ago) * 888a93115ff - Use function icon from the platform after removing 182 (5 days ago) * 169aa6348c7 - Remove runConfigurationsCompat.kt after removing 182 (5 days ago) * ddcadc8138f - Remove default implementations after removing 182 (5 days ago) * 081ffe7d199 - Remove ScriptModificationListener compat after removing 182 (5 days ago) * 23f488498f7 - Remove EditorFactoryListenerWrapper compat after removing 182 (5 days ago) * 9abdddf09ac - Remove psiFile extension after removing 182 (5 days ago) * 372c6377e81 - Remove AstLoadingUtil after removing 182 (5 days ago) * 4d0fc1dc22b - Remove 182 support (5 days ago) * 1c4ee6bd79a - Remove as33 support (5 days ago) * 0ec18b4a33a - (tag: build-1.3.60-dev-1694) Explicit this inspection: fix false negative with local variable (5 days ago) * eb469b924f2 - Add frontend visualizer module auto test in gradle (5 days ago) * 24cce758994 - Add FIR_IGNORE directive to test files that must be skipped (5 days ago) * 350bd337696 - Move FirRenderer class inside FirVisualizer to avoid ambiguity with existed FirRenderer (5 days ago) * 262f57d9388 - Add more tests in uncommonCases folder (5 days ago) * b8ef09a1573 - Repalce work with stack variable to work with extension functions (5 days ago) * fd461a5147b - Fix current package removing from properties (5 days ago) * f0e7dcc4f6b - Fix superTypes test by adding parameter to primary constructor (5 days ago) * f0c7aadb203 - Exctract common code from psi and fir visualizer classes (5 days ago) * d5047745271 - Create fir renderer class (5 days ago) * 7a45155eb32 - Create tests for fir visualizer (5 days ago) * 2179f970066 - Create fir visualizer abstract test class and extract common code with psi tests (5 days ago) * fe328f8c7a2 - Add some additional information to psi renderer (5 days ago) * 8fb23838454 - Move psi visualizer test to separate "psi" package (5 days ago) * aebe8c36f53 - Add test methods and data for uncommon cases (5 days ago) * 8047aa22a40 - Add test methods and data base on raw fir builder test data (5 days ago) * fd8205e3177 - Add removing current file package name from fq name (5 days ago) * d2e47aea019 - Change render to separate package names with slash symbol (5 days ago) * 08c9fa52590 - Rewrite Annotator to be able to put several annotations in one position (5 days ago) * 1c2ffa65ca2 - Revert commit with changes in DescriptorRenderer (5 days ago) * 3a12bac9109 - Wrote separate descriptor renderer (5 days ago) * b57c34fd4d2 - Remove rendering from super and this expressions and from package directive (5 days ago) * d0e1234434b - Add separate method to render special functions (5 days ago) * e94417e27b5 - Remove unnecessary data from render result (5 days ago) * feec5b1a7cb - Make annotation process a little clearer (5 days ago) * e23e662ba73 - Remove names from value parameters list (5 days ago) * 6fa7435cd43 - Add additional options to DescriptorRender (5 days ago) * 1879fd19ebf - Create simple renderer for old frontend (5 days ago) * e69e6a1eeb7 - Create simple text annotator based on binary search (5 days ago) * 77c330d94e7 - Make a structure for frontend visualizer (5 days ago) * e895a0b8a01 - (tag: build-1.3.60-dev-1693) FIR resolve: integrate implicit receivers into ImplicitReceiverStack (5 days ago) * f2c77c45e93 - FIR: simplify rendering of dispatch & extension receivers (5 days ago) * dfacc2d68f7 - FIR builder test: remove always-false check (5 days ago) * e36a75250b6 - FIR: visit/transform dispatch & extension receivers only once (5 days ago) * 5defe226512 - FIR [MapArguments]: transform only arguments but not all children (5 days ago) * 8bb539ce19d - FIR resolve: integrate receiverExpression inside ReceiverValue (5 days ago) * 0962755fde9 - FIR2IR: drop field receiver consistency check (due to delegate field case) (5 days ago) * 75c4c88d0ad - FIR: set receivers for invoke case more precisely (5 days ago) * 62bb127fc9a - FIR: add K/J test with getValue() / value fake cycle (5 days ago) * f0f4ddecc0b - FIR: set dispatch receiver for field symbols (5 days ago) * bd5e1aeef59 - FIR2IR: change backing field visibility to private (5 days ago) * 271c15114ce - FIR: add test with problematic cases (5 days ago) * 652fd7ee734 - FIR: fix dispatch receivers for objects (5 days ago) * 29b406c731e - FIR: set dispatch receiver for backing field access (5 days ago) * 13d14df8ae2 - FIR: set dispatch receiver for data class generated functions (5 days ago) * 0d5cfa97a53 - FIR2IR: read & set dispatch & extension receivers (5 days ago) * b531e535b63 - FIR call resolve: set values of dispatch & extension receivers (5 days ago) * 67a72433611 - FIR (rename): candidateOwner -> boundSymbol (5 days ago) * 8633a33108a - FIR: add new qualified access implementation (FirThisReceiverExpression) (5 days ago) * c63919f2249 - FIR tree: add dispatch & extension receivers (5 days ago) * da22898a19d - FIR2IR: set 'SetField' type to Unit, convert explicit 'this' references (5 days ago) * 66045391548 - FIR: set bound symbol for explicit this references (5 days ago) * aa79064a96b - (tag: build-1.3.60-dev-1691) Remove deprecated spec tests map generators (5 days ago) * e4938c6c36a - (tag: build-1.3.60-dev-1690) [FIR] Remove status map from intersection type (5 days ago) * ef4ef08b1d9 - [FIR] Add default upper bound for java type parameters (5 days ago) * 8ed13178397 - (tag: build-1.3.60-dev-1686) [IR] For loop lowering for iteration over CharacterSequences. (5 days ago) * 26fbe3f07b7 - (tag: build-1.3.60-dev-1682) JPS Build: remove outdated note about updating bootstrap (5 days ago) --- .../jetbrains/kotlin/backend/konan/llvm/LlvmAttributes.kt | 2 +- gradle.properties | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttributes.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttributes.kt index 34a7d9986f8..e1d35a12afd 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttributes.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttributes.kt @@ -47,7 +47,7 @@ private fun shouldEnforceFramePointer(context: Context): Boolean { } return when (context.config.target.family) { - Family.OSX, Family.IOS -> context.shouldContainLocationDebugInfo() + Family.OSX, Family.IOS, Family.WATCHOS, Family.TVOS -> context.shouldContainLocationDebugInfo() Family.LINUX, Family.MINGW, Family.ANDROID, Family.WASM, Family.ZEPHYR -> false } } diff --git a/gradle.properties b/gradle.properties index 188179c0898..4d804c6588c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,10 +18,10 @@ buildKotlinVersion=1.3.60-dev-1210 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-1210,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.60-dev-1666,branch:default:any,pinned:true/artifacts/content/maven -kotlinVersion=1.3.60-dev-1666 -kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-1666,branch:default:any,pinned:true/artifacts/content/maven -kotlinStdlibVersion=1.3.60-dev-1666 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-1867,branch:default:any,pinned:true/artifacts/content/maven +kotlinVersion=1.3.60-dev-1867 +kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-1867,branch:default:any,pinned:true/artifacts/content/maven +kotlinStdlibVersion=1.3.60-dev-1867 testKotlinCompilerVersion=1.3.60-dev-1210 konanVersion=1.3.60 org.gradle.jvmargs='-Dfile.encoding=UTF-8'