summaryrefslogtreecommitdiff
path: root/test/files
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | SI-6863 Fix verify error in captured var inited from expr with try/catchJames Iry2013-01-251-0/+114
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a captured var was inited from a try/catch we did something reasonable. But if the var was inited from a more complicated expression (if/else, a block, match/case, etc) that ended with a try/catch then we didn't and we were generating faulty byte code. This fix patches LambdaLift to add the missing cases. For known simple expressions, the translation is just new *Ref(expr). For try/catch, if/else, match/case, and blocks this recursively walks down the internal result expressions to translate them. E.g. if(cond) trueExpr else falseExpr becomes if(cone) translate(trueExpr) else translate(falseExpr) For unknown expression types, the translation is {val temp = expr; new *Ref(expr) }
* | | Merge pull request #1941 from phaller/issue/6932-futures-internal-callbacksAdriaan Moors2013-01-271-0/+7
|\ \ \ | | | | | | | | SI-6932 StackOverflowError in chained Future.flatMap calls
| * | | Fix SI-6932 by enabling linearization of callback execution for the ↵Viktor Klang2013-01-211-0/+7
| | | | | | | | | | | | | | | | internal execution context of Future
* | | | Merge pull request #1857 from retronym/ticket/6443-2.10.xAdriaan Moors2013-01-279-0/+110
|\ \ \ \ | | | | | | | | | | SI-6443 Widen dependent param types in uncurry
| * | | | SI-6443 Expand test coverage with varargs, by-name.Jason Zaugg2013-01-164-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were already working, due to a serendipitous ordering of transformations. The tests will keep it this way.
| * | | | SI-6443 Widen dependent param types in uncurryJason Zaugg2013-01-165-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bridge building operates on unusual method signatures: after uncurry, so parameter lists are collapsed; but before erasure, so dependently typed parameters are still around. Original: def foo(a: T)(b: a.type, c: a.U): Unit During computeBridges: (a: T, b: a.type, c: a.U)Unit This signature no longer appears to override the corresponding one in a superclass, because the types of `b` and `c` are dependent on method parameters. The root of the problem is uncurry, which leaves the trees in a poor state. This commit changes uncurry to remedy this. An example illustrates it best: // source def foo(a: A)(b: a.type): b.type = b // post uncurry before this patch. // not well typed code! def foo(a: A, b: a.type): a.type = { // post uncurry after this patch def foo(a: A, b: A): A = { val b$1 = b.asInstanceOf[a.type] b$1 }
* | | | | Update a checkfile from a recent fix.Jason Zaugg2013-01-271-1/+1
| |_|/ / |/| | | | | | | | | | | | | | | | | | | The build is currently broken: https://scala-webapps.epfl.ch/jenkins/view/2.10.x/job/scala-nightly-main-2.10.x/
* | | | Merge pull request #1956 from JamesIry/SI-7011_2.10.xJames Iry2013-01-252-0/+8
|\ \ \ \ | | | | | | | | | | SI-7011 Fix finding constructor type in captured var definitions
| * | | | SI-7011 Fix finding constructor type in captured var definitionsJames Iry2013-01-232-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a captured var was initialized with an empty tree then finding the type of the empty tree was being handled improperly. The fix is to look for primary constructors on the tree's type symbol rather than the tree's symbol. A test is included. In order to make the problem more testable the debug logging of the issue is changed to a debug warn.
* | | | | Merge pull request #1946 from retronym/ticket/6231Paul Phillips2013-01-252-0/+21
|\ \ \ \ \ | | | | | | | | | | | | SI-6231 Report unsupported free var capture by a trait.
| * | | | | SI-6231 Report unsupported free var capture by a trait.Jason Zaugg2013-01-212-0/+21
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a class nested in a trait captures a free variable from the enclosing scope of the trait, the transformation to add that variable to the `init` method of the trait implementation class happens *after* the abstract trait interface has been extracted. This would lead to a crash when trying to find the corresponding interface method. This commit detects this situation and reports an implementation restriction. The enclosed test case shows a workaround. To lift this restriction, LambdaLifter should add the getters and make sure they end up in the trait interface. Looks like Martin tried this once: // LambdaLift.scala // // Disabled attempt to to add getters to freeParams // this does not work yet. Problem is that local symbols need local names // and references to local symbols need to be transformed into // method calls to setters. // def paramGetter(param: Symbol): Tree = { // val getter = param.newGetter setFlag TRANS_FLAG resetFlag PARAMACCESSOR // mark because we have to add them to interface // sym.info.decls.enter(getter) // val rhs = Select(gen.mkAttributedThis(sym), param) setType param.tpe // DefDef(getter, rhs) setPos tree.pos setType NoType // } // val newDefs = if (sym.isTrait) freeParams ::: (ps map paramGetter) else freeParams
* | | | | Merge pull request #1951 from JamesIry/SI-6987_2.10.xPaul Phillips2013-01-252-0/+44
|\ \ \ \ \ | | | | | | | | | | | | SI-6987 Fixes fsc compile server verbose output
| * | | | | SI-6987 Tests fsc verbose outputJames Iry2013-01-222-0/+44
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit includes a test of fsc's verbose output. In order for it to work, CompileServer's main method had to be modified to remove a sys exit 0 at the end. It was redundant and made testing a bit harder. In order to prevent a race condition between server and client start up, this commit also adds a server callback that decrements a CountDownLatch that the main testing thread waits for. Finally, the server had to be modified to use Console.withErr and Console.withOut instead of mutating the global System.err and System.out variables. Otherwise the test would be unreliable.
* | | | | Merge pull request #1938 from retronym/ticket/6666Paul Phillips2013-01-252-0/+172
|\ \ \ \ \ | | | | | | | | | | | | SI-6666 Restrict hidden `this` access in self/super calls.
| * | | | | SI-6666 Restrict hidden `this` access in self/super calls.Jason Zaugg2013-01-202-0/+172
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect when classes (user authored or compiler generated) local to a self or super constructor argument would require premature access to the in-construction instance. The same restriction applies for classes and objects; for objects, the premature access would result in a null via MODULE$ field. A residual error has been lodged as SI-6997. I'd like to remove calls to `Symbol#outerClass` (which relies on the flaky flag INCONSTRUCTOR, see my comments in the JIRA issue for more discussion) from `LambdaLift` and `ExplicitOuter`, and instead use the stack of active self/super calls to know when to skip an enclosing class. That will obviate that flag.
* | | | | Merge pull request #1928 from retronym/ticket/6902Paul Phillips2013-01-254-0/+47
|\ \ \ \ \ | | | | | | | | | | | | SI-6902 Check unreachability under @unchecked
| * | | | | SI-6902 Check unreachability under @uncheckedJason Zaugg2013-01-194-0/+47
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-253-1/+20
|\ \ \ \ \ | | | | | | | | | | | | Closes SI-6952: add correct error positions for Dynamic feature check.
| * | | | | Closes SI-6952: add correct error positions for Dynamic feature check.amin2013-01-163-1/+20
| | | | | |
* | | | | | Merge pull request #1902 from paulp/issue/6969Paul Phillips2013-01-252-0/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6969, mishandling of SoftReferences in method cache.
| * | | | | | SI-6969, mishandling of SoftReferences in method cache.Paul Phillips2013-01-242-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-253-0/+44
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | SI-6976 Fix value class separate compilation crasher.
| * | | | | | SI-6976 Fix value class separate compilation crasher.Jason Zaugg2013-01-163-0/+44
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1952 from retronym/backport/1599Paul Phillips2013-01-242-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | [backport] Fix SI-6637 (misoptimization in erasure)
| * | | | | | [backport] Fix SI-6637 (misoptimization in erasure)Jason Zaugg2013-01-232-0/+9
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 23:09:02 +0000