summaryrefslogtreecommitdiff
path: root/test/files
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2015 from paulp/rc1-backportsPaul Phillips2013-01-3123-2/+254
|\ | | | | 10 backports
| * SI-6595, lost modifiers in early defs.Paul Phillips2013-01-302-0/+19
| | | | | | | | | | | | | | | | [backport] Saw this by accident; the trees created for early defs would wholesale replace the modifiers with PRESUPER rather than combining them. FINAL was lost that way, as would be any other modifiers which might be valid there.
| * SI-6584, Stream#distinct uses too much memory.Paul Phillips2013-01-302-0/+24
| | | | | | | | | | [backport] Nesting recursive calls in Stream is always a dicey business.
| * SI-6426, importable _.Paul Phillips2013-01-302-0/+12
| | | | | | | | | | [backport] Prohibit `_` as an identifier, it can only bring badness.
| * SI-6072, crasher with overloaded eq.Paul Phillips2013-01-301-0/+3
| | | | | | | | | | | | | | | | [backport] You don't want to do name-based selections in later phases if you can help it, because there is nobody left to resolve your overloads. If as in this example you're calling a known method, use the symbol. Review by @hubertp.
| * SI-5604, selections on package objects.Paul Phillips2013-01-307-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [backport] mkAttributedSelect, which creates a Select tree based on a symbol, has been a major source of package object bugs, because it has not been accurately identifying selections on package objects. When selecting foo.bar, if foo turns out to be a package object, the created Select tree must be foo.`package`.bar However mkAttributedSelect was only examining the owner of the symbol, which means it would work if the package object defined bar directly, but not if it inherited it.
| * SI-5859, inapplicable varargs.Paul Phillips2013-01-301-0/+15
| | | | | | | | | | [backport] And other polishing related to varargs handling.
| * SI-5353, imperfect error message.Paul Phillips2013-01-304-2/+9
| | | | | | | | | | [backport] The fix of course is a perfect error message.
| * SI-5130, precision disappearing from refinement.Paul Phillips2013-01-301-0/+46
| | | | | | | | | | [backport] Remove some code, win a prize.
| * SI-4729, overriding java varargs in scala.Paul Phillips2013-01-303-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [backport] This was a bad interaction between anonymous subclasses and bridge methods. new Foo { override def bar = 5 } Scala figures it can mark "bar" private since hey, what's the difference. The problem is that if it was overriding a java-defined varargs method in scala, the bridge method logic says "Oh, it's private? Then you don't need a varargs bridge." Hey scalac, you're the one that made me private! You made me like this! You! Conflicts: src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
| * SI-2418, remove restriction on final vars.Paul Phillips2013-01-302-0/+11
| | | | | | | | | | | | | | | | [backport] The original fix for SI-2418 excluded final vars entirely, but the problem was not final vars per se, but the emission of ACC_FINAL in combination with ACC_VOLATILE. Since vars never get ACC_FINAL now, this is no longer an issue.
* | Merge pull request #2006 from retronym/backport/1226Paul Phillips2013-01-312-0/+36
|\ \ | | | | | | [backport] SI-6301 / SI-6572 specialization regressions
| * | SI-6572 Test case, originally fixed in a3680be.Jason Zaugg2013-01-292-0/+36
| | | | | | | | | | | | | | | | | | That fix has now been backported to 2.10.x in the previous commit. This commit should be be merged to master.
* | | Merge pull request #2000 from adriaanm/backport-pr-1873Paul Phillips2013-01-312-0/+85
|\ \ \ | | | | | | | | [backport] SI-5378, unsoundness with type bounds in refinements.
| * | | [backport] SI-5378, unsoundness with type bounds in refinements.Paul Phillips2013-01-282-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the comment says: Not enough to look for abstract types; have to recursively check the bounds of each abstract type for more abstract types. Almost certainly there are other exploitable type soundness bugs which can be seen by bounding a type parameter by an abstract type which itself is bounded by an abstract type. SPECIAL: BUY ONE UNSOUNDNESS, GET ONE FREE In refinement types, only the first parameter list of methods was being analyzed for unsound uses of abstract types. Second parameter list and beyond had free unsoundness reign. That bug as well is fixed here.
* | | | Merge pull request #2037 from JamesIry/2.10.x_SI-2418Paul Phillips2013-01-312-0/+11
|\ \ \ \ | | | | | | | | | | [backport] Removed restriction on final vars, SI-2418.
| * | | | [backport] Removed restriction on final vars, SI-2418.Paul Phillips2013-01-312-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of b79c7600544db9964c228b94a2f70f3ed854f89b The original fix for SI-2418 excluded final vars entirely, but the problem was not final vars per se, but the emission of ACC_FINAL in combination with ACC_VOLATILE. Since vars never get ACC_FINAL now, this is no longer an issue.
* | | | | Merge pull request #2036 from scalamacros/ticket/5716Paul Phillips2013-01-313-0/+20
|\ \ \ \ \ | | | | | | | | | | | | [backport] the scanner is now less eager about deprecations
| * | | | | changes the flags to not depend on partestEugene Burmako2013-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to some reason, partest always enables -deprecation. Since Paul has just submitted a pull request, which removes this behavior, I'm updating the flags to make sure this test works even after Paul's change. Backport from https://github.com/scala/scala/pull/1807 Original commit is https://github.com/scala/scala/commit/2015ad3ebd833225e93ed19604760a6da2522bb1
| * | | | | the scanner is now less eager about deprecationsEugene Burmako2013-01-313-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When healing braces it isn't very useful to report deprecation warnings, especially since this process is just simple context-free skimming, which can't know about what positions can accept what identifiers. Backport from https://github.com/scala/scala/pull/1807. Original commit is https://github.com/scala/scala/commit/e5d34d70499504e085ddf957c1c818ffb63f4e8d.
* | | | | | Merge pull request #2034 from scalamacros/topic/reify-staticXXXPaul Phillips2013-01-311-18/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | evicts eponymous packages and objects from tests
| * | | | | | evicts eponymous packages and objects from testsEugene Burmako2013-01-311-18/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As I figured out from http://groups.google.com/group/scala-internals/browse_thread/thread/ace970a799dcf7a0, current behavior with same-named objects silently taking precedence over same-named packages is a bug and shouldn't be relied upon.
* | | | | | Merge pull request #2021 from gkossakowski/issue/SI-7009Grzegorz Kossakowski2013-01-314-0/+85
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | SI-7009: `@throws` annotation synthesized incorrectly
| * | | | | SI-7009: `@throws` annotation synthesized incorrectlyGrzegorz Kossakowski2013-01-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 990b3c7 made `scala.throws` annotation polymorphic but forgot to adapt compiler code that synthesizes it, e.g. when parsing class files. The consequence was that we would get non-deterministically either `scala.throws` or `scala.throws[T]` as a type for synthesized annotation. The reason is that `Symbol.addAnnotation` would call `tpe` method which does not initialization of symbol so type parameters list would not be determined correctly. Only if info of that symbol was forced for other reason we would get `scala.throws[T]`. That non-deterministic behavior was observed in sbt's incremental compiler. Another problem we have is that Scala allows polymorphic exceptions so in ClassfileParser we could synthesize `@throws` annotation with wrong (polymorphic) type applied. In such case the best we can do is to convert such type to monomorphic one by introducing existentials. Here's list of changes this commit introduces: * The `Symbol.addAnnotation` that takes symbol as argument asserts that the type represented by that symbol is monomorphic (disabled due to cycles; see comments in the code) * Introduce `Symbol.addAnnotation` overload that allows us to pass an applied type * Change all places where polymorphic annotations are synthesized to pass an applied type * Handle polymorphic exception types in `ClassfileParser.parseExceptions` Fixes SI-7009.
| * | | | | Test case for SI-7009.Grzegorz Kossakowski2013-01-294-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The next commit fixes the problem itself and it's easier to see in diff what's being fixed exactly.
* | | | | | Merge pull request #1989 from adriaanm/rework-pr-1945Paul Phillips2013-01-319-102/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6968 Simple Tuple patterns aren't irrefutable
| * | | | | | SI-6968 Simple Tuple patterns aren't irrefutableJason Zaugg2013-01-279-102/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts part of c82ecab. The parser can't assume that a pattern `(a, b)` will match, as results of `.isInstanceOf[Tuple2]` can't be statically known until after the typer. The reopens SI-1336, SI-5589 and SI-4574, in exchange for fixing this regression SI-6968. Keeping all of those fixed will require a better definition of irrefutability, and some acrobatics to ensure safe passage to the ambiguous trees through typechecking.
* | | | | | | Merge pull request #2031 from JamesIry/2.10.x_SI-6669Paul Phillips2013-01-311-0/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-6669 Add . to the default scalap classpath
| * | | | | | | SI-6669 Add . to the default scalap classpathJames Iry2013-01-301-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default classpath for scalap did not include '.' which made it behave differently from javap in an annoying way. This commit adds it to the default. Also included is a test to make sure it's in the default but does not corrupt a user specified classpath.
* | | | | | | | Merge pull request #2028 from JamesIry/2.10.x_SI-6728Paul Phillips2013-01-312-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-6728 Fixes crash in parser on incomplete for expression
| * | | | | | | | SI-6728 Fixes crash in parser on incomplete for expressionJames Iry2013-01-302-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parser was trying to take the position of an empty expression which would crash. Son on the empty expression case in TreeBuilder# makeWhile it tries to do that and, if that failed, gets a position that wraps both the condition and the body. I also made a slight improvement to the UnsupportedOperationEx messages in Position.
* | | | | | | | | Merge pull request #2014 from gkossakowski/bytecode-testingGrzegorz Kossakowski2013-01-303-0/+42
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Add Bytecode test (ASM-based) to partest.
| * | | | | | | | Add Bytecode test (ASM-based) to partest.Grzegorz Kossakowski2013-01-293-0/+42
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces a new kind of test `Bytecode` that allows one to inspect bytecode generated for given piece of Scala code. The bytecode inspection is achieved by inspection of ASM trees. See the included example for details. NOTE: This commit does not introduce a new category of pratest tests. Bytecode tests should be run in `jvm` category of partest tests. Specific list of changes: * Add BytecodeTest that contains common utilities to partest * Add asm to classpath when compiling partest. That's not a new dependency as it's being already done for javac task we were running while compiling partest. * Add an example test that shows how to count null checks in given method.
* | | | | | | | Merge pull request #1997 from retronym/ticket/7035Paul Phillips2013-01-301-0/+15
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | SI-7035 Centralize case field accessor sorting.
| * | | | | | | SI-7035 Centralize case field accessor sorting.Jason Zaugg2013-01-281-0/+15
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is both burdensome and dangerous to expect callers to reorder these. This was seen in the field permutation in the unapply method; a regression in 2.10.0.
* | | | | | | Merge pull request #2007 from retronym/backport/1021Adriaan Moors2013-01-302-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [backport] Fix for SI-6154, VerifyError originating in uncurry.
| * | | | | | | [backport] Fix for SI-6154, VerifyError originating in uncurry.Paul Phillips2013-01-292-0/+11
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lhs still might be an Ident. Miguel did all the work, I just wrote it down in code form. (cherry picked from commit 48f8235822a2a100d6c4e8d3d7349df565ac6d40)
* | | | | | | SI-6516, macros comparing types with == instead of =:=.Paul Phillips2013-01-301-0/+19
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I gift-wrapped this ticket four months ago: 'I think it will be enough to say "tpe =:= MacroContextClass.tpe" rather than == .' Indeed. Had to open my own gift. Thanks, paulp!
* | | | | | Merge pull request #1912 from retronym/ticket/6651James Iry2013-01-291-0/+33
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | SI-6651 Extension methods types may depend on the typed of the wrapped value
| * | | | | SI-6551 Expand test case into uncomfortable areas.Jason Zaugg2013-01-291-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trait T { type U } class A(val a: T) extends AnyVal { def foo[TT <: a.U] = 0 } It works! But it's pure serendipity. After extmethods, the careful student of ASTs will find: object A { final def foo$extension[TT >: Nothing <: A.this.a.U]($this: A): Int = 0; } `A.this` doesn't belong. For now we just include this case under our test umbrella.
| * | | | | SI-6651 Substitute `this` in extension method sigsJason Zaugg2013-01-291-0/+26
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for the likes of: class A[X](val x: X) extends AnyVal { def foo(xy: x.Y) {} } We have to do this in both directions, when synthesizing the extension method in `Extender#transform`, and later on when Erasure tries to find the corresponding extension methods by backing out the original signatures from the signatures of the synthesized methods in the companion. In the first case, we have to be careful to use a stable reference to the `self` parameter, which can satisfy the dependent types.
* / / / / [backport] Disabled SI-6987.Paul Phillips2013-01-292-44/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It causes spurious failures - a typical example: [partest] testing: [...]/files/run/t6987.scala [FAILED] [partest] did not get the string expected, full results were: [partest] Fast Scala compiler version 2.11.0-20130126-111937-f01e001c77 -- Copyright 2002-2013, LAMP/EPFL [partest] [Given arguments: -shutdown -verbose] [partest] [Transformed arguments: -shutdown -verbose -current-dir /localhome/jenkins/b/workspace/scala-checkin-manual] [partest] [VM arguments: ] [partest] java.net.ConnectException: Connection refused [partest] [Connecting to compilation daemon at port 32808 failed; re-trying...] [partest] [No compilation server running.] [partest] (cherry picked from commit 53d5df5c1d52b941732c243159de4f44456f03b4)
* | | | Merge pull request #1981 from retronym/backport/1187Adriaan Moors2013-01-281-0/+29
|\ \ \ \ | | | | | | | | | | [backport] SI-3577 BoundedWildcardType handling
| * | | | [backport] SI-3577 BoundedWildcardType handlingJason Zaugg2013-01-261-0/+29
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 3c91b32d699a9e29d685ac20c9805f96c9f2db2c Author: Jason Zaugg <jzaugg@gmail.com> Date: Fri Aug 24 01:16:47 2012 +0200 Mention BoundedWildcardType in "a standard type pattern match". (cherry picked from commit 00e46b3dbcea2b72fd3941b7ffc2efba382871e9) commit 0664be2b69b1ce013e937bc93f4e84b891676f1f Author: Jason Zaugg <jzaugg@gmail.com> Date: Fri Aug 24 01:05:07 2012 +0200 Make RefChecks#validateVariance aware of BoundedWildcardType. The only test case that I know for this will be neutered by the imminent fix for SI-6258; so I haven't been able to test this. But trying this manually, you can see that this patch defers the the SI-6258 to the erasure phase. Original: scala.MatchError: ? (of class scala.reflect.internal.Types$BoundedWildcardType) at scala.tools.nsc.typechecker.RefChecks$RefCheckTransformer$$anon$3.scala$tools$nsc$typechecker$RefChecks$RefCheckTransformer$$anon$$validateVariance$1(RefChecks.scala:894) at scala.tools.nsc.typechecker.RefChecks$RefCheckTransformer$$anon$3.validateVariance(RefChecks.scala:965) Modified: java.lang.ClassCastException: scala.reflect.internal.Types$TypeRef$$anon$6 cannot be cast to scala.reflect.internal.Types$TypeBounds at scala.reflect.internal.Types$TypeMap.mapOver(Types.scala:4160) at scala.reflect.internal.transform.Erasure$ErasureMap.apply(Erasure.scala:156) (cherry picked from commit 2b4e7183fd24113cca5e868456668fd05c848168) commit 6ad651c94faf463133c742feb2aee59ef782ea1f Author: Jason Zaugg <jzaugg@gmail.com> Date: Fri Aug 24 00:54:59 2012 +0200 SI-3577 Make varianceInType aware of BoundedWildcardType. (cherry picked from commit 21105654c40ed0c462142bcbb6c8eced77f8b07a)
* | | | Merge pull request #1936 from retronym/ticket/6891Adriaan Moors2013-01-282-0/+27
|\ \ \ \ | |_|_|/ |/| | | SI-6891 Fix value class + tailrec crasher.
| * | | SI-6891 Fix value class + tailrec crasher.Jason Zaugg2013-01-262-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rhs.substituteSymbols(old, new) leaves us with: def loop#12225(x#12226: A#15491): scala#21.this.Unit#1615 = loop#12225(x#12226) In which the TermSymbol x#12226 has a stale info, pointing at the A#7274, the class type parameter, rather than A#15491, the corresponding type parameter of the synthetic backing method. I've improved `TreeSymSubstituter` to substitute not only `Tree#{tpe, symbol}`, but also `DefTree#sym.info`. The `pos` test that triggered the new code path are listed here: https://gist.github.com/4575687 AFAICS, no special treatment of Function, Return, or Import is needed in TreeSymSubstutor.
* | | | Merge pull request #1973 from JamesIry/SI-4602_2.10.xJames Iry2013-01-281-0/+57
|\ \ \ \ | | | | | | | | | | SI-4602 Make fsc absolutize source file names
| * | | | SI-4602 Disable unreliable test of fsc path absolutizationJames Iry2013-01-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The included test for fsc path absolutization almost certainly has the same reliability problem as a similar test that was disabled in https://github.com/scala/scala/pull/1985 . Disabling the test until I can figure out a reliable way to test fsc in an our continuous integration environment.
| * | | | SI-4602 Make fsc absolutize source file namesJames Iry2013-01-251-0/+57
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fsc server was using a path supplied by the client to turn things like class path values into absolute paths. But it wasn't absolutizing the source file names supplied to the compiler which lead to SI-4602. This commit adds that absolutizing bit and cleans the logic up a bit so that the settings object isn't told a path that it already knows. A test is included that simulates changing directory by forcing two different -current-dir settings on two different compile sessions on the same server process.
* | | | Merge pull request #1927 from JamesIry/SI-6863_2.10.xJames Iry2013-01-281-0/+114
|\ \ \ \ | |_|_|/ |/| | | SI-6863 Fix verify error in captured var inited from block w try/catch
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 22:39:54 +0000