summaryrefslogtreecommitdiff
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* Class symbols can't be contravariant.Jason Zaugg2013-02-042-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | During development of the fix for SI-6666, I encountered: % test/files/pos/t4842.scala test/files/pos/t4842.scala:10: error: contravariant class Bar occurs in covariant position in type ()this.Bar of constructor Bar this(new { class Bar { println(Bar.this); new { println(Bar.this) } }; new Bar } ) // okay I had incorrectly set the INCONSTRUCTOR flag on the class symbol `Bar`. (It isn't directly in the self constructor call, as it is nested an intervening anonymous class.) But, this flag shares a slot with CONTRAVARIANT, and the variance validation intepreted it as such. ClassSymbol already has this code to resolve the ambiguous flags for display purposes: override def resolveOverloadedFlag(flag: Long) = flag match { case INCONSTRUCTOR => "<inconstructor>" // INCONSTRUCTOR / CONTRAVARIANT / LABEL case EXISTENTIAL => "<existential>" // EXISTENTIAL / MIXEDIN case IMPLCLASS => "<implclass>" // IMPLCLASS / PRESUPER case _ => super.resolveOverloadedFlag(flag) } This commit overrides `isContravariant` to reflect the same logic.
* SI-6666 Catch VerifyErrors in the making in early defs.Jason Zaugg2013-02-022-4/+15
| | | | | | As we did for self/super calls, add a backstop into explicitouter and lambdalift to check when we try to get an outer pointer to an under-construction instance.
* Broader checks for poisonous this references.Jason Zaugg2013-02-0210-49/+90
| | | | Replaces more VerifyErrors with implementation restrictions.
* Add a test case from the comments of SI-6666.Jason Zaugg2013-02-022-0/+21
| | | | | This one lands in the new implementation restriction which beats the VerifyError.
* SI-6666 Account for nesting in setting INCONSTRUCTORJason Zaugg2013-02-024-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag is calcualed in Namers, and assigned to class and module class symbols that are defined in self/super-calls, and in early definitions. For example, class D is INCONSTRUCTOR in each case below: class C extends Super({class D; ()}) class C(a: Any) { def this(a: Any) = this({class D; ()}) } new { val x = { class D; () } with Super(()) But, the calculation of this flag failed to account for nesting, so it was not set in cases like: class C(a: Any) { def this(a: Any) = this({val x = {class D; ()}; x}) } This patch searches the enclosing context chain, rather than just the immediate context. The search is terminated at the first non term-owned context. In the following example, this avoids marking `E` as INCONSTRUCTOR; only `D` should be. class C extends Super({class D { class E }; ()}) This closes SI-6259 and SI-6506, and fixes one problem in the recently reopened SI-6957.
* Move a test from pos to run to highlight bytecode deficiencies.Jason Zaugg2013-01-281-5/+14
| | | | We'll address them in subsequent commits.
* 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 #1904 from JamesIry/SI-5568_2.10.xGrzegorz Kossakowski2013-01-182-0/+25
|\ | | | | SI-5568 Fixes verify error from getClass on refinement of value type
| * SI-5568 Comment improvements for getClass on primitive intersection.James Iry2013-01-151-2/+0
| | | | | | | | | | 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-152-0/+27
| | | | | | | | | | | | | | | | ().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-173-0/+8
|\ \ | | | | | | SI-6601 Publicise derived value contstructor after pickler
| * | SI-6601 Publicise derived value contstructor after picklerJason Zaugg2013-01-163-0/+8
| | | | | | | | | | | | | | | | | | | | | 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-173-2/+21
|\ \ \ | | | | | | | | SI-6923 Context now buffers warnings as well as errors
| * | | SI-6923 Context now buffers warnings as well as errorsBrian McKenna2013-01-073-2/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-172-0/+27
|\ \ \ | | | | | | | | SI-6956 determine switchability by type, not tree
| * | | SI-6956 determine switchability by type, not treeAdriaan Moors2013-01-152-0/+27
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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-151-0/+56
|\ \ \ | |/ / |/| | SI-6479 Don't lift try exprs in label arguments.
| * | SI-6479 Don't lift try exprs in label arguments.Jason Zaugg2013-01-131-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-153-0/+6
|\ \ \ | | | | | | | | SI-6963 Deprecates -Xmigration switch
| * | | SI-6963 Deprecates -Xmigration switchJames Iry2013-01-143-0/+6
| |/ / | | | | | | | | | | | | | | | -Xmigration is specific to the 2.7 to 2.8 upgrade and is no longer relevant. There is no plan to maintain it so it will be removed. This commit deprecates it in anticipation.
* | | Merge pull request #1888 from retronym/ticket/6675Paul Phillips2013-01-156-0/+36
|\ \ \ | | | | | | | | SI-6675 -Xlint arity enforcement for extractors
| * | | SI-6675 Test new warning under -Xoldpatmat.Jason Zaugg2013-01-153-0/+18
| | | | | | | | | | | | | | | | This commit should be discarded when merging to master.
| * | | SI-6675 -Xlint arity enforcement for extractorsJason Zaugg2013-01-153-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extractor Patterns changed in 2.10.0 to implement the letter of the spec, which allows a single binding to capture an entire TupleN. But this can hide arity mismatches, especially if the case body uses the bound value as an `Any`. This change warns when this happens under -Xlint.
* | | | Merge pull request #1879 from adriaanm/ticket-6955Paul Phillips2013-01-152-0/+27
|\ \ \ \ | | | | | | | | | | SI-6955 switch emission no longer foiled by type alias
| * | | | SI-6955 switch emission no longer foiled by type aliasAdriaan Moors2013-01-102-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | dealias the type of the scrutinee before checking it's switchable now with tests! (using IcodeTest since javap is not available everywhere)
* | | | | Merge pull request #1894 from retronym/ticket/6082Adriaan Moors2013-01-142-0/+15
|\ \ \ \ \ | | | | | | | | | | | | SI-6082 Conditionally expand @ann(x) to @ann(value = x)
| * | | | | SI-6082 Conditionally expand @ann(x) to @ann(value = x)Jason Zaugg2013-01-132-0/+15
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... if the annotation has an argument with the name `value`. Doing so unconditionally obscures error messages. We still require that arguments to ClassFileAnnotations are named, other than for this special case.
* | | | | Merge pull request #1890 from retronym/ticket/5440Adriaan Moors2013-01-143-0/+13
|\ \ \ \ \ | | | | | | | | | | | | SI-5440 Test case for exhaustiveness check
| * | | | | SI-5440 Test case for exhaustiveness checkJason Zaugg2013-01-133-0/+13
| | |_|/ / | |/| | | | | | | | | | | | | Reported against patmatclassic, working in virtpatmat.
* | | | | Merge pull request #1889 from retronym/ticket/5340Adriaan Moors2013-01-142-0/+35
|\ \ \ \ \ | | | | | | | | | | | | SI-5340 Change println to log
| * | | | | SI-5340 Change println to logJason Zaugg2013-01-132-0/+35
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | An esoteric implicit search could trigger an "amb prefix ..." message to standard out. Now the message has been improved and sent to the logger.
* | | | | Merge pull request #1878 from adriaanm/ticket-6925Adriaan Moors2013-01-142-0/+27
|\ \ \ \ \ | | | | | | | | | | | | SI-6925 use concrete type in applyOrElse's match's selecto
| * | | | | rework partial function synthesisAdriaan Moors2013-01-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no behavioral changes, just highly overdue cleanup some TODOs for further improvements
| * | | | | SI-6925 use concrete type in applyOrElse's match's selectorAdriaan Moors2013-01-091-0/+9
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression introduced in 28483739c3: PartialFunction synthesis was broken so that we'd get: ``` scala> def f[T](xs: Set[T]) = xs collect { case x => x } f: [T](xs: Set[T])scala.collection.immutable.Set[_ <: T] ``` rather than ``` scala> def f[T](xs: Set[T]) = xs collect { case x => x } f: [T](xs: Set[T])scala.collection.immutable.Set[T] ```
* | | | | Merge pull request #1876 from adriaanm/ticket-5189-infAdriaan Moors2013-01-142-0/+14
|\ \ \ \ \ | | | | | | | | | | | | SI-5189 detect unsoundness when inferring type of match
| * | | | | SI-5189 detect unsoundness when inferring type of matchAdriaan Moors2013-01-092-0/+14
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GADT skolems encode type slack that results from pattern matching on variant type constructors I thought they would not longer be relevant after cases have been typed, and since they caused weird issues with the old pattern matcher, I deskolemized in typedCase however, when we don't have an expected type for the match, we need to keep the skolems around until the skolemized type makes it out of the match and it becomes the result of type inference for that match when you do have an expected type, it will propagate to the case-level and the confrontation will thus already take place when typing individual cases
* | | | | Merge pull request #1891 from retronym/ticket/6126Adriaan Moors2013-01-141-0/+8
|\ \ \ \ \ | | | | | | | | | | | | SI-6126 Test case for varargs of tagged primitives.
| * | | | | SI-6126 Test case for varargs of tagged primitives.Jason Zaugg2013-01-131-0/+8
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | This started working after the merge fe1110f. I didn't track down precisely which commit was responsible beyond that.
* / | | | SI-5954 Implementation restriction preventing companions in package objsJames Iry2013-01-137-0/+67
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Companion objects (and thus also case classes) in package objects caused an assert about an overloaded symbol when everything was compiled twice. It's a hairy problem that doesn't fit in 2.10.1. So this fix adds an implementation restriction. It also has a test to make sure the error messages are clean and reasonably friendly, and does not catch other things defined in package objects. The test includes a commented out test in case somebody thinks they've solved the underlying problem. A handful of tests were falling afoul of the new implementation restriction. I verified that they do in fact fail on second compile so they aren't false casualties. But they do test real things we'd like to work once the re-compile issue is fixed. So I added a -X flag to disable the implementation restriction and made all the tests accidentally clobbered by the restriction use that flag.
* | | | Merge pull request #1859 from retronym/ticket/6912Paul Phillips2013-01-122-0/+13
|\ \ \ \ | |_|_|/ |/| | | SI-6912 Avoid a typer cycle in overload resolution.
| * | | SI-6912 Avoid a typer cycle in overload resolution.Jason Zaugg2013-01-082-0/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c800d1fe, and followup commits 1ddc9358 and b10b5821 modified error handling in `Infer#inferExprAlternative`. After these changes, this method could fail to resolve the overloaded alternative if: best != NoSymbol && !competing.isEmpty && !noAlternatives && pt.isErroneous This commit calls `setError` in that case, which prevents the cycle in `adapt`. While I didn't extract a reproduction from the original code base, I've included a test case that exhibits the same symptom. It was actually pretty tough to find an program that got close to this code path, but luckilly we've been pretty close to this bug in SI-5553 / 4f99c2e5, and those test cases formed the basis for this one.
* | | Merge pull request #1869 from retronym/backport/1826Paul Phillips2013-01-1146-110/+156
|\ \ \ | | | | | | | | Backport of SI-6846.
| * | | Backport of SI-6846.Jason Zaugg2013-01-0846-110/+156
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 55806cc0e6177820c12a35a18b4f2a12dc07bb39 Author: Paul Phillips <paulp@improving.org> Date: Wed Dec 19 07:32:19 2012 -0800 SI-6846, regression in type constructor inference. In 658ba1b4e6 some inference was gained and some was lost. In this commit we regain what was lost and gain even more. Dealiasing and widening should be fully handled now, as illustrated by the test case. (cherry picked from commit dbebcd509e4013ce02655a2687b27d0967b3650e) commit e6ef58447d0f4ef6de956fcc03ee283bb9028c02 Author: Paul Phillips <paulp@improving.org> Date: Fri Dec 21 15:11:29 2012 -0800 Cleaning up type alias usage. I determined that many if not most of the calls to .normalize have no intent beyond dealiasing the type. In light of this I went call site to call site knocking on doors and asking why exactly they were calling any of .normalize .widen.normalize .normalize.widen and if I didn't like their answers they found themselves introduced to 'dropAliasesAndSingleTypes', the recursive widener and dealiaser which I concluded is necessary after all. Discovered that the object called 'deAlias' actually depends upon calling 'normalize', not 'dealias'. Decided this was sufficient cause to rename it to 'normalizeAliases'. Created dealiasWiden and dealiasWidenChain. Dropped dropAliasesAndSingleTypes in favor of methods on Type alongside dealias and widen (Type#dealiasWiden). These should reduce the number of "hey, the type alias doesn't work" bugs. (cherry picked from commit 3bf51189f979eb0dd41744ca844fd12dfdaa0dee) Conflicts: src/compiler/scala/tools/nsc/interpreter/CompletionOutput.scala commit c1d8803cea1523f458730103386d8e14324a9446 Author: Paul Phillips <paulp@improving.org> Date: Sat Dec 22 08:13:48 2012 -0800 Shored up a hidden dealiasing dependency. Like the comment says: // This way typedNew always returns a dealiased type. This // used to happen by accident for instantiations without type // arguments due to ad hoc code in typedTypeConstructor, and // annotations depended on it (to the extent that they worked, // which they did not when given a parameterized type alias // which dealiased to an annotation.) typedTypeConstructor // dealiases nothing now, but it makes sense for a "new" to // always be given a dealiased type. PS: Simply running the test suite is becoming more difficult all the time. Running "ant test" includes time consuming activities of niche interest such as all the osgi tests, but test.suite manages to miss the continuations tests. (cherry picked from commit 422f461578ae0547181afe6d2c0c52ea1071d37b) commit da4748502792b260161baa10939554564c488051 Author: Paul Phillips <paulp@improving.org> Date: Fri Dec 21 12:39:02 2012 -0800 Fix and simplify typedTypeConstructor. Investigating the useful output of devWarning (-Xdev people, it's good for you) led back to this comment: "normalize to get rid of type aliases" You may know that this is not all the normalizing does. Normalizing also turns TypeRefs with unapplied arguments (type constructors) into PolyTypes. That means that when typedParentType would call typedTypeConstructor it would find its parent had morphed into a PolyType. Not that it noticed; it would blithely continue and unwittingly discard the type arguments by way of appliedType (which smoothly logged the incident, thank you appliedType.) The simplification of typedTypeConstructor: There was a whole complicated special treatment of AnyRef here which appears to have become unnecessary. Removed special treatment and lit a candle for regularity. Updated lots of tests regarding newly not-so-special AnyRef. (cherry picked from commit 394cc426c1ff1da53146679b4e2995ece52a133e) commit 1f3c77bacb2fbb3ba9e4ad0a8a733e0f9263b234 Author: Paul Phillips <paulp@improving.org> Date: Fri Dec 21 15:06:10 2012 -0800 Removed dead implementation. Another "attractive nuisance" burning off time until I realized it was commented out. (cherry picked from commit ed40f5cbdf35d09b02898e9c0950b9bd34c1f858)
* | | Merge pull request #1853 from paulp/issue/6928Paul Phillips2013-01-114-0/+28
|\ \ \ | |_|/ |/| | SI-6928, VerifyError with self reference to super.
| * | SI-6928, VerifyError with self reference to super.Paul Phillips2013-01-074-0/+28
| |/ | | | | | | | | | | | | | | | | A bug in typers mishandled varargs. We should get more aggressive about eliminating all the ad hoc parameter/argument handling code spread everywhere. For varargs especially: any code which tries to make an adjustment based on a repeated parameter is more likely to be wrong than right. In aggregate these reinventions are a huge source of bugs.
* | Merge pull request #1787 from vigdorchik/si_6803Adriaan Moors2013-01-081-4/+4
|\ \ | |/ |/| SI-6803: do not use java.net.URI, even more so incorrectly.
| * SI-6803: do not use java.net.URI, even more so incorrectly.Eugene Vigdorchik2013-01-061-4/+4
| |
* | Merge pull request #1834 from paulp/issue/6897Paul Phillips2013-01-061-0/+6
|\ \ | | | | | | SI-6897, lubs and varargs star.
| * | SI-6897, lubs and varargs star.Paul Phillips2012-12-311-0/+6
| | | | | | | | | | | | | | | Don't allow lubs to calculate refinement types which contain a varargs star outside of legal varargs star position.
* | | Merge pull request #1835 from paulp/issue/6896Paul Phillips2013-01-062-0/+8
|\ \ \ | | | | | | | | SI-6896, spurious warning with overloaded main.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 22:28:30 +0000