summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* SAM conversion can be disabled using `-Xsource:2.11`Adriaan Moors2016-03-267-1/+15
| | | | For completeness, `-Xsource:2.11 -Xexperimental` does enable it.
* Refactor: simplify fallbackAfterVanillaAdapt.Adriaan Moors2016-03-263-108/+107
| | | | | | | | Trying to figure out if we can avoid adapting to SAM, and just type them once and for all in typedFunction. Looks like overload resolution requires SAM adaptation to happen in adapt. Cleaned up while I was in the area.
* SAM conversion precedes implicit view application (as in dotty).Adriaan Moors2016-03-263-29/+29
| | | | | | | | This reflects the majority vote on the PR. DSLs that need their implicit conversions to kick in instead of SAM conversion, will have to make their target types not be SAM types (e.g., by adding a second abstract method to them).
* Soften sam restrictionsAdriaan Moors2016-03-267-83/+122
| | | | | | | | | | | | | Some of the earlier proposals were too strongly linked to the requirements of the Java 8 platform, which was problematic for scala.js & friends. Instead of ruling out SAM types that we can't compile to use LambdaMetaFactory, expand those during compilation to anonymous subclasses, instead of invokedynamic + LMF. Also, self types rear their ugly heads again. Align `hasSelfType` with the implementation suggested in `thisSym`'s docs.
* Track Function's SAM symbol & target type using an attachmentAdriaan Moors2016-03-268-13/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot use the expected type to track whether a Function node targets a SAM type, as the expected type may be erased (see test for an example). Thus, the type checker attaches a SAMFunction attachment to a Function node when SAM conversion is performed in adapt. Ideally, we'd move to Dotty's Closure AST, but that will need a deprecation cycle. Thanks to Jason for catching my mistake, suggesting the fix and providing the test. Both the sam method symbol and sam target type must be tracked, as their relationship can be complicated (due to inheritance). For example, the sam method could be defined in a superclass (T) of the Function's target type (U). ``` trait T { def foo(a: Any): Any } trait U extends T { def apply = ??? } (((x: Any) => x) : U).foo("") ``` This removes some of the duplication in deriving the sam method from the expected type, but some grossness (see TODO) remains.
* Don't adapt erroneous tree to SAM type.Adriaan Moors2016-03-263-2/+13
| | | | | | Do not report second error. Go straight to the exit. Based on review by Jason.
* Jason's review feedback (ThisReferringMethodTraverser)Adriaan Moors2016-03-263-11/+13
| | | | | | | | | | | | | | | | | | | | | - Re-simplify logging; - Remove unused method valueTypeToObject; - Limit ThisReferringMethodTraverser to material parts of the AST Limit ThisReferringMethodTraverser's analysis to only look at template-owned anonfun method bodies, to make sure it's fairly low overhead. AFAICT, part of the complexity of this analysis stems from the desire to make all the lambda impl methods static in `() => () => 42`: https://gist.github.com/062181846c13e65490cc. It would possible to accumulate the knowledge we need during the main transform, rather than in an additional pass. We'd need to transform template bodies in such a way that we we process definitions of anonfun methods before usages, which would currently amount to transforming the stats in reverse.
* Refactor flag juggling. Review feedback from Jason.Adriaan Moors2016-03-265-49/+54
| | | | Sometimes booleans and a little duplication go a long way.
* Test bytecode emitted for indy sammyAdriaan Moors2016-03-262-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | Test that SAM conversion happens after implicit view application A function node is first type checked, and parameter types are inferred, regardless of whether the expected function type is one of our built-in FunctionN classes, or a user-defined Single Abstract Method type. `typedFunction` always assigns a built-in `FunctionN` type to the tree, though. Next, if the expected type is a (polymorphic) SAM type, this creates a tension between the tree's type and the expect type. This gap is closed by the adapt method, by applying one of the implicit conversion in the spec in order (e.g., numeric widening, implicit view application, and now, also SAM conversion) Thus, `adaptToSam` will assign the expected SAM type to the `Function` tree. (This may require some type inference.) The back-end will emit the right invokedynamic instruction that uses Java's LambdaMetaFactory to spin up a class that implements the target method (whether it's defined in FunctionN or some other Java functional interface).
* Additional SAM restrictions identified by JasonAdriaan Moors2016-03-2612-83/+139
| | | | | Also test roundtripping serialization of a lambda that targets a SAM that's not FunctionN (it should make no difference).
* More fixes based on feedback by LukasAdriaan Moors2016-03-2613-23/+58
| | | | | | | | | | | | | Crucially, the fully-defined expected type must be checked for conformance to the original expected type!! The logic in adaptToSam that checks whether pt is fully defined probably needs some more thought. See pos/t8310 for a good test case. Argument type checking is a challenge, as we first check against a lenient pt (this lenient expected type has wildcards, and thus is not fully defined, but we should still consider sam adaptation a success even if we end up with wildcards for some unknown type parameters, they should be determined later).
* Refactoring. Simplify inferImplicit's boolean leversAdriaan Moors2016-03-266-59/+73
|
* For backwards compat, sammy comes lastAdriaan Moors2016-03-261-7/+7
|
* Refactoring. Decakify TypeAdaptingTransformerAdriaan Moors2016-03-263-52/+47
|
* Treat `Function` literals uniformly, expecting SAM or FunctionN.Adriaan Moors2016-03-2612-335/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They both compile to INDY/MetaLambdaFactory, except when they occur in a constructor call. (TODO: can we lift the ctor arg expression to a method and avoid statically synthesizing anonymous subclass altogether?) Typers: - no longer synthesize SAMs -- *adapt* a Function literal to the expected (SAM/FunctionN) type - Deal with polymorphic/existential sams (relevant tests: pos/t8310, pos/t5099.scala, pos/t4869.scala) We know where to find the result type, as all Function nodes have a FunctionN-shaped type during erasure. (Including function literals targeting a SAM type -- the sam type is tracked as the *expected* type.) Lift restriction on sam types being class types. It's enough that they dealias to one, like regular instance creation expressions. Contexts: - No longer need encl method hack for return in sam. Erasure: - erasure preserves SAM type for function nodes - Normalize sam to erased function type during erasure, otherwise we may box the function body from `$anonfun(args)` to `{$anonfun(args); ()}` because the expected type for the body is now `Object`, and thus `Unit` does not conform. Delambdafy: - must set static flag before calling createBoxingBridgeMethod - Refactored `createBoxingBridgeMethod` to wrap my head around boxing, reworked it to generalize from FunctionN's boxing needs to arbitrary LMF targets. Other refactorings: ThisReferringMethodsTraverser, TreeGen.
* Review feedback from LukasAdriaan Moors2016-03-262-2/+5
|
* Set the scene for Sammy.Adriaan Moors2016-03-267-76/+71
| | | | | | | | Go beyond refactoring and introduce some hooks and patch some holes that will become acute when we set Sammy loose. Expanding sam requires class as first parent: `addObjectParent`. (Tested in pos/sam_ctor_arg.scala, coming next.)
* Refactoring. Sweep Sammy's backyard.Adriaan Moors2016-03-265-232/+190
|
* SI-9449 sam expansion for explicitly eta-expanded methodAdriaan Moors2016-03-262-2/+29
|
* Refactor typedFunction, rework synthesizeSAMFunction for sammyAdriaan Moors2016-03-2612-195/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `typedFunction` uniformly recognizes Single Abstract Method types and built-in `FunctionN` types, type checking literals regardless of expected type. `adapt` synthesizes an anonymous subclass of the SAM type, if needed to meet the expected (non-`FunctionN`) type. (Later, we may want to carry `Function` AST nodes with SAM types through the whole pipeline until the back-end, and treat them uniformly with built-in function types there too, emitting the corresponding `invokedynamic` & `LambdaMetaFactory` bytecode. Would be faster to avoid synthesizing all this code during type checking...) Refactor `typedFunction` for performance and clarity to avoid non-local returns. A nice perk is that the error message for missing argument types now indicates with `<error>` where they are missing (see updated check file). Allow pattern matching function literals when SAM type is expected (SI-8429). Support `return` in function body of SAM target type, by making the synthetic `sam$body` method transparent to the `enclMethod` chain, so that the `return` is interpreted in its original context. A cleaner approach to inferring unknown type params of the SAM method. Now that `synthesizeSAMFunction` operates on typed `Function` nodes, we can take the types of the parameters and the body and compare them against the function type that corresponds to the SAM method's signature. Since we are reusing the typed body, we do need to change owners for the symbols, and substitute the new method argument symbols for the function's vparam syms. Impl Notes: - The shift from typing as a regular Function for SAM types was triggered by limitation of the old approach, which deferred type checking the body until it was in the synthetic SAM type subclass, which would break if the expression was subsequently retypechecked for implicit search. Other problems related to SAM expansion in ctor args also are dodged now. - Using `<:<`, not `=:=`, in comparing `pt`, as `=:=` causes `NoInstance` exceptions when `WildcardType`s are encountered. - Can't use method type subtyping: method arguments are in invariant pos. - Can't use STATIC yet, results in illegal bytecode. It would be a better encoding, since the function body should not see members of SAM class. - This is all battle tested by running `synthesizeSAMFunction` on all `Function` nodes while bootstrapping, including those where a regular function type is expected. The only thing that didn't work was regarding Function0 and the CBN transform, which breaks outer path creation in lambdalift.
* SI-9415 Turn on SAM by defaultJason Zaugg2016-03-2616-18/+3
| | | | | | | | | | Initial work to change settings and test by Svyatoslav Ilinskiy Thanks! To avoid cycles during overload resolution (which showed up during bootstrapping), and to improve performance, I've guarded the detection of SAM types in `isCompatible` to cases when the LHS is potentially compatible.
* Spec updates for Sammy.Adriaan Moors2016-03-264-169/+157
| | | | | | | | | - Upgrade MathJax to 2.6. This fixes the vertical bar problem on Chrome (https://github.com/mathjax/MathJax/issues/1300); - Disambiguate link to Dynamic Selection; - Consolidate type relations; - Formatting, whitespace and linebreaks; - SAM conversion.
* Refactor. Extract mkLiteralUnit and mkUnitBlockAdriaan Moors2016-03-262-5/+8
|
* Remove dead code now that `genBCodeActive` is always true.Adriaan Moors2016-03-266-347/+57
|
* TypeHistory's toString time travels consistentlyAdriaan Moors2016-03-261-1/+4
| | | | | | | For each history entry, run the `Type`'s `toString` at the corresponding phase, so that e.g., a method type's parameter symbols' `info`'s `toString` runs at the phase corresponding to the type history we're turning into a string.
* sbt build targets build/Adriaan Moors2016-03-261-5/+5
| | | | | It avoids confusion with existing test/partest scripts that test the compiler in build/, while sbt it targeting build-sbt/.
* Merge pull request #5050 from code-star/topic/2.12.x-scaladoc-Auto-expandVlad Ureche2016-03-252-26/+31
|\ | | | | Fix scaladoc scroll and auto-expand on permalinks
| * scaladoc fix permalinksDavid Hoepelman2016-03-251-25/+30
| | | | | | | | | | | | | | * Member description auto-expands * If member comes from implicits is now becomes visible * Member is no longer hidden by search bar after scrolling * Permalink button now works when member is in a group (scrolling is still broken)
| * Fixed Typo in scaladoc scheduler.jsPim Verkerk2016-03-251-1/+1
|/
* Merge pull request #5055 from lrytz/merge-2.11-to-2.12-mar-21Adriaan Moors2016-03-2327-230/+533
|\ | | | | Merge 2.11 to 2.12
| * Merge commit '1fcfdd8' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-231-29/+33
| |\
| | * Merge pull request #5054 from lrytz/intellij-2.112.11.xLukas Rytz2016-03-2327-236/+507
| | |\ | | | | | | | | Update IntelliJ build for use with sbt
| | | * Cleanup IntelliJ integration based on review feedbackLukas Rytz2016-03-221-31/+35
| | | |
| * | | Merge commit '4ef1429' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-230-0/+0
| |\| |
| | * | Merge pull request #5056 from viktorklang/wip-SI9488-Future.toString-√Lukas Rytz2016-03-234-2/+34
| | |\ \ | | | | | | | | | | SI-9488 - adds the same default toString format to Scala Futures as 2…
| | | * | SI-9488 - adds the same default toString format to Scala Futures as 2.12.xViktor Klang2016-03-224-2/+34
| | | | | | | | | | | | | | | | | | | | Includes tests to verify the toString representations.
| | * | | Merge pull request #5026 from SethTisue/scala-xml-version-bumpLukas Rytz2016-03-221-1/+1
| | |\ \ \ | | | |/ / | | |/| | upgrade to latest scala-xml (namely 1.0.5)
| | | * | Merge branch '2.11.x' into scala-xml-version-bumpSeth Tisue2016-03-094-5/+5
| | | |\ \
| | | * | | upgrade to latest scala-xml (namely 1.0.5)Seth Tisue2016-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there shouldn't be user-visible changes since 1.0.4, but regardless, it's good to depend on the latest
| * | | | | Updates to IntelliJ files for 2.12.xLukas Rytz2016-03-213-34/+41
| | | | | |
| * | | | | Merge commit '5f5cc18' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-2127-230/+522
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Update IntelliJ build for use with sbtLukas Rytz2016-03-2127-236/+503
| | |/ / /
| * | | | Merge commit 'afb1458' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-210-0/+0
| |\| | |
| | * | | Merge pull request #5030 from SethTisue/newer-akkaAdriaan Moors2016-03-151-1/+1
| | |\ \ \ | | | |_|/ | | |/| | bundle a newer Akka actors jar
| | | * | Merge branch '2.11.x' into newer-akkaSeth Tisue2016-03-094-5/+5
| | | |\ \ | | | |/ / | | |/| |
| | | * | bundle a newer Akka actors jarSeth Tisue2016-03-091-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | might as well let people have the current stuff. I asked the Akka folks and nobody saw a reason not to upgrade. this version of Akka is the latest in the 2.3.x series, but is also some months old, so no stability worries. (this would have been included in 2.11.8 if I had thought of it in time)
* | | | Merge pull request #5051 from kmizu/improve-api-docsAdriaan Moors2016-03-231-0/+1
|\ \ \ \ | | | | | | | | | | Improve documentation of `GenSeqLike#length`
| * | | | Add scaladoc comment about the case when Exception will be thrown by ↵Kota Mizushima2016-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | invocation of length method
* | | | | Merge pull request #5053 from som-snytt/issue/9314Lukas Rytz2016-03-233-20/+57
|\ \ \ \ \ | | | | | | | | | | | | SI-9314 Marginal edge case to warn-missing-interp
| * | | | | SI-9314 No warn on ${nonid}Som Snytt2016-03-233-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the sym test on an expr that happens to be a subset of idents and is not in scope. Other `${ operator_* }` warn.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-14 05:59:11 +0000