summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4497 from retronym/topic/indylambda-diy-boxingJason Zaugg2015-05-167-32/+158
|\ | | | | [indylambda] Relieve LambdaMetafactory of boxing duties [ci: last-only]
| * [indylambda] Relieve LambdaMetafactory of boxing dutiesJason Zaugg2015-05-156-31/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `LambdaMetafactory` generates code to perform a limited number of type adaptations when delegating from its implementation of the functional interface method to the lambda target method. These adaptations are: numeric widening, casting, boxing and unboxing. However, the semantics of unboxing numerics in Java differs to Scala: they treat `UNBOX(null)` as cause to raise a `NullPointerException`, Scala (in `BoxesRuntime.unboxTo{Byte,Short,...}`) reinterprets the null as zero. Furthermore, Java has no idea how to adapt between a value class and its wrapped type, nor from a void return to `BoxedUnit`. This commit detects when the lambda target method would require such adaptation. If it does, an extra method, `$anonfun$1$adapted` is created to perform the adaptation, and this is used as the target of the lambda. This obviates the use of `JProcedureN` for `Unit` returning lambdas, we know use `JFunctionN` as the functional interface and bind this to an `$adapted` method that summons the instance of `BoxedUnit` after calling the `void` returning lambda target. The enclosed test cases fail without boxing changes. They don't execute with indylambda enabled under regular partest runs yet, you need to add scala-java8-compat to scala-library and pass the SCALAC_OPTS to partest manually to try this out, as described in https://github.com/scala/scala/pull/4463. Once we enable indylambda by default, however, this test will exercise the code in this patch all the time. It is also possible to run the tests with: ``` % curl https://oss.sonatype.org/content/repositories/releases/org/scala-lang/modules/scala-java8-compat_2.11/0.4.0/scala-java8-compat_2.11-0.4.0.jar > scala-java8-compat_2.11-0.4.0.jar % export INDYLAMBDA="-Ydelambdafy:method -Ybackend:GenBCode -target:jvm-1.8 -classpath .:scala-java8-compat_2.11-0.4.0.jar" qscalac $INDYLAMBDA test/files/run/indylambda-boxing/*.scala && qscala $INDYLAMBDA Test ```
| * Update to scala-java8-compat 0.4.0Jason Zaugg2015-05-111-1/+1
| |
* | Merge pull request #4502 from cneijenhuis/documentation/try-example-deprecatedAdriaan Moors2015-05-151-2/+3
|\ \ | | | | | | Fixed deprecation warning in scaladoc example of Try
| * | Fixed deprecation warning in scaladoc example of TryChristoph Neijenhuis2015-05-151-2/+3
| |/
* | Merge pull request #4499 from lrytz/removeAsmLukas Rytz2015-05-1295-31833/+92
|\ \ | |/ |/| Move ASM out of the repository [ci: last-only]
| * Remove ASM sourcesLukas Rytz2015-05-1184-31804/+0
| |
| * intellij project files for ASM removalLukas Rytz2015-05-117-8/+15
| | | | | | | | ij fix
| * Inlcude ASM as a dependency in sbt buildLukas Rytz2015-05-111-9/+57
| |
| * Include ASM as a dependency in ANT buildLukas Rytz2015-05-113-12/+20
| | | | | | | | The classfiles are still integrated into scala-compiler.jar.
* | Merge pull request #4496 from adriaanm/artifactory-bintrayAdriaan Moors2015-05-082-5/+6
|\ \ | | | | | | Subst repo.typesafe -> dl.bintray, use jcenter cache
| * | Subst repo.typesafe -> dl.bintray, use jcenter cacheAdriaan Moors2015-05-082-5/+6
|/ / | | | | | | | | | | | | Switch to https while we're at it, and remove duplicate entry for sbt-plugin-releases (NOTE: 'organization' <-> 'organisation', see http://ant.apache.org/ivy/history/latest-milestone/concept.html#patterns)
* | Merge pull request #4492 from lrytz/scriptsBackportJason Zaugg2015-05-088-140/+213
|\ \ | | | | | | Backport releas script fixes to 2.11.x
| * | [backport] Fixes a comment in the bootstrap script.Lukas Rytz2015-05-061-9/+11
| | | | | | | | | | | | Backport of 48328cc2a2ae26cf6d6cec5da30605b1be6f0990
| * | [backport] Remove existing builds from private-repo before building a release.Lukas Rytz2015-05-061-0/+25
| | | | | | | | | | | | Backport of 1a292c3d0fe10699837a02ffd8adc3ea4d3a6d22
| * | [backport] Revert back to Scalacheck 1.11.x, fixes to bootstrap scriptAdriaan Moors2015-05-062-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scalacheck 1.12.x cross-compiles to JS and will take more work to integrate. Make sure we never attempt to publish scalacheck to sonatype. Force checkout module refs in case of dirty workspace. Backport of f238586d1b9d93533ee9507b56a26a97c2b2501c
| * | [backport] remove references to private-repo.typesafe.comLukas Rytz2015-05-064-23/+10
| | | | | | | | | | | | Backport of 9cd3e6505aa4285750e63263e2551ab71f36ff8d
| * | [backport] Update versions.properitesLukas Rytz2015-05-062-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tagged revisions of the modules integrate the latest release of the sbt-scala-modules sbt plugin. This enables building with a new scala binary version (e.g. 2.12.0-M1) without failinig MiMa. Also updates the other external dependencies. Backport of 8da073cd6bfaaaf3789fc8b70a61ebb66a2f0ded
| * | [backport] Documentation and some updates for the release build scriptLukas Rytz2015-05-062-110/+157
| | | | | | | | | | | | Backport of 7b54922b77fe1cf40177fc4a5ee9707bb5d854d2
| * | [backport] Comments in versions.propertiesLukas Rytz2015-05-061-2/+8
| | | | | | | | | | | | Backport of f9153619380d755a531f887fe0bd63b6e6a91738
| * | [backport] Remove starr.use.released property (not in use anymore)Lukas Rytz2015-05-062-2/+1
| |/ | | | | | | Backport of 3b2abdf6af87debdfb01f22f185d2a35852218fc
* | Merge pull request #4495 from ceedubs/updated-throwsJason Zaugg2015-05-081-0/+1
|\ \ | |/ |/| Add @throws annotation to GenSeqLike.updated
| * Add @throws annotation to GenSeqLike.updatedCody Allen2015-05-071-0/+1
|/ | | | | | | | Similarly to GenSeqLike.apply, GenSeqLike.updated can throw IndexOutOfBoundsException. For example, the following throws IndexOutOfBoundsException: Vector.empty[String].updated(0, "foo")
* Merge pull request #4491 from som-snytt/issue/noassertionsLukas Rytz2015-05-065-7/+21
|\ | | | | SI-9302 -Xdisable-assertions raises elide level
| * SI-9302 -Xdisable-assertions raises elide levelSom Snytt2015-05-055-7/+21
|/ | | | | | | | | | Previously, the flag caused any elidable to be elided. This commit simply sets -Xelide-below to ASSERTION + 1. The flag is useful because there's no mnemonic for specifying the magic constant as an option argument. `-Xelide-below ASSERTION` means asserts are enabled.
* Merge pull request #4490 from retronym/ticket/9298Lukas Rytz2015-05-055-0/+29
|\ | | | | SI-9298 Fix erasure of value classes in Java
| * SI-9298 Fix erasure of value classes in JavaJason Zaugg2015-05-055-0/+29
|/ | | | | | | | | | | | Value classes that appear in signatures of Java defined methods should not be erased to the underlying type. Before this change, we'd get a `ClassCastException`, as the Scala call site would unbox the value class despite the fact the Java recipient would expect the boxed representation. I've tested this for primitive and object wrapped types in parameter and return position.
* Merge pull request #4475 from smarter/fix/old-spec-linksLukas Rytz2015-05-044-6/+6
|\ | | | | Remove references to the old PDF version of the specification
| * Remove references to the old PDF version of the specificationGuillaume Martres2015-04-304-6/+6
| |
* | Merge pull request #4486 from mpociecha/ticket/8679Lukas Rytz2015-05-046-5/+7025
|\ \ | | | | | | SI-8679 Add support for ScalaLongSignature attribute in scalap
| * | SI-8679 Add support for ScalaLongSignature attribute in scalapMichał Pociecha2015-05-036-5/+7025
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scalap didn't support really big class files. It was returning an empty String for such files. The reason was that there were only ScalaSignatures taken into account. This commit adds support for ScalaLongSignature. We try to get such an attribute when we didn't find ScalaSignature. Also there's added an additional case to the logic retrieving bytes for a signature. Since ScalaLongSignature can contain many parts, we have to merge their byte arrays. Changes are tested by a new partest-based test. These two files are really big, but it was required (t8679.scala is a reduced version of BigScalaClass - an example attached to JIRA). There are also added TODOs with a JIRA ticket: We have three places, where we process Scala signatures. In the future it would be better to reuse some common logic, if it's possible.
* | | Merge pull request #4467 from nafg/patch-1Lukas Rytz2015-05-041-2/+2
|\ \ \ | | | | | | | | Fix scaladoc of Try#failed
| * | | Fix scaladoc of Try#failednafg2015-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | The documentation stated that it returns a Success[Throwable] regardless, either containing the failure or an UnsupportedOperationException. However only Failure#failed returns a success; Success#failed returns a Failure. Also the phrasing of "Completes this `Try`" and "that `Try` failed with" sounds like it was copy-pasted from Future? Trys don't complete, nor fail, they are immutable.
* | | | Merge pull request #4463 from retronym/topic/indylambda-emit-indyLukas Rytz2015-05-049-23/+186
|\ \ \ \ | | | | | | | | | | Use LambdaMetafactory where possible for lambda creation.
| * | | | Small refactorings and additional comments in DelambdafyJason Zaugg2015-04-221-46/+54
| | | | |
| * | | | Update internal documentation in Delambdafy phaseJason Zaugg2015-04-221-5/+12
| | | | |
| * | | | Support specialized method-handle based lambdasJason Zaugg2015-04-213-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` scala> (x: Int) => {??? : Int} res2: Int => Int = $$Lambda$1371/1961176822@6ed3ccb2 scala> res2(42) scala.NotImplementedError: an implementation is missing at scala.Predef$.$qmark$qmark$qmark(Predef.scala:225) at .$anonfun$1(<console>:8) at $$Lambda$1371/1961176822.apply$mcII$sp(Unknown Source) ... 33 elided scala> (x: Int, y: Long) => {??? : Int} res4: (Int, Long) => Int = $$Lambda$1382/1796047085@6f8e8894 scala> res4(0, 0L) scala.NotImplementedError: an implementation is missing at scala.Predef$.$qmark$qmark$qmark(Predef.scala:225) at .$anonfun$1(<console>:8) at $$Lambda$1382/1796047085.apply$mcIIJ$sp(Unknown Source) ... 33 elided ```
| * | | | Add scala-java8-compat to scala-library.jarJason Zaugg2015-04-211-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the ant build is run with `-Dscala-java8-compat.package`, the contents of `org.scala-lang.modules:scala-java8-compat` are spliced into `scala-library.jar`. This is handy to facilitate downstream testing of indy lambdas, we can just use the the compiler options `-target 1.8 -Ydelambdafy:method -Xexperimental` without needed to add `scala-java8-compat.jar` to the compile and runtime classpaths. (Classpath augmentation doesn't appear to be straight forward in partest or in the community build.)
| * | | | SI-8359 Update a test to work with indylambdaJason Zaugg2015-04-211-0/+1
| | | | |
| * | | | SI-8359 Emit invokedynamic for lambdasJason Zaugg2015-04-215-12/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suitable lambdas are identified in Delambdafy and marked with such with a tree annotation that includes the data needed by the backend to emit an invokedynamic instruction. GenBCode to rewrite instantiation of such anonymous function classes with an invokedynamic instruction. At this stage, I don't plan to merge the support for this into GenASM. Between these points, the lambda capture is represented as an application of a dummy factory symbol: ``` <dummy>(captures...) : FunctionN ``` Demo: ``` % wget http://central.maven.org/maven2/org/scala-lang/modules/scala-java8-compat_2.11/0.3.0/scala-java8-compat_2.11-0.3.0.jar % qscala -classpath scala-java8-compat_2.11-0.3.0.jar -Ydelambdafy:method -target:jvm-1.8 -Ybackend:GenBCode Welcome to Scala version 2.11.6-20150309-144147-c91c978c81 (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_25). Type in expressions to have them evaluated. Type :help for more information. scala> (() => "").getClass res0: Class[_ <: () => String] = class $$Lambda$1/871790326 ``` I have also corrected an error in a previous commit. The newly added symbol test, `isDelambdafyTarget`, needs to check for the `ARTIFACT` flag, as that is what is added to the method by `Uncurry`.
* | | | | Merge pull request #4470 from swaldman/correct-predef-assertion-docLukas Rytz2015-05-041-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix documentation of assertions in Predef
| * | | | | Fixed documentation of assertions in Predefswaldman2015-04-281-2/+2
| | | | | | | | | | | | | | | | | | Assertions can be elided at compile time; they generate no runtime conditional code and are in fact run unconditionally if not elided during compilation. Updated documentation to reflect that.
* | | | | | Merge pull request #4469 from retronym/ticket/9282Lukas Rytz2015-05-041-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-9282 Avoid obscuring an exception during classfile parsing
| * | | | | | SI-9282 Avoid obscuring an exception during classfile parsingJason Zaugg2015-04-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on analysis of a stack trace in this bug report, I identified a code path in `ClassfileParser` that can lead to an NPE in its exception handling code. If `val in = new AbstractFileReader(file)` throws (e.g during its construction in which it eagerly reads the file `val buf: Array[Byte] = file.toByteArray`), the call to `in.file` in `handleError` will NPE. This commit stores the active file directly a field in ClassfileParser and uses this in the error reporting.
* | | | | | | Merge pull request #4473 from retronym/ticket/9285Lukas Rytz2015-05-043-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-9285 Don't warn about non-sensible equals in synthetic methods
| * | | | | | | SI-9285 Don't warn about non-sensible equals in synthetic methodsJason Zaugg2015-04-293-1/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notably, in the synthetic equals method of a case class. Otherwise, we get an unsuppressable warning when defining a case class with a `Unit`-typed parameter, which some folks use a placeholder for real type while evolving a design.
* | | | | | | Merge pull request #4487 from mpociecha/remove-unused-source-classLukas Rytz2015-05-041-127/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused, mostly commented out doc/html/page/Source.scala
| * | | | | | | Remove unused, mostly commented out doc/html/page/Source.scalaMichał Pociecha2015-05-021-127/+0
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file seems to be some early, unfinished draft. It's unused and mostly commented out. De facto it hasn't been changed since this version: https://github.com/scala/scala/blob/d9e3dde6d6d18b9a93e7566447cc3ee342f033d5/src/compiler/scala/tools/nsc/doc/html/page/Source.scala Just in meantime someone updated imports, moved it to other package etc. but nothing more.
* | | | | | | Merge pull request #4488 from gbasler/topic/files-in-wrong-placeLukas Rytz2015-05-045-4/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Cleanup files in wrong place
| * | | | | | | Avoid `Set` instantiation.Gerard Basler2015-05-031-2/+1
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 21:11:24 +0000