summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* SI-4014 Scaladoc omits @authorKonstantin Fedorov2014-02-026-4/+74
|
* Merge pull request #3448 from retronym/topic/opt10Grzegorz Kossakowski2014-02-021-4/+23
|\ | | | | Optimizations in tail calls
| * Optimization in TailCallsJason Zaugg2014-01-311-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only store the position and reason for a failure to tailcall transform a method if we ever need to report it, ie, if the method was annotated with @tailrec. Saves object hashing and map updates, profiling suggests that this reduces the tailcalls phase from about 2% of compilation time to about 1%. Also, clear the maps eagerly after each compilation unit, rather than letting them accumulate entries for the entire run. Working with smaller maps can't hurt.
| * Optimize tailcall eliminationJason Zaugg2014-01-311-1/+2
| | | | | | | | | | | | From the "if a tree falls" department: don't bother create a finely distinguished error messages about why the transform is inapplicable if the current context doesn't demand it.
| * Don't try to eliminate tail calls in constructors.Jason Zaugg2014-01-311-1/+6
| |
* | Merge pull request #3445 from retronym/topic/opt7Grzegorz Kossakowski2014-02-029-26/+81
|\ \ | | | | | | Grab bag of compiler optimizations
| * | Optimize use of methodTypeSchemaJason Zaugg2014-02-011-1/+2
| | | | | | | | | | | | | | | | | | | | | Cache it, rather than recreating it for each candidate overriden method we encounter. We can't do this eagerly as we trip a cycle in neg/t5093.scala.
| * | Optimize lookup of tree/symbol attachment search.Jason Zaugg2014-02-013-5/+8
| | | | | | | | | | | | Use `hasAttachment` rather than `getAttachment.exists`
| * | More overrides for SetNJason Zaugg2014-02-011-0/+46
| | |
| * | Implicits: Move shadowing checks after plausibility checksJason Zaugg2014-02-011-2/+2
| | | | | | | | | | | | | | | Shadowing is rarer than implausbility; this seems to be the most efficient way to order these filters.
| * | Optimization in InstantiateDependentMapJason Zaugg2014-02-011-1/+1
| | | | | | | | | | | | Avoid creating a throwaway array in existentialsNeeded.
| * | Optimize typedDefDef: disable some checks post typerJason Zaugg2014-01-311-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isPossibleRefinement reported as 1% of my profile, about half of that was reported from the `EraserTyper`. This commit restricts `checkMethodStructuralCompatible` to the typer phase, and also moves in the feature warning for implicits which was nearby. I've also made a minor optimization to `overriddenSymbol` by avoiding computing the method schema repeatedly.
| * | Typers#stabilize is a noop in erasure's typer.Jason Zaugg2014-01-312-1/+4
| | | | | | | | | | | | Anything we can do to make erasure faster.
| * | Optimize TreeInfo#isMacroApplication.Jason Zaugg2014-01-311-2/+4
| | | | | | | | | | | | | | | It's called rather frequently. Tree#symbol is a megamorphic call, which featured in profiles.
| * | Optimize isSelfSuperCallJason Zaugg2014-01-311-7/+7
| |/ | | | | | | | | | | Avoid the Applied extractor altogether, as that eagerly creates `argss` which we don't need and which is quite expensive.
* | Merge pull request #3450 from Ichoran/issue/7266Grzegorz Kossakowski2014-02-021-2/+6
|\ \ | | | | | | SI-7266 Stream leaks memory
| * | SI-7266 Stream leaks memoryRex Kerr2014-01-311-2/+6
| | | | | | | | | | | | | | | | | | Changed tail-generation function to mutable and clear it after it's used to allow any captured memory to be freed once the tail has been generated. (This is a case where a by-name parameter was used when a lazy val parameter was wanted instead. If we ever get lazy val parameters, we should switch to that.)
* | | Merge pull request #3424 from som-snytt/issue/7322Adriaan Moors2014-02-012-1/+12
|\ \ \ | | | | | | | | SI-7322 Interpolator idents must be encoded
| * | | SI-7322 Interpolator idents must be encodedSom Snytt2014-01-292-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, they are not found. This matters for term names with a differential encoding. Footnote, normally ident() encodes, but INTERPOLATIONID is !isIdent, so that is not used here. Maybe that would be the better improvement.
* | | | Merge pull request #3422 from adriaanm/mailmapAdriaan Moors2014-02-011-0/+2
|\ \ \ \ | | | | | | | | | | update mailmap
| * | | | update mailmapAdriaan Moors2014-01-281-0/+2
| |/ / /
* | | | Merge pull request #3441 from gourlaysama/t7124Adriaan Moors2014-02-013-1/+28
|\ \ \ \ | | | | | | | | | | SI-7124 make macro definitions prettier in scaladoc
| * | | | SI-7124 make macro definitions prettier in scaladocAntoine Gourlay2014-01-313-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Macros are now prettier in scaladoc, by - hiding the `macroImpl` annotation - showing the `macro` modifier in front
* | | | | Merge pull request #3444 from retronym/topic/opt6Adriaan Moors2014-02-018-26/+57
|\ \ \ \ \ | | | | | | | | | | | | Avoid generic collections operations hot paths
| * | | | | Avoid generic collections operations hot pathsJason Zaugg2014-01-318-26/+57
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use a specialized version of List#{map, collectFirst} These special case mapping over an empty list and avoid allocating. - Avoid nonEmpty in favor of `ne Nil` I see in the order of 2% speedup. Perhaps more useful is that these methods no longer dominate the YourKit profiles, even though profiler bias due to safepoints at allocation of the ListBuffer might have been overstating their significance.
* | | | | Merge pull request #3447 from retronym/topic/opt9Adriaan Moors2014-01-312-15/+25
|\ \ \ \ \ | |_|_|_|/ |/| | | | Optimize the pickler phase
| * | | | Optimize the pickler phaseJason Zaugg2014-01-312-15/+25
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move "erroneous type" diagnostic into a crash recovery handler, rather than running it proactively - move the "unexpanded macros" check into refchecks. Cuts this phase in half, from about 1% of compile time to 0.5%.
* | | | Merge pull request #3425 from retronym/ticket/7700Jason Zaugg2014-01-313-9/+38
|\ \ \ \ | |/ / / |/| | | SI-7700 @unspecialized, Part Deux: Now Working.
| * | | SI-7700 @unspecialized, Part Deux: Now Working.Jason Zaugg2014-01-313-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This annotation was introduced to allow us to mark methods within a specialized trait as immune from specialization. In particular, this is desirable for `Function1.{andThen, compose}`. However, it seems we need to check for this in two places in the specialization code base. The feature is now backed with a test.
* | | | Merge pull request #3357 from retronym/ticket/8143Adriaan Moors2014-01-319-29/+46
|\ \ \ \ | |_|/ / |/| | | SI-8143 Regressions with override checks, private members
| * | | SI-8143 Regressions with override checks, private membersJason Zaugg2014-01-149-29/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These regressed in e609f1f20b, which excluded all private methods from overriding checks. We should only exclude private[this] members on the low end of a pair, as was done before that commit, and, we must also exclude private members on the high side. Why? Warning: reverse engineered intuition follows. We need to report an error when if a private method in a subclass has matches a less-private method in the super class and report an error, lest the user be fooled into thinking it might be invoked virtually. On the other hand, adding a private method to a super class shouldn't invalidate the choice names of public members in its superclasses. I've removed the test case added by that commit and will lodge a reworked version of it that Paul provided as a new issue. That shows a bug with qualified private + inheritance. In addition, the expectation of `neg/accesses.check` is reverted to its 2.10.3 version, which I believe is correct. When it was changed in e609f1f20b it sprouted a variation, `neg/accesses-2`, which has now changed behaviour. The intent of that test will be captured in the aforementioned issue covering qualified private inheritance.
* | | | Merge pull request #3434 from Ichoran/issue/8213Adriaan Moors2014-01-303-4/+38
|\ \ \ \ | | | | | | | | | | SI-8213 AnyRefMap.getOrElseUpdate is faulty
| * | | | SI-8213 AnyRefMap.getOrElseUpdate is faultyRex Kerr2014-01-303-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Altered getOrElseUpdate to be robust to the map changing out from under it as a result of calling the default value method. Side-effects FTW! Made a comparable change in LongMap also, as it was also affected. And added a test to SetMapConsistencyTest.
* | | | | Merge pull request #3416 from retronym/topic/any-val-implicitAdriaan Moors2014-01-306-31/+54
|\ \ \ \ \ | |/ / / / |/| | | | Prohibit views targeting AnyVal
| * | | | Prohibit views targeting AnyValJason Zaugg2014-01-276-31/+54
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library changes in Scala 2.10 mean that we are left with the unfortunate situation of admitting: scala> "": AnyVal res0: AnyVal = We already have explicit checks in place to prevent views targeting `AnyRef`. This commit balances this out by prohibiting `AnyVal`, as well. The enclosed test shows that this case is now prevented. If multiple implicits views are applicable, the ambiguity error is still raised; these check comes right at the end. Maybe that ought to be changed, but I don't think it matters too much. I've also disabled this prohibition under -Xsource:2.10.
* | | | Merge pull request #3429 from som-snytt/issue/8205Jason Zaugg2014-01-292-2/+30
|\ \ \ \ | | | | | | | | | | SI-8205 Don't include CR in line
| * | | | SI-8205 Don't include CR in lineSom Snytt2014-01-292-2/+30
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More penance. Extend the unit test and don't include CR in the line text. This is obvious, which shows how dangerous it is to refactor without unit tests. My very favorite bugs are off-by-one and EOL handling, followed closely by off-by-Int.MaxValue.
* | | | Merge pull request #3427 from retronym/ticket/8205Jason Zaugg2014-01-292-3/+36
|\ \ \ \ | | | | | | | | | | Avoid long, slow march to AIIOBE in SourceFile#lineContent
| * | | | SI-8205 Avoid long, slow march to AIIOBE in SourceFile#lineContentJason Zaugg2014-01-292-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing a regression from SI-8015. The failure mode is kind of amusing: a while loop in `lineToString` would count all the way to `Int.MaxValue`, and integer overflow would foil a bounds check when looking for the 'LF' in 'CR'-'LF'. Given that we're not a style checker to enforce that source files end in a new-line, this commit accounts for EOF, and fixed the overflow problem too. A JUnit test exercises the bug and a few other variations of `lineContent`. While i was in the neighbourhood, I opted for a more efficient means to slice out that line.
* | | | | Merge pull request #3426 from retronym/ticket/8199Grzegorz Kossakowski2014-01-292-4/+112
|\ \ \ \ \ | | | | | | | | | | | | SI-8199 Account for module class suffix in -Xmax-classfile-name
| * | | | | SI-8199 Account for module class suffix in -Xmax-classfile-nameJason Zaugg2014-01-292-4/+112
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class file name of an inner class is based on the flattened name of its owner chain. But, if this is going to be unreasonably long, it is shortened with the help of a MD5 hash. However, after this shortening takes place, we sneakily add one more character (the infamous '$') to the name when it is used for the module class. It is thus possible to exceed the limit by one. The enclosed test failed on Mac with "filename too long" because of this. I have also tested for trait implementatation classes, but these seem to be suffixed with "$class" before the name compactification runs, so they weren't actually a problem. This change is binary incompatible as separately compiled defintions and usages of named, inner classes need to agree on this setting. Most typically, however, these long names crop up for inner anonymous classes / functions, which are not prone to the binary incompatiblity, assuming that their creation hasn't be inlined to a separately compiled client.
* | | | | Merge pull request #3374 from densh/si/6844-8076Jason Zaugg2014-01-2913-87/+194
|\ \ \ \ \ | | | | | | | | | | | | SI-6844 SI-8076 improve handling of function parameters in quasiquotes
| * | | | | SI-8076 improve support for implicit argument listDenys Shabalin2014-01-166-4/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for construction and deconstruction of implicit argument list which was originally suggested by @cvogt. 1. Splicing vale into implicit argument list automatically adds implicit flag to them: val x = q"val x: Int" q"def foo(implicit $x)" // <=> q"def foo(implicit x: Int)" 2. One might extract implicit argument list separately from other argument lists: val q”def foo(...$argss)(implicit ..$impl)" = q"def foo(implicit x: Int) // argss is Nil, impl contains valdef for x But this doesn't require you to always extract it separatly: val q”def foo(...$argss)" = q"def foo(implicit x: Int) // argss contains valdef for x
| * | | | | SI-6844 restrict splicing in parameter positionDenys Shabalin2014-01-1611-84/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously were a bit too permissive on how splicing in function parameter position worked. This made confusing things like possible: val x = TermName(“x”) q”def foo($x)” Now you can either splice trees in that position (ValDefs) or you have to provide type if you splice a name.
* | | | | | Merge pull request #3402 from densh/si/7275Eugene Burmako2014-01-2913-64/+206
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | SI-7275 allow flattening of blocks with ..$
| * | | | | Addresses feedback from JasonDenys Shabalin2014-01-277-47/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Adds tests for new synthetic unit stripping. 2. Marks implementation-specific parts of Holes as private. 3. Trims description of iterated method a bit. 4. Provides a bit more clear wrapper for q interpolator. 5. Refactors SyntacticBlock, adds documentation. 6. Makes q"{ ..$Nil }" return q"" to be consist with extractor.
| * | | | | Reify all blocks as syntactic blocksDenys Shabalin2014-01-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous version of the pattern wasn't precise enough due to the fact that synthetic units are now erased by syntactic block and this could cause incorrect reification for cases like: val x = { val y = 1 } Here syntactic block would extract one element but we still need to reify it through syntactic block endpoint. So we can't filter based on the number of elements extracted but rather filter on type of a tree.
| * | | | | Address pull request feedbackDenys Shabalin2014-01-232-2/+2
| | | | | |
| * | | | | SI-7275 allow flattening of blocks with ..$Denys Shabalin2014-01-236-17/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit extends current splicing rules to allow flattening of trees into other trees. Without such support it is impossible to correctly create vals with patterns and use it in other location as they could expand into multiple-statement blocks: scala> q"val (a, b) = (1, 2)" res0: reflect.runtime.universe.Tree = { <synthetic> <artifact> private[this] val x$1 = scala.Tuple2(1, 2): @scala.unchecked match { case scala.Tuple2((a @ _), (b @ _)) => scala.Tuple2(a, b) }; val a = x$1._1; val b = x$1._2; () } scala> q"..$res0; println(a + b)" res1: reflect.runtime.universe.Tree = { <synthetic> <artifact> private[this] val x$1 = scala.Tuple2(1, 2): @scala.unchecked match { case scala.Tuple2((a @ _), (b @ _)) => scala.Tuple2(a, b) }; val a = x$1._1; val b = x$1._2; println(a.$plus(b)) }
| * | | | | Refactor reification of high-cardinality holesDenys Shabalin2014-01-232-16/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New approach makes iterated function much more clear through aggressive code reuse, recursion and large descriptive comment on top of it.