summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Performance improvement: collectFirst in TraversableOnceRex Kerr2015-03-301-2/+15
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collectFirst was implemented in TraversableOnce by calling toIterator and then using a non-local return to pull out a Some when the partial function succeeded. This had two problems: 1. If the TraversableOnce was Iterator or Iterable, stepping through until pf is happy is much (15x!) faster. 2. If the TraversableOnce was not, creating an Iterator is a waste of time and memory This fixes both of these issues by inspecting the self-type and choosing the appropriate implementation. Further (modest) improvements likely possible in 2.12 by moving specialized implementations to child classes and using `applyOrElse` on the partial function with a package-private object instead of a locally created one.
* | | | | | | | | Merge pull request #4413 from lrytz/opt/inliningEverythingLukas Rytz2015-04-0710-115/+204
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes and Improvements for the new inliner
| * | | | | | | | | SI-9139 don't inline across @strictfp modesLukas Rytz2015-04-013-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cannot inline if one of the methods is @strictfp, but not the other.
| * | | | | | | | | Don't inlinie if the resulting method becomes too large for the JVMLukas Rytz2015-04-013-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This threshold is really the last resort and should never be reached. An inlining heuristic that blows up methods to the maximum size allowed by the JVM is broken. In the future we need to include some heuristic about code size when making an inlining decision, see github.com/scala-opt/scala/issues/2
| * | | | | | | | | Don't force the GenASM backend when passing -optimizeLukas Rytz2015-04-012-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior is confusing and also problematic for writing partest tests: CI passes -optimize, which negates the -Ybackend:GenBCode entry in a flags file.
| * | | | | | | | | Apply local variable index shift when inlining iinc instructionLukas Rytz2015-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was an oversight. Scalac never emits iinc, but it can appear when inlining from the classpath.
| * | | | | | | | | Clean up the way compiler settings are accessed in the backend.Lukas Rytz2015-04-018-68/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many backend components don't have access to the compiler instance holding the settings. Before this change, individual settings required in these parts of the backend were made available as members of trait BTypes, implemented in the subclass BTypesFromSymbols (which has access to global). This change exposes a single value of type ScalaSettings in the super trait BTypes, which gives access to all compiler settings.
| * | | | | | | | | Don't try to inline native methodsLukas Rytz2015-04-012-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because you can't, really.
| * | | | | | | | | Eliminate unreachable code before inlining a methodLukas Rytz2015-04-016-44/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running an ASM analyzer returns null frames for unreachable instructions in the analyzed method. The inliner (and other components of the optimizer) require unreachable code to be eliminated to avoid null frames. Before this change, unreachable code was eliminated before building the call graph, but not again before inlining: the inliner assumed that methods in the call graph have no unreachable code. This invariant can break when inlining a method. Example: def f = throw e def g = f; println() When building the call graph, both f and g contain no unreachable code. After inlining f, the println() call becomes unreachable. This breaks the inliner's assumption if it tries to inline a call to g. This change intruduces a cache to remember methods that have no unreachable code. This allows invoking DCE every time no dead code is required, and bail out fast. This also simplifies following the control flow in the optimizer (call DCE whenever no dead code is required).
| * | | | | | | | | Command-line flag to control inlining heuristicsLukas Rytz2015-03-314-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces a stress-test mode "everything" in which the inliner tries to inline every calliste that can be statically resolved.
| * | | | | | | | | Make class Invalid a ControlThrowableLukas Rytz2015-03-311-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Invalid is used for control flow in RightBiasedEither.orThrow.
* | / / / / / / / SI-9264 An even-better diagnostic for an unexplained crashJason Zaugg2015-04-071-1/+6
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have seen an intermittent crasher in the backend for the last month or so. In https://github.com/scala/scala/pull/4397, I added a diagnostic to show the actual locals in scope in the method. This commit further expands the diagnistic to show the method's tree.
* | | | | | | | Merge pull request #4370 from gbasler/ticket/SI-9181Adriaan Moors2015-04-063-66/+141
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | SI-9181 Exhaustivity checking does not scale (regression)
| * | | | | | | Bring back improvements from `SI-6942` that were lost during the switch toGerard Basler2015-03-021-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tseitin's transformation, e.g., use `CNF(P1 /\ ... /\ PN) == CNF(P1) ++ CNF(...) ++ CNF(PN)` in order to simplify the resultung formula.
| * | | | | | | Add a check to ensure that if the formulas originating from the exhaustivity /Gerard Basler2015-03-023-58/+111
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reachability analysis are too big to be solved in reasonable time, then we skip the analysis. I also cleaned up warnings. Why did `t9181.scala` work fine with 2.11.4, but is now running out of memory? In order to ensure that the scrutinee is associated only with one of the 400 derived classes we add 400*400 / 2 ~ 80k clauses to ensure mutual exclusivity. In 2.11.4 the translation into CNF used to fail, since it would blow up already at this point in memory. This has been fixed in 2.11.5, but now the DPLL solver is the bottleneck. There's a check in the search for all models (exhaustivity) that it would avoid a blow up, but in the search for a model (reachability), such a check is missing.
* | | | | | | [nomerge] SI-8940 Scaladoc: Fix "Order by Alphabetical" buttonKato Kazuyoshi2015-04-011-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | The selector has been wrong since 0c2614e.
* | | | | | Merge pull request #4418 from lrytz/t8731-relaxAdriaan Moors2015-03-312-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-8731 don't issue a @switch warning for two-case matches
| * | | | | | SI-8731 don't issue a @switch warning for two-case matchesLukas Rytz2015-03-312-2/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows annotating small pattern matches with `@switch` without getting any warnings. There's no reason to warn, the performance of the generated bytecode is good.
* | | | | | Merge pull request #4399 from lambdista/scaladoc-typo-1Lukas Rytz2015-03-311-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | ScalaDoc typo
| * | | | | | fix typo in scaladocAlessandro Lacava2015-03-241-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4375 from som-snytt/issue/8861Lukas Rytz2015-03-311-3/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | SI-8861 Handle alias when probing for Any
| * | | | | SI-8861 Handle alias when probing for AnySom Snytt2015-03-091-3/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | If args to a method are alias types, dealias to see if they contain Any before warning about inferring it. Similarly for return and expected types.
* | | | | Merge pull request #4318 from soc/topic/remove-deprecation-warningsLukas Rytz2015-03-2854-136/+142
|\ \ \ \ \ | | | | | | | | | | | | Remove deprecation warnings
| * | | | | Removed warningsEECOLOR2015-03-2635-48/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added `since` to deprecation statement - Added unit to parameter list - Removed usage of deprecated method polyType - Replaced deprecated `debugwarn` with `devWarning` - Changed switch statement to if else in order to remove a warning - Switched implementation of `init` and `processOptions` to prevent warning - Replaced deprecated `Console.readLine` with `scala.io.StdIn.readLine` - Replaced deprecated `startOrPoint` with `start` - Replaced deprecated `tpe_=` with `setType` - Replaced deprecated `typeCheck` with `typecheck` - Replaced deprecated `CompilationUnit.warning` with `typer.context.warning` - Replaced deprecated `scala.tools.nsc.util.ScalaClassLoader` with `scala.reflect.internal.util.ScalaClassLoader` - Replaced deprecated `scala.tools.ListOfNil` with `scala.reflect.internal.util.ListOfNil` - Replaced deprecated `scala.tools.utils.ScalaClassLoader` with `scala.reflect.internal.util.ScalaClassLoader` - Replaced deprecated `emptyValDef` with `noSelfType` - In `BoxesRunTime` removed unused method and commented out unused values. Did not delete to keep a reference to the values. If they are deleted people might wonder why `1` and `2` are not used. - Replaced deprecated `scala.tools.nsc.util.AbstractFileClassLoader` with `scala.reflect.internal.util.AbstractFileClassLoader`
| * | | | | new{Term,Type}Name→{Term,Type}Name, tpename/nme→{type,term}NamesSimon Ochsenreither2015-03-2618-37/+38
| | | | | |
| * | | | | Deprecations: Use of isPackage, hasSymbol, getter, setter...Simon Ochsenreither2015-03-2617-52/+50
| | | | | | | | | | | | | | | | | | | | | | | | ... replaced by hasPackageFlag, hasSymbolIn, getterIn, setterIn.
* | | | | | Merge pull request #4410 from gourlaysama/wip/t9038-encoding-issuesVlad Ureche2015-03-281-17/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | SI-9038 fix scaladoc syntax highlightning to leave unicode alone
| * | | | | SI-9038 fix scaladoc syntax highlightning to leave unicode aloneAntoine Gourlay2015-03-261-17/+17
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syntax highlightning in code blocks used to manipulate the raw bytes of a String, converting them to chars when needed, which breaks Unicode surrogate pairs. Using a char array instead of a byte array will leave them alone.
* | | | | Merge pull request #4361 from retronym/ticket/9182Lukas Rytz2015-03-261-1/+2
|\ \ \ \ \ | | | | | | | | | | | | SI-9182 Fix runtime reflection with package object, overloads
| * | | | | SI-9182 Fix runtime reflection with package object, overloadsJason Zaugg2015-02-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eponymous modules and methods should be allowed to live in the same package scope. This can happen when using a module and and implicit class, or when defining the overloads manually. This commit tones back an assertion that was added for sanity checking runtime reflection thread safety to only fire when we are sure that neither the existing and current symbol of the given name are methods.
* | | | | | Merge pull request #4358 from xeno-by/topic/names-defaultsLukas Rytz2015-03-261-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | better errors for macro applications with wrong number of arguments
| * | | | | better errors for macro applications with wrong number of argumentsEugene Burmako2015-02-241-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tryNamesDefaults branch of application typechecking contains the checkNotMacro check, which errors out when we try to do named/default arguments for macros (that's not supported yet, see SI-5920 for discussion). Unfortunately, the check activates too early, because it turns out that we can also enter tryNamesDefaults when the user just provides insufficient number of arguments to a method by mistake, without expecting any default arguments at all. This leads to really confusing errors, which can luckily be fixed in a very simple way by moving the checkNotMacro check down the happy path of named/default typechecking.
* | | | | Merge pull request #4310 from som-snytt/issue/9127-bLukas Rytz2015-03-251-7/+4
|\ \ \ \ \ | | | | | | | | | | | | SI-9127 Xlint doesn't think spaces are significant
| * | | | | SI-9127 Xlint doesn't think spaces are significantSom Snytt2015-02-211-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For purposes of warning about missing interpolators, such as `"$greeting"` when the intended code was `s"$greeting"`, spaces are no longer significant. The heuristic was previously intended to allow compileresque strings, where the dollar sign is a common prefix. Currently, the Xlint warning can be selectively disabled.
* | | | | | Merge pull request #4397 from retronym/topic/icode-diagnosticGrzegorz Kossakowski2015-03-241-7/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Improve diagnostic error on failed genLoadIdent
| * | | | | Improve diagnostic error on failed genLoadIdentJason Zaugg2015-03-241-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This error has been haunting us recently, firstly on Greg's machine when compiling the compiler using the new SBT build, and more recently during PR validation in #4316. This commit will output an error like: symbol value c#16812 does not exist in Macro.impl, which contains locals value a#16810, value b#16811 I've included symbol IDs in the hope that they will prove useful. It seems that synthetic identifiers generated by the pattern matcher are often seen in the vicinity of this bug.
* | | | | | Merge pull request #4380 from retronym/ticket/9020Jason Zaugg2015-03-241-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-9020 Avoid spurious value discarding warning post-typer
| * | | | | | SI-9020 Avoid spurious value discarding warning post-typerJason Zaugg2015-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typechecking during the specialization phase was emitting a bogus warning about value discarding. Such warnings in the typer should be guarded by `!isPastTyper` to restrict the analysis to the code the user originally wrote, rather than the results of later typechecking. I've made this change to the value discarding warning. I've also changed a numeric widening warning in the vicinity, although I do not have a test case for that.
* | | | | | | Merge pull request #4364 from som-snytt/issue/sessiontestJason Zaugg2015-03-243-15/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-9170 More flexible SessionTest
| * | | | | | | SI-9170 More flexible SessionTestSom Snytt2015-03-033-15/+48
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SessionTest session text can include line continuations and pasted text. Pasted script (which looks like a double prompt) probably doesn't work. This commit includes @retronym's SI-9170 one-liner.
* | | | | | | Merge pull request #4387 from retronym/ticket/9231Jason Zaugg2015-03-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-9231 Don't attempt implicit search for erroneous parameter
| * | | | | | | SI-9231 Don't attempt implicit search for erroneous parameterJason Zaugg2015-03-171-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the instantiated type of an implicit parameter is erroneous, we should not attempt the implicit search. This avoids the following useless error message in the enclosed test: error: ambiguous implicit values: ... match expected type M[<error>]
* | | | | | | Merge pull request #4378 from som-snytt/issue/9102Jason Zaugg2015-03-241-3/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-9102: Reflect method invoke with mixed args
| * | | | | | | SI-9102: Improve testSom Snytt2015-03-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cover the second use case reported on the ML (ctors). Improve formatting per the review. And it really does look a lot better.
| * | | | | | | SI-9102: Reflect method invoke with mixed argsSom Snytt2015-03-111-3/+6
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A missing default branch when a method had value class or by-name params caused other args to present as null under reflective invocation.
* | | | | | | Merge pull request #4381 from khernyo/issue/9219Jason Zaugg2015-03-241-8/+13
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | SI-9219 Stream toString returns unexpected result
| * | | | | | SI-9219 Stream toString returns unexpected resultSzabolcs Berecz2015-03-141-8/+13
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cursor was not advanced before appending the second element when only the first two elements of the stream were known. - When there is no cycle in the stream, the "scout" (and "cursor") ends up pointing to a stream where tailDefined is false. This means that cursor is either empty, or cursor.tail is not yet evaluated. The former case is handled properly, but in the latter case, one more element (cursor.head) needs to be appended.
* | | | | | Merge pull request #4338 from Ichoran/opt-SeqLike-2.11.xGrzegorz Kossakowski2015-03-231-25/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | Performance optimization - SeqLike
| * | | | | | Performance optimization - SeqLikeRex Kerr2015-02-201-25/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Big improvements to updated and patch by not creating intermediate collections. Moderate improvement to sorted by not using extra ArraySeq wrapper. Small improvements to diff, intersect, and padTo by watching for duplicate or slow operations a bit more carefully. ``` Performance summary (all timings JDK 1.8.0_25 Linux): method reason =========== =============================================================== diff 1.1x speedup on big seqs - avoid double map lookup intersect 1.1-1.2x speedup - avoid double map lookup padTo avoid multiple calls to length (good if length is slow) patch 2.4-4.0x speedup - avoid intermediate collections sorted 1.2-1.5x speedup - use array directly updated 3.5-9.6x speedup - avoid intermediates (but children override) ```
* | | | | | | Merge pull request #4312 from lrytz/opt/inliningGrzegorz Kossakowski2015-03-2023-377/+2007
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Inliner for GenBCode
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 20:40:10 +0000