summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add a request to presentation compiler to fetch doc comment information.Eugene Vigdorchik2013-02-068-149/+191
| | | | Refactor scaladoc base functionality to allow it to be mixed in with Global in the IDE.
* Merge pull request #1928 from retronym/ticket/6902Paul Phillips2013-01-255-9/+55
|\ | | | | SI-6902 Check unreachability under @unchecked
| * SI-6902 Check unreachability under @uncheckedJason Zaugg2013-01-195-9/+55
| | | | | | | | | | | | | | | | | | | | | | Only exhaustiveness checking should be disabled if the scrutinee of a match as annotated as `: @unchecked`. This was the pre-2.10.x behaviour. This also fixes a variation of the closed ticket, SI-6011. The exhaustiveness check is needed to safely fallback from emitting a table switch if duplicate cases are detected.
* | Merge pull request #1907 from namin/si-6952Paul Phillips2013-01-254-4/+23
|\ \ | | | | | | Closes SI-6952: add correct error positions for Dynamic feature check.
| * | Closes SI-6952: add correct error positions for Dynamic feature check.amin2013-01-164-4/+23
| | |
* | | Merge pull request #1902 from paulp/issue/6969Paul Phillips2013-01-253-7/+48
|\ \ \ | | | | | | | | SI-6969, mishandling of SoftReferences in method cache.
| * | | SI-6969, mishandling of SoftReferences in method cache.Paul Phillips2013-01-243-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More interesting to test than it was to fix. The soft reference is now dereferenced once, the locally stored underlying value ascertained to be non-null, and the remainder of the references to the value use the local var. The enclosed test reliably NPEs without this patch.
* | | | Merge pull request #1910 from retronym/ticket/6976Paul Phillips2013-01-254-4/+52
|\ \ \ \ | | | | | | | | | | SI-6976 Fix value class separate compilation crasher.
| * | | | SI-6976 Fix value class separate compilation crasher.Jason Zaugg2013-01-164-4/+52
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't guarantee that the owner of the value class is initialized, and if it isn't, the search for the companion module will turn up bubkis. This is a localized fix, but I'd be suprised if there weren't other places that suffered from the same problem. Wouldn't it be nicer to have something like: // doesn't force info sym.raw.info sym.raw.companionModule // forces info sym.info sym.companionModule
* | | | Merge pull request #1966 from paulp/pr/fix-java7-againPaul Phillips2013-01-243-3/+25
|\ \ \ \ | |_|/ / |/| | | Fix java7 again
| * | | Do not recompute stack frames when instrumenting bytecode.Grzegorz Kossakowski2013-01-242-25/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that we do not need to do that. See comment in `ProfilerVisitor.java`. Also, since recomputing stack frame map was the only reason we needed to implement `getCommonSuperClass` we can now remove its implementation that was causing problems on Java 7 due to a cyclic dependency involving class loader because we would try to load a class we are currently transforming and transformer is triggered just before classloading. //cc @namin who worked on this code with me.
| * | | Set `canRetransform` flag to `false` in instrumentation.Grzegorz Kossakowski2013-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not need to retransform classes once they are loaded. All instrumentation byte-code is pushed at loading time. This fixes a problem with Java 7 that was failing to add a transformer because we did not declare retransformation capability in `MANIFEST.MF` file in Java agent jar. Java 6 allowed to add transformer due to a bug.
| * | | Correct whitespace in `ASMTransformer.java`.Grzegorz Kossakowski2013-01-241-27/+27
| | | | | | | | | | | | | | | | Let's stick to 2 spaces for indentation (and no tabs).
| * | | Fix class loader issues in instrumentation tests.Nada Amin2013-01-241-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ASM ClassWriter uses a wimpy class loader when computing common superclasses. This could cause a ClassNotFoundException in the transform method (at reader.accept). This exception gets swallowed, resulting in a class that should be instrumented to silently not be. The fix is to override getCommonSuperClass to use the correct class loader. Trivia: This bug was discovered while 'stress-testing' this instrumentation scheme on the Coursera students, to check that they implement one method in terms of another in the assignment.
* | | | Merge pull request #1949 from khernyo/partest-scalac-opts-fixPaul Phillips2013-01-243-3/+2
|\ \ \ \ | | | | | | | | | | Use the same default scalac options in all three partest frontends
| * | | | Use the same default scalac options in all three partest frontendsSzabolcs Berecz2013-01-223-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ConsoleRunner, AntRunner and SBTRunner take scalac options from "partest.scalac_opts" property. Also remove leftover "-deprecation" option from test/partest. The change to SBTRunner was not tested as sbt test is currently broken.
* | | | | Merge pull request #1952 from retronym/backport/1599Paul Phillips2013-01-243-11/+20
|\ \ \ \ \ | | | | | | | | | | | | [backport] Fix SI-6637 (misoptimization in erasure)
| * | | | | [backport] Fix SI-6637 (misoptimization in erasure)Jason Zaugg2013-01-233-11/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f9ef5300ab561628e53c654df9000c75f488d74a Author: Jan Niehusmann <jan@gondor.com> Date: Fri Nov 9 15:05:58 2012 +0100 Fix SI-6637 (misoptimization in erasure) Move the optimization one level deeper so the expression being tested with isInstanceOf is always evaluated. (cherry picked from commit b540aaee4ba30e2dd980456a44e8c6d732222df1)
* | | | | Merge pull request #1953 from retronym/backport/1586Paul Phillips2013-01-247-14/+141
|\ \ \ \ \ | | | | | | | | | | | | [backport] Fix unsafe array opt. / opt. primitive Array(...)
| * | | | | [backport] Fix unsafe array opt. / opt. primitive Array(...)Jason Zaugg2013-01-237-14/+141
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6611, SI-6247 (partial fix) The original commits on master were a bit circuitous, this is squashed to a neat little package. I had to add type arguments to the Array.apply calls in the test case, they are inferred on master. commit 41ff05dfdbcf032157b3509ace633f2e7a12295c Author: Jason Zaugg <jzaugg@gmail.com> Date: Sun Nov 4 14:44:59 2012 +0100 Refactor guards checking for a particular overload of Array.apply. (cherry picked from commit 092345a24c22a821204fb358d33272ae8f7353be) commit 1e5c942deccaf64f8d57bd8891b912381d7f220a Author: Jason Zaugg <jzaugg@gmail.com> Date: Sun Nov 4 14:17:25 2012 +0100 Expand optimization of Array(e1, ..., en) to primitive arrays. (cherry picked from commit 8265175ecc42293997d59049f430396c77a2b891) commit ab1bf77e39f2dfeacf3fc107ccb2907a1867f04c Author: Jason Zaugg <jzaugg@gmail.com> Date: Sat Nov 3 13:34:20 2012 +0100 SI-6611 Tighten up an unsafe array optimization The net was cast too wide and was unsafely optimizing away array copies. (cherry picked from commit dad886659faca4fba2d4937c9bc6780591b02c27) And also: Optimize primitive Array(e1, ..., en) Expands an existing optimization for reference arrays to apply to primitives, as well. Fixes one aspect of SI-6247. (cherry picked from commit cac5a08611f9511ba4d94b99db630404efae190a) Conflicts: src/compiler/scala/tools/nsc/transform/CleanUp.scala More principled tree copying. Canonical > home-spun. Conflicts: src/compiler/scala/tools/nsc/transform/CleanUp.scala
* | | | | Merge pull request #1954 from retronym/backport/1565Paul Phillips2013-01-245-5/+35
|\ \ \ \ \ | | | | | | | | | | | | [backport] SI-6567 Warning for Option(implicitView(foo))
| * | | | | [backport] SI-6567 Warning for Option(implicitView(foo))Jason Zaugg2013-01-235-5/+35
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 284bd754fa5dfc8bc626b0c5ebe85d872dd044cb Author: Jason Zaugg <jzaugg@gmail.com> Date: Sat Nov 3 16:19:46 2012 +0100 SI-6567 Warning for Option(implicitView(foo)) I've seen the reported problem before in the wild. It seems worthy of a special warning, so long as we advocate Option.apply as an alternative to `if (x == null) Some(x) else None`. It is behind -Xlint at the moment, an option that could do with some promotion. (cherry picked from commit 0bcb9e9169146e3f589c6c9f65cc4a5523b78120)
* | | | | Merge pull request #1929 from retronym/ticket/6439Paul Phillips2013-01-243-1/+90
|\ \ \ \ \ | | | | | | | | | | | | SI-6439 Avoid spurious REPL warnings about companionship
| * | | | | SI-6439 Avoid spurious REPL warnings about companionshipJason Zaugg2013-01-193-1/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `val m` isn't a companion of `trait m`, check the pair of eponymous symbols are a ((class|trait), object) pair before emitting the warning. In order to correctly check this one a type alias is involved, `definedSymbols` must avoid normalizing through type aliases. AFAICT this is an improvement to the other clients of that Map, one such power mode progression is demonstrated at the end of the test case.
* | | | | | Merge pull request #1934 from retronym/ticket/6923-sweepPaul Phillips2013-01-245-7/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Addressing warnings.
| * | | | | | Addressing warnings.Jason Zaugg2013-01-195-7/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - SI-6923 uncovered a few valid warnings, these have been addressed. - A pair of "catches all throwable" warnings appeared; one of the is spurious and the subject of SI-6994.
* | | | | | Merge pull request #1935 from retronym/ticket/6994Paul Phillips2013-01-243-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6994 Avoid spurious promiscuous catch warning
| * | | | | | SI-6994 Avoid spurious promiscuous catch warningJason Zaugg2013-01-203-1/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | It was being issued upon re-typechecking of a transformed tree. Now we disable the warning post-typer.
* | | | | | Merge pull request #1968 from paulp/pr/fixbuildPaul Phillips2013-01-241-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix broken build.
| * | | | | Fix broken build.Paul Phillips2013-01-241-1/+1
|/ / / / / | | | | | | | | | | | | | | | It's all system admin, all the time, here at scala ranch.
* | | | | Merge pull request #1958 from JamesIry/SI-6434_2.10.xPaul Phillips2013-01-243-2/+22
|\ \ \ \ \ | |_|/ / / |/| | | | SI-6434 Pretty print function types with by name arg as (=> A) => B
| * | | | SI-6434 Pretty print function types with by name arg as (=> A) => BJames Iry2013-01-233-2/+22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were pretty printing a function type with one by name arg as => A => B, but because => is right associative that's formally equivalent to => (A => B) and that's entirely a different thing. This commit changes the pretty printer in Typers.scala to check for a byname argument on a function type and wrap it in parens. A REPL test is included.
* | | | Merge pull request #1944 from paulp/pr/remove-classfilesPaul Phillips2013-01-222-0/+0
|\ \ \ \ | | | | | | | | | | Removed class files.
| * | | | Removed class files.Paul Phillips2013-01-212-0/+0
|/ / / / | | | | | | | | | | | | Someone checked in a pair of .class files.
* | | | Merge pull request #1915 from adriaanm/ticket-6942Paul Phillips2013-01-204-25/+349
|\ \ \ \ | |/ / / |/| | | SI-6942 more efficient CNF conversion in patmat analysis
| * | | use ArrayBuffer instead of Array to build FormulaeAdriaan Moors2013-01-171-3/+3
| | | |
| * | | SI-6942 more efficient unreachability analysisAdriaan Moors2013-01-174-24/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid blowing the stack/the analysis budget by more eagerly translating the propositions that model matches to CNF. First building a large proposition that represents the match, and then converting to CNF tends to blow the stack. Luckily, it's easy to convert to CNF as we go. The optimization relies on `CNF(P1 /\ ... /\ PN) == CNF(P1) ++ CNF(...) ++ CNF(PN)`: Normalizing a conjunction of propositions yields the same formula as concatenating the normalized conjuncts. CNF conversion is expensive for large propositions, so we push it down into the conjunction and then concatenate the resulting arrays of clauses (which is cheap). (CNF converts a free-form proposition into an `Array[Set[Lit]]`, where: - the Array's elements are /\'ed together; - and the Set's elements are \/'ed; - a Lit is a possibly negated variable.) NOTE: - removeVarEq may throw an AnalysisBudget.Exception - also reworked the interface used to build formula, so that we can more easily plug in SAT4J when the time comes
* | | | Merge pull request #1904 from JamesIry/SI-5568_2.10.xGrzegorz Kossakowski2013-01-183-6/+46
|\ \ \ \ | |/ / / |/| | | SI-5568 Fixes verify error from getClass on refinement of value type
| * | | SI-5568 Comment improvements for getClass on primitive intersection.James Iry2013-01-152-7/+9
| | | | | | | | | | | | | | | | | | | | Based on code review here are a few comment cleanups and the removal of some dead test code.
| * | | SI-5568 Fixes verify error from getClass on refinement of value typeJames Iry2013-01-153-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ().asInstanceOf[AnyRef with Unit].getClass and 5.asInstanceOf[AnyRef with Int].getClass would cause a verify error. Going the other way, i.e. [Unit with AnyRef] or [Int with AnyRef] worked fine. This commit fixes it that both directions work out to BoxedUnit or java.lang.Integer.
* | | | Merge pull request #1914 from retronym/ticket/6601Grzegorz Kossakowski2013-01-175-1/+10
|\ \ \ \ | | | | | | | | | | SI-6601 Publicise derived value contstructor after pickler
| * | | | SI-6601 Publicise derived value contstructor after picklerJason Zaugg2013-01-165-1/+10
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Otherwise the access restrictions are not enforced under separate compilation. See also SI-6608.
* | | | Merge pull request #1854 from pufuwozu/ticket-SI-6923Paul Phillips2013-01-175-3/+39
|\ \ \ \ | | | | | | | | | | SI-6923 Context now buffers warnings as well as errors
| * | | | SI-6923 Context now buffers warnings as well as errorsBrian McKenna2013-01-075-3/+39
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code that was silently typed would not report warnings, even if it returned a successful result. This appeared in the following code which didn't show warnings even with -Ywarn-adapted-args: def foo(a: Any) = a; foo(1, 2) While the following would show the expected warning: def foo[A](a: Any) = a; foo(1, 2)
* | | | Merge pull request #1905 from adriaanm/ticket-6956Paul Phillips2013-01-173-2/+31
|\ \ \ \ | |_|_|/ |/| | | SI-6956 determine switchability by type, not tree
| * | | use Constant::isIntRange even if it's NIHAdriaan Moors2013-01-151-1/+1
| | | |
| * | | SI-6956 determine switchability by type, not treeAdriaan Moors2013-01-153-2/+31
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Constant folding will set the type of a constant tree to `ConstantType(Constant(folded))`, while the tree itself can be many different things (in casu, an Ident). We used to look at the tree directly when deciding whether to emit a switch. Now we look at the tree's type. Voilà.
* | | Merge pull request #1892 from retronym/ticket/6479Paul Phillips2013-01-152-2/+60
|\ \ \ | |/ / |/| | SI-6479 Don't lift try exprs in label arguments.
| * | SI-6479 Don't lift try exprs in label arguments.Jason Zaugg2013-01-132-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new pattern matcher uses label jumps to GOTO the next case. Uncurry treated these like regular method arguments, and performed the liftedTree() transformation, which ensures that try expressions are only used in a statement position. Even try in statement position of a block used as such an argument are subject to the same transform. This transform stems from the JVM limitation, that try/catch does not leave a value on the stack. See b194446. This commit changes Uncurry to avoid this transform for arguments to label jumps. This avoids needlessly indirect code, and enables tail call elimination in more cases. As an example, Scala 2.10.0 transforms the last method of the enclosed test case to: try { case <synthetic> val x1: Int = 1; case5(){ if (2.==(x1)) { val x2: Int = x1; matchEnd4({ { def liftedTree2(): Unit = try { throw new scala.runtime.NonLocalReturnControl[Unit](nonLocalReturnKey1, ()) } catch { case (e @ (_: ClassNotFoundException)) => () }; liftedTree2() }; TailrecAfterTryCatch.this.bad() }) } else case6() }; case6(){ matchEnd4(throw new MatchError(x1)) }; matchEnd4(x: Unit){ x } } catch { case (ex @ (_: scala.runtime.NonLocalReturnControl[Unit @unchecked])) => if (ex.key().eq(nonLocalReturnKey1)) ex.value() else throw ex } After this patch: @scala.annotation.tailrec final def bad(): Unit = { case <synthetic> val x1: Int = 1; case5(){ if (2.==(x1)) { <synthetic> val x2: Int = x1; matchEnd4({ try { return () } catch { case (e @ (_: ClassNotFoundException)) => () }; TailrecAfterTryCatch.this.bad() }) } else case6() }; case6(){ matchEnd4(throw new MatchError(x1)) }; matchEnd4(x: Unit){ x } }
* | | Merge pull request #1895 from JamesIry/SI_6963_2.10.xPaul Phillips2013-01-154-1/+8
|\ \ \ | | | | | | | | SI-6963 Deprecates -Xmigration switch
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-17 05:53:21 +0000