summaryrefslogtreecommitdiff
path: root/test/files
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1643 from retronym/ticket/6677Adriaan Moors2012-11-252-0/+61
|\ | | | | SI-6677 Insert required cast in `new qual.foo.T`
| * SI-6677 Insert required cast in `new qual.foo.T`Jason Zaugg2012-11-182-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Short version: we sometimes need to rewrite this as new T(qual.asInstanceOf[OwnerOfFoo].foo) Long version: `adaptMember` in Erasure performs a few tasks, among them: 1. adding an empty argument list to qualifiers in `new qual.T` for which `qual` is a val template member that has (post uncurry) a MethodType with an empty parameter list. The same rewriting was already applied in uncurry for such qualifiers appearing in other contexts, e.g. `qual.foo` was already rewritten to `qual().foo`. 2. casting, if necessary, the qualifier in `Select(qual, name)` to the type of owner of the symbol that this selection references. This can be neccesary with compound types: - some val class member has type `A with B`; - we instantiate `new ab.valMemberOfB.T` - we must pass `ab.valMemberOfB` to the constructor of `T` as the `$outer` pointer - we must cast `ab` to `B` before calling `valMemberOfB`. Failure to insert this cast can lead to a LinkageError or a VerifyError. However, if 1) was performed, 2) was not. The error is pretty easy to trigger with the new reflection API: class Test { val cm: reflect.runtime.universe.Mirror = reflect.runtime.currentMirror def error { new cm.universe.Traverser // java.lang.VerifyError } def okay1 { val cm: reflect.runtime.universe.Mirror = reflect.runtime.currentMirror new cm.universe.Traverser } } The fix applied here to `adaptMember` mirrors the existing implementation of `adaptType`.
* | Fix for SI-6706, Symbol breakage under GC.Paul Phillips2012-11-231-0/+14
| | | | | | | | | | | | Ensure the map key and the String in the Symbol are the same reference by removing the old key before updating the map with the new key -> symbol relation.
* | SI-6023 reify abstract valsYour Name2012-11-232-0/+29
| | | | | | | | | | | | | | | | | | | | | | Type trees created by MethodSynthesis for abstract val getters carry symless originals, which are unusable for reification purposes (or the result of reification will be unhygienic). To combat this, type trees for such getters are now created empty, i.e. without any `tpe` set, just having an original assigned. Subsequent `typedTypeTree` invocations fill in the `tpe` and update the original to be symful.
* | Merge pull request #1645 from scalamacros/ticket/6673Josh Suereth2012-11-212-0/+6
|\ \ | | | | | | SI-6673 fixes macro problems with eta expansions
| * | SI-6673 fixes macro problems with eta expansionsEugene Burmako2012-11-182-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eta expansions previously caused the typer to disable macros. That was done in order to detect eta expansion of macro defs and show the user an appropriate error message. Macros were disabled because to find out whether we're expanding a macro def, we need to get its symbol, and to get a symbol of something we need to typecheck that something. However typechecking automatically expands macros, so, unless we disable macros, after a typecheck we won't be able to analyze macro occurrences anymore. Unfortunately this solution has a fatal flaw. By disabling macros we not only prevent the eta-expandee from macro expanding, but also all the subtrees of that eta-expandee (see SI-6673). This commit adds a mechanism for fine-grained control over macro expansion. Now it's possible to prohibit only the node, but not its children from macro expanding.
* | | Merge pull request #1653 from retronym/ticket/6695Josh Suereth2012-11-211-0/+18
|\ \ \ | | | | | | | | SI-6695 Test case for fixed Array match bug
| * | | SI-6695 Test case for fixed Array match bugJason Zaugg2012-11-211-0/+18
| | | |
* | | | Merge pull request #1596 from soc/SI-6632+SI-6633Josh Suereth2012-11-204-0/+68
|\ \ \ \ | | | | | | | | | | SI-6632 SI-6633 Fixes issues and data corruption in ListBuffer
| * | | | SI-6632 SI-6633 Fixes issues and data corruption in ListBufferSimon Ochsenreither2012-11-094-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | - Disallow negative positions for ListBuffer#insert/insertAll/update - Fix data corruption issue in ListBuffer#insert
* | | | | Merge pull request #1597 from soc/SI-6634Josh Suereth2012-11-202-0/+111
|\ \ \ \ \ | | | | | | | | | | | | SI-6634 Fixes data corruption issue in ListBuffer#remove
| * | | | | SI-6634 Fixes data corruption issue in ListBuffer#removeSimon Ochsenreither2012-11-162-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the cut-down version with minimally invasive changes, e. g. keeping the "auto-correcting" bounds algorithm.
* | | | | | Merge pull request #1620 from namin/si-6551Josh Suereth2012-11-201-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixes SI-6551.
| * | | | | | SI-6551: don't insert apply call in polymorphic expression.Nada Amin2012-11-161-0/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | Don't rewrite an explicit apply method to dynamic polytypes.
* | | | | | Merge pull request #1621 from jannic/SI-6663-2.10.xJosh Suereth2012-11-204-0/+43
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Si 6663 2.10.x fix type parameter on selectDynamic
| * | | | | SI-6663: don't ignore type parameter on selectDynamic invocationJan Niehusmann2012-11-164-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mkInvoke to handle selectDynamic calls of the form new C.foo[T].xyz or new C.foo[T].xyz :U (where C extends Dynamic) Without this patch, the type parameter was silently ignored, and possibly inferred to a different. This patch fixes mkInvoke to handle these cases, where ctxTree has the form Select(TypeApply(fun, targs), nme) or Typed(...)
* | | | | | Merge pull request #1628 from axel22/issue/6150-backportJosh Suereth2012-11-191-0/+44
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fixes SI-6150 - backport to 2.10.x branch.
| * | | | | Fixes SI-6150 - backport to 2.10.x branch.Aleksandar Prokopec2012-11-141-0/+44
| |/ / / /
* | | | | Merge pull request #1624 from adriaanm/paulp-issue/5330-2.10.xAdriaan Moors2012-11-164-0/+46
|\ \ \ \ \ | |_|/ / / |/| | | | SI-5330, SI-6014 deal with existential self-type
| * | | | SI-5330, SI-6014 deal with existential self-typeAdriaan Moors2012-11-144-0/+46
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been broken since https://github.com/scala/scala/commit/b7b81ca2#L0L567. The existential rash is treated in a similar manner as in fc24db4c. Conceptually, the fix would be `def selfTypeSkolemized = widen.skolemizeExistential.narrow`, but simply widening before narrowing achieves the same thing. Since we're in existential voodoo territory, let's go for the minimal fix: replacing `this.narrow` by `widen.narrow`. -- Original patch by @retronym in #1074, refined by @paulp to only perform widen.narrow incantation if there are existentials present in the widened type, as narrowing is expensive when the type is not a singleton. The result is that compiling the entirety of quick, that code path is hit only 143 times. All the other calls hit .narrow directly as before. It looks like the definition of negligible in the diff of -Ystatistics when compiling src/library/scala/collection: < #symbols : 306315 --- > #symbols : 306320 12c13 < #unique types : 293859 --- > #unique types : 293865 I'm assuming based on the 2/1000ths of a percent increase in symbol and type creation that wall clock is manageable, but I didn't measure it.
* | | | Merge pull request #1612 from scalamacros/topic/showrawEugene Burmako2012-11-152-0/+17
|\ \ \ \ | |/ / / |/| | | sane printing of renamed imports
| * | | sane printing of renamed importsEugene Burmako2012-11-132-0/+17
| | |/ | |/| | | | | | | | | | Having a select named "foo" with an underlying symbol named "bar" and trying to make sense of all that by prettyprinting is very confusing
* | | Merge pull request #1585 from retronym/ticket/6539-2Eugene Burmako2012-11-143-0/+26
|\ \ \ | | | | | | | | SI-6539 Annotation for methods unfit for post-typer ASTs
| * | | Refine @compileTimeOnlyJason Zaugg2012-11-083-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't default the message, and show it exclusively. - Fix cut-and-pasto in the @since tag - Be tolerant if the annotaion class is missing, as seems to have been the case compiling the continuations plugin. - s/\t/ / in the test file to show the errors are positioned correctly. - Use defensive getOrElse
| * | | SI-6539 Annotation for methods unfit for post-typer ASTsJason Zaugg2012-11-063-0/+26
| | |/ | |/| | | | | | | | | | | | | | | | | | | Motivated by the `.value` method in the SBT task-syntax branch, which should only be called within the context of the argument to a setting initialization macro. The facility is akin to a fatal deprecation.
* | | Fix for SI-6662, macro failing too early.Paul Phillips2012-11-143-0/+17
| |/ |/| | | | | | | Don't give up before you try tupling. Who knows what someone might be doing with a Unit.
* | better error when typetagging local classesEugene Burmako2012-11-121-1/+1
|/ | | | Inspired by https://issues.scala-lang.org/browse/SI-6649
* Merge branch '2.10.0-wip' into merge-2.10.0Josh Suereth2012-11-0537-1579/+126
|\
| * Merge pull request #1562 from paulp/issue/6600Josh Suereth2012-11-021-0/+8
| |\ | | | | | | Fix for SI-6600, regression with ScalaNumber.
| | * Fix for SI-6600, regression with ScalaNumber.Paul Phillips2012-11-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not much in the end; I divided ScalaNumericConversions into two traits such that the ScalaNumericAnyConversions can be used in value classes, and ScalaNumericConversions can override methods in ScalaNumber (since one trait cannot do both those things.) The fact that ScalaNumber is privileged for equality but a) extends java.lang.Number and therefore b) cannot be a value class is something we will want to revisit real soon.
| * | SI-6562 Fix crash with class nested in @inline methodJason Zaugg2012-11-021-0/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6b4204604 moved access widenings from ExplicitOuter to SuperAccessors to reflect them in pickled signatures so that the inliner can take advantage of them under separate compilation. The followup discussion [1] determined that this wasn't the right solution: while it enabled new separate compilation inlinings, it failed to widen access of outer pointers and hence prevented certain inlinings. A better solution was proposed: modify the inliner to know that access widening is guaranteed to have happened in ExplicitOuter for any field accessed by an @inline-d method body, rather than relying solely on the pickled types. But this hasn't happened yet. In the meantime 07f94297 / #1121 reinstated the access widening to SuperAccessors, but took a slightly different approach, using `Symbol#enclMethod` rather than `closestEnclMethod`. That deviation triggers SI-6562. This commit goes back to `closestEnclMethod`. [1] https://groups.google.com/forum/#!topic/scala-internals/iPkMCygzws4
| * Merge pull request #1526 from paulp/value-classes/6534-equalsAdriaan Moors2012-11-014-0/+42
| |\ | | | | | | New take on SI-6534, value classes.
| | * Modification to SI-6534 patch.Paul Phillips2012-10-302-1/+7
| | | | | | | | | | | | | | | | | | Only exclude hashCode and equals from being overridden in value classes, not other synthetics which may turn up such as case class methods.
| | * New take on SI-6534, value classes.Paul Phillips2012-10-244-0/+36
| | | | | | | | | | | | | | | Don't prohibit equals and hashCode in universal traits; instead, always override them in value classes.
| * | Merge pull request #1540 from odersky/ticket/6500Adriaan Moors2012-11-011-0/+13
| |\ \ | | | | | | | | Fixes SI-6500 by making erasure more regular.
| | * | Fixes SI-6500 by making erasure more regular.Martin Odersky2012-10-301-0/+13
| | |/ | | | | | | | | | | | | | | | With the introduction of value classes, erasure uses specialErasure where a value class C with underlying type T is unboxed to an ErasedValueType. ErasedValue types are eliminated on phase later, in post-erasure. This was done everywhere, except in the parameter types of bridge methods. That was a mistale, because that way bridge methods could not do the boxing/unboxing logic triggered by ErasedValueTypes. Note: there is one remaining use of erasure (not specialErasure) in Erasure.scala. I put in a comment why that is OK.
| * | Merge pull request #1542 from adriaanm/odersky-ticket/6556v2Adriaan Moors2012-11-011-0/+32
| |\ \ | | | | | | | | SI-6556 no assert for surprising ctor result type
| | * | SI-6556 no assert for surprising ctor result typeMartin Odersky2012-10-301-0/+32
| | |/ | | | | | | | | | | | | | | | | | | Previous fix to value classes uncovered some questionable cases in the backend where result types of constructor signatures are surprising. It's not a big deal because these types will be ignored afterwards anyway. But the method uncovered some questionable situations which we should follow up on. However, breaking 2.9 code because of this is way too harsh. That's why the asserts were converted to warnings. review by @paulp, @adriaanm
| * | Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-11-012-35/+0
| | | | | | | | | | | | | | | | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
| * | Merge branch '2.10.0-wip' of github.com:scala/scala into 2.10.0-wipJosh Suereth2012-11-017-0/+84
| |\ \
| | * \ Merge pull request #1536 from vjovanov/issues/SI-6581Josh Suereth2012-10-312-0/+35
| | |\ \ | | | | | | | | | | SI-6581 fixed by inlining `Actor.self`.
| | | * | SI-6581 fixed by inlining `Actor.self`.Vojin Jovanovic2012-10-302-0/+35
| | | |/ | | | | | | | | | | | | | | | | | | | | This avoids the necessary type cast that was preventing leakage of internal migration classes. Review by @phaller
| | * | Merge pull request #1532 from hubertp/2.10.0-wip-issue/5031Josh Suereth2012-10-313-0/+17
| | |\ \ | | | | | | | | | | Fixes SI-5031 for separate compilation scenario.
| | | * | Fixes SI-5031 for separate compilation scenario.Hubert Plociniczak2012-10-283-0/+17
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | When you have a conflicting member in package object and normal package that share the same namespace we remove the latter ClassSymbol from the scope. Now, this has an unpleasant consequence that companionClass/companionModule/companionSymbol no longer work correctly as they rely on finding the correspondent symbol using decls of the owner. This fixes the problem of SI-5031 for separate compilation. Why the above change matters for finding foo.bar.Foo? Because when parsing the class we needed information about the static module (and we have the correct module symbol when completing the info). It's just that 043ce6d0565c9d5d960 relied on no longer valid assumptions. So we were getting NoSymbol and sym.exist was failing. Obviously a more complete solution would be better if we didn't rely on the scope but that's too big to change for 2.10.0.
| * | / Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-10-3026-1579/+0
| | |/ | |/| | | | | | | | | | | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
* | | Fix for SI-6597, implicit case class crasher.Paul Phillips2012-10-312-0/+9
| | | | | | | | | | | | | | | | | | | | | It seems to me like every call to scope.lookup in the compiler is a latent bug. If a symbol is overloaded, you get one at random. (See the FIXME comment in f5c336d5660 for more on this.)
* | | Merge pull request #1546 from paulp/merge-2.10.0-wipJosh Suereth2012-10-3114-78/+201
|\ \ \ | | | | | | | | Merge 2.10.0-wip into 2.10.x.
| * \ \ Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10.0-wipPaul Phillips2012-10-3114-78/+201
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Jason Zaugg (5) and others # Via Josh Suereth (5) and others * origin/2.10.0-wip: Use Typed rather than .setType Wider use and a new variant of typedPos. SI-6575 Plug inference leak of AbstractPartialFun Disabled generation of _1, _2, etc. methods. SI-6526 Additional test case. Fix SI-6552, regression with self types. avoid single-art assert where harmful in duration-tck Fix for SI-6537, inaccurate unchecked warning. SI-6526 Tail call elimination should descend deeper. Changes Tree and Type members from vals to defs. Fixes SI-6170: issue with dragging scaladoc splitter over central iframe
| | * | SI-6575 Plug inference leak of AbstractPartialFunJason Zaugg2012-10-282-0/+32
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usually this isn't needed, as partial functions can only be defined with an expected type. But if that expected type is and inherited method return type, the actual type of the partial function literal is used, and the implementation detail of `AbstractPartialFunction[A, B] with Serializable` leaks out. After this change, the inferred types match those from Scala 2.9.2. ticket/6575 ~/code/scala scalac29 -Xprint:typer test/files/pos/t6575a.scala | grep def > 29.txt ticket/6575 ~/code/scala squalac -Xprint:typer test/files/pos/t6575a.scala | grep def > 210.txt ticket/6575 ~/code/scala diff -u 29.txt 210.txt --- 29.txt 2012-10-28 13:51:07.000000000 +0100 +++ 210.txt 2012-10-28 13:51:20.000000000 +0100 @@ -1,7 +1,16 @@ def foo: PartialFunction[Int,Int] def /*Y*/$init$(): Unit = { - absoverride def foo: PartialFunction[Int,Int] = ((x0$1: Int) => x0$1 match { + absoverride def foo: PartialFunction[Int,Int] = { + def <init>(): anonymous class $anonfun = { + final override def applyOrElse[A1 >: Nothing <: Int, B1 >: Int <: Any](x$1: A1, default: A1 => B1): B1 = (x$1: A1 @unchecked) match { + final def isDefinedAt(x$1: Int): Boolean = (x$1: Int @unchecked) match { def /*Z*/$init$(): Unit = { - absoverride def foo: PartialFunction[Int,Int] = ((x0$2: Int) => x0$2 match { + absoverride def foo: PartialFunction[Int,Int] = { + def <init>(): anonymous class $anonfun = { + final override def applyOrElse[A1 >: Nothing <: Int, B1 >: Int <: Any](x$1: A1, default: A1 => B1): B1 = (x$1: A1 @unchecked) match { + final def isDefinedAt(x$1: Int): Boolean = (x$1: Int @unchecked) match { def /*Comb*/$init$(): Unit = { - absoverride def foo: PartialFunction[Int,Int] = ((x0$3: Int) => x0$3 match { + absoverride def foo: PartialFunction[Int,Int] = { + def <init>(): anonymous class $anonfun = { + final override def applyOrElse[A1 >: Nothing <: Int, B1 >: Int <: Any](x$1: A1, default: A1 => B1): B1 = (x$1: A1 @unchecked) match { + final def isDefinedAt(x$1: Int): Boolean = (x$1: Int @unchecked) match {
| | * Merge pull request #1519 from paulp/no-product-nJosh Suereth2012-10-244-71/+72
| | |\ | | | | | | | | Disabled generation of _1, _2, etc. methods.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-13 07:13:09 +0000