summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Support for scala.concurrent for the ActorRef.Vojin Jovanovic2012-09-252-11/+18
| | | | Review by @phaller
* SI-6305 fix.Vojin Jovanovic2012-09-255-7/+13
|
* Merge pull request #1385 from scalamacros/ticket/6412Paul Phillips2012-09-247-96/+180
|\ | | | | SI-6412 some fixes for reflection leaks
| * fixes mirrorThatLoaded in JavaMirrorsEugene Burmako2012-09-242-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `mirrorThatLoaded(sym: Symbol): Mirror` in JavaMirrors used to iterate over `lazy val mirrors = new WeakHashMap[ClassLoader, WeakReference[JavaMirror]]()` to find out what mirror has loaded a certain symbol. It worked okay until yesterday when I noticed failing tests, which crashed when weak references in mirrors were dereferenced with get.get. Apparently some mirrors were collected, and the logic in JavaMirror didn't account for that possibility. When fixing this bug, I noticed that mirrors can become unreachable even if there are still reachable symbols created by those mirrors. That doesn't make sense, therefore I fixed this bug as well by introducing a strong ref from root symbols to the enclosing mirror. Therefore, any active symbol will have a strong reference to the enclosing mirror by the virtue of the owner chain.
| * SI-6412 alleviates leaks in toolboxesEugene Burmako2012-09-243-82/+107
| | | | | | | | | | | | | | | | | | | | | | | | Turns importer caches into fully weak hash maps, and also applies manual cleanup to toolboxes every time they are used. It's not enough, because reflection-mem-typecheck test is still leaking at a rate of ~100kb per typecheck, but it's much better than it was before. We'll fix the rest later, after 2.10.0-final. For more information, see https://issues.scala-lang.org/browse/SI-6412 and http://groups.google.com/group/scala-internals/browse_thread/thread/eabcf3d406dab8b2
| * SI-6412 fixes leaks in Types.uniquesEugene Burmako2012-09-242-1/+61
| | | | | | | | | | | | | | | | This is the most blatant leak in reflection. There are others, but their impact is much smaller, therefore we'll fix them later, after 2.10.0-final. For more information, see https://issues.scala-lang.org/browse/SI-6412 and http://groups.google.com/group/scala-internals/browse_thread/thread/eabcf3d406dab8b2
* | Merge pull request #1373 from smessmer/2.10.xGrzegorz Kossakowski2012-09-244-4/+4
|\ \ | |/ |/| Changed implementation comments from /** */ to /* */ for ScalaDoc
| * Changed implementation comments from /** */ to /* */, so ScalaDoc remains ↵smessmer2012-09-214-4/+4
| | | | | | | | reasonable
* | Merge pull request #1378 from scalamacros/ticket/5918Eugene Burmako2012-09-233-44/+11
|\ \ | | | | | | SI-5918 fixes the ConstantType ugliness
| * | SI-5918 fixes the ConstantType uglinessEugene Burmako2012-09-233-44/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java enum values are represented with constants wrapping corresponding Symbols. To find out the underlying type of such a constant one needs to calculate sym.owner.linkedClassOfClass.tpe (where sym represents the wrapped symbol). To quote the source code, given (in java): class A { enum E { VAL1 } } - sym: the symbol of the actual enumeration value (VAL1) - .owner: the ModuleClassSymbol of the enumeration (object E) - .linkedClassOfClass: the ClassSymbol of the enumeration (class E) Back then, as far as I can guess, linkedClassOfClass was flaky and didn't work well late in the compilation pipeline. Therefore a fix to SI-1329 introduced a caching facility. Once a ConstantType representing the type of Constant(sym) was created (I guess, during typer, when linkedClassOfClass was still working), it cached the underlying type and used it in subsequent phases. *** Unfortunately this solution, being fine for enum values, broke another flavor of constants - type wrapping constants that represent classOf (for example, Constant(IntTpe) represents the classOf[Int] constant). Type-wrapping constants are special, because their type (e.g. Class[Int] in the example from the previous paragraph) changes as the compilation progresses. Before erasure it's Class[something], and after erasure it's just Class. Therefore caching types of such constants might lead to incorrect types flying around after erasure, as described in this scala-internals thread: http://groups.google.com/group/scala-internals/browse_thread/thread/45185b341aeb6a30. *** Now when the problem is clear, the question is why didn't it happen before? That's all because of another peculiarity of the compiler. Before erasure package references (e.g. in TypeRef prefixes) are represented as ThisType(sym), where sym stands for a package class symbol. After erasure such references are represented differently, e.g. java.lang package looks like TypeRef(TypeRef(TypeRef(NoPrefix, root, Nil), java, Nil), java.lang, Nil). As described in the aforementioned thread, the incorrect caching strategy employed in UniqueConstantType mixed with other caching mechanisms in compiler effectively established a non-clearable cache that goes from Type instances to types that represent their classOfs, e.g. from String to Class[String]. So if anyone tried to typecheck a classOf after erasure, he/she would get Class[String] instead of the correct Class, and compiler would crash. Right? Nope. Before erasure String is TypeRef(ThisType(java.lang), StringSymbol, Nil), and after erasure it's TypeRef(TypeRef(...), StringSymbol, Nil), as explained above. Therefore the foul cache would contain two String types: one pre-erasure going to a pre-erasure Class[String], and another one post-erasure going to a post-erasure Class. *** This shaky balance was broken when I tried to implement class tag generation with shiny Type.erasure method that Martin just exposed in the reflection API. The erasure method partially invoked the Erasure phase, and for a String it returned its post-erasure representation (with java.lang prefix represented as TypeRef, not as ThisType). And after that I used the result of erasure to build a classOf for a class tag. Since I did it in a macro, it was typer, a pre-erasure phase. Now you understand why things broke. That classOf created a Constant wrapping a post-erasure representation of String, which cached the incorrect non-erased Class[String] type for a post-erasure type, and things exploded. You can imagine my panic! The ScalaDays deadline was near, I still had to do finishing touches to implicit macros (which I actually never had time to do), and such a fundamental thing exploded. Actually I figured out the hashing problem, but in the limited time I had I failed to understand why exactly it's happening, so I introduced the dirty workaround praised in SI-5918 and moved on. *** The story doesn't end here. Some time has passed, and I learned a lot about the compiler. I independently discovered the ThisType -> TypeRef transform that erasure applies to package references and patched Type.erasure to undo it. After all, Type.erasure is a user-facing API, and users don't need to know about post-typer implementation details. You can read more about this here: http://groups.google.com/group/scala-internals/browse_thread/thread/6d3277ae21b6d581 From what we've learned above, we can see that this Type.erasure fix made the UniqueConstantType workaround unnecessary. But I didn't know that. So imagine my surprise when I tried to remove that workaround and ran the tests only to see that nothing fails. I went back in time to April when the problem first manifested, extracted a minimized crasher and tried to use it on trunk. Again, nothing crashed. And only with the help of showRaw, I finally understood that types printed as "String" can be wildly different. The rest was a piece of cake. *** The irony is that the original reason for ConstantType caching is no longer valid. linkedClassOfClass now works fine (and files/jvm/outerEnum.scala agrees with me), so we can remove the cache altogether. So why all this story about erasure and package references? Well, I don't know. I enjoyed uncovering this mystery, so I wanted to share it with you :)
* | | Merge pull request #1377 from scalamacros/topic/partest-always-lfPaul Phillips2012-09-222-4/+23
|\ \ \ | | | | | | | | partest now always produces log files with LFs
| * | | partest now always produces log files with LFsEugene Burmako2012-09-222-4/+23
| |/ /
* | | Merge pull request #1379 from retronym/topic/boxing-conversionsPaul Phillips2012-09-221-5/+0
|\ \ \ | |/ / |/| | Remove BoxingConversions from the scala package.
| * | Remove BoxingConversions from the scala package.Jason Zaugg2012-09-221-5/+0
| | | | | | | | | | | | | | | | | | And add it to two test cases that rely on it. It is a remnant of the now-removed FlatArray (8cc7de74d).
* | | Merge pull request #1370 from pavelpavlov/SI-5767Grzegorz Kossakowski2012-09-211-2/+0
|\ \ \ | | | | | | | | LinkedHashSet scaladoc fix after FlatHashTable->HashTable transiton
| * | | LinkedHashSet scaladoc fix after FlatHashTable->HashTable transitonPavel Pavlov2012-09-211-2/+0
| | | |
* | | | fix scala.collection.TraversableLike scaladocxuwei-k2012-09-211-1/+1
| | | |
* | | | fix Subscriber scaladocxuwei-k2012-09-211-1/+1
| | | |
* | | | Merge remote-tracking branch 'paulp/treecheckers' into 2.10.xPaul Phillips2012-09-201-1/+1
|\ \ \ \
| * | | | Fix for loud test.Paul Phillips2012-09-201-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'paulp/topic/gitattributes' into 2.10.xPaul Phillips2012-09-201-91/+91
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Normalized line endings.Paul Phillips2012-09-201-91/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings all the files into line with the .gitattributes settings, which should henceforth be automatically maintained by git.
* | | | | Merge pull request #1348 from scalamacros/ticket/6394Grzegorz Kossakowski2012-09-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | SI-6394 fixes macros.Context.enclosingClass
| * | | | | SI-6394 fixes macros.Context.enclosingClassEugene Burmako2012-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously I used typer.context.enclClass, but it seems to do something completely unexpected, so I switched to manual context traversal.
* | | | | | Merge pull request #1325 from odersky/ticket/6337Paul Phillips2012-09-202-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixes SI-6337 by disallowing nested value classes.
| * | | | | | Fixed comment.Martin Odersky2012-09-171-0/+1
| | | | | | |
| * | | | | | Fixes SI-6337 by disallowing nested value classes.Martin Odersky2012-09-172-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems for the moment too hard to allow this, and the functionality to have value classes wrap other value classes does not seem essential.
* | | | | | | Merge pull request #1344 from jsuereth/wip/osgi-supportEugene Burmako2012-09-2024-27/+117
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes SI-5822 & SI-6305 - OSGi tests + fixes
| * | | | | | | Adds OSGi support / tests to Scala. Fixes SI-5822.Josh Suereth2012-09-187-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds BND manifest generation to the build. * Adds OSGi pax-exam testing infrastructure * Adds simple OSGi verification test for bundle resolution. * Modifies distribution to use bundles.
| * | | | | | | Fixes SI-6305 scala.tools.nsc.io split between jars.Josh Suereth2012-09-1817-27/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * migrates scala.tools.nsc.io portions into scala.reflect.io * marks all classes in scala.reflect.io experimental/internal * rewires src/reflect to use new io locations * creates forwarders in scala.tools.nsci.io package object.
* | | | | | | | Merge pull request #1356 from paulp/pullreq-1342Josh Suereth2012-09-201-10/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Pullreq 1342
| * | | | | | | | Error message improvement for SI-6336.Paul Phillips2012-09-191-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Position error messages about structural type members at the problematic parameter or type.
| * | | | | | | | SI-6336 Now also catches return typesMartin Odersky2012-09-181-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Mark's comments on SI-6336 shows, we also need to disallow value classes as return types of structural types.
* | | | | | | | | Merge pull request #1339 from rkuhn/wip-6389-finite-duration-multJosh Suereth2012-09-2014-250/+333
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | enable integer multiplication/divison on FiniteDuration, see SI-6389
| * | | | | | | | | some small remaining fixesRoland2012-09-204-27/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added test for “span” and “fromNow” qualifiers - make those actually work even when there is an expected type - add ScalaDoc to them - verify (and fix) conversion Deadline -> FiniteDuration - also make Int * Duration => FiniteDuration work (and test it)
| * | | | | | | | | Adjustments to scala.concurrent.duration.Paul Phillips2012-09-195-196/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More use of implicit classes and value classes; aliased units to make importing TimeUnit and TimeUnit._ unnecessary; placed some classes in their own files because "the unit of compilation is the file" and we shouldn't bundle more than necessary; fixed some examples.
| * | | | | | | | | move Duration (incl. DSL) into scala.concurrent.duration packageRoland2012-09-1911-39/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that the full package can be imported naturally: import scala.concurrent.duration._ will give you all the types (Duration, FiniteDuration, Deadline) and the DSL for constructing these.
| * | | | | | | | | improve performance of integer multiplication overflow check on DurationRoland2012-09-191-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - also rename divisor arguments to “divisor” - and add a scalacheck for multiplication overflow detection
| * | | | | | | | | enable integer multiplication/divison on FiniteDuration, see SI-6389Roland2012-09-181-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - without this "2.seconds * 2" will not return FiniteDuration but Duration - added test case verifying this behavior - matches normal arithmetics: integers throw on div-by-zero while doubles yield infinity; extended here to include overflow protection on integer multiplication
* | | | | | | | | | Merge pull request #1360 from scalamacros/hotfix/sbtEugene Burmako2012-09-201-6/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | don't try to create tags w/o scala-reflect.jar
| * | | | | | | | | don't try to create tags w/o scala-reflect.jarEugene Burmako2012-09-201-6/+9
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since recently type tags have relocated to scala-reflect.jar, meaning that they are no longer always on library classpath. In the compiler we do have code that generates type tags, and this code is bound to fail if scala-reflect.jar isn't there. I though this wouldn't be a problem, because type tag materialization is only going to be triggered by users explicitly requesting a type tag. That's generally true, but I overlooked a corner case. Since we provide manifest <-> type tag compatibility, manifest lookup can sometimes trigger tag lookup, which might result in tag synthesis, which blows up like this: http://groups.google.com/group/scala-internals/browse_thread/thread/166ce4b71b7c46bb This commit also ensures that type tag generation/interop doesnt sneak into the code of the libraries that don't have scala-reflect.jar on their classpath. For details refer to the discussion at scala-internals: http://groups.google.com/group/scala-internals/browse_thread/thread/72f6ce3010f4d8
* | | | | | | | | Value classes: eliminated half-boxingMartin Odersky2012-09-203-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now apply erasure of value classes everywhere. previously, erasure was disabled in the value class itself. This led to irregegularities and bugs. See test run/valueclasses-pavlov.scala for something that led to a ClassCastException before.
* | | | | | | | | Cleanup of OverridingPairsMartin Odersky2012-09-201-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a default value to a hashmap so that we can work with it without Option acrobatics.
* | | | | | | | | Fixes SI-6260Martin Odersky2012-09-202-21/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guards against bridge methods that clash with other methods. Two tests: The neg test is the original ticket. The run test tweaks things slightly so that the generated bridge method does not clash, and tests that the necessary unboxings are indeed performed at runtime.
* | | | | | | | | Merge pull request #1353 from gkossakowski/SI-6376-scalap-is-brokenGrzegorz Kossakowski2012-09-201-3/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix problem with names encoding in scalap.
| * | | | | | | | | Fix problem with names encoding in scalap.Grzegorz Kossakowski2012-09-191-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactoring performed in 020053c321 made use of naming encoding more consisted but introduced a regression in scalap. The problem is that the old encoder that scalap had didn't escape any characters that were not included in its opcode list. `NameTransformer` performs full encoding so it also encodes dots that are being used as separators for packages. Therefore, in order to retain the old behaviour we need to split the name by dots before feeding each fragment to `NameTransformer`. Review by @paulp.
* | | | | | | | | | Merge pull request #1331 from scalamacros/ticket/5943Grzegorz Kossakowski2012-09-202-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | SI-5943 toolboxes now autoimport Predef and scala
| * | | | | | | | | | SI-5943 toolboxes now autoimport Predef and scalaEugene Burmako2012-09-202-2/+2
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously tb.typeCheck used default typer, which builds upon NoContext. Changing the context to analyzer.rootContext(NoCompilationUnit, EmptyTree) fixed the missing imports problem. Unfortunately this doesn't help in cases like "math.sqrt(4.0)" because of https://issues.scala-lang.org/browse/SI-6393. But anyways I'm adding this test case to pending.
* | | | | | | | | | Merge pull request #1338 from scalamacros/ticket/5418Grzegorz Kossakowski2012-09-202-3/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | existentially typed macro expansions now work fine
| * | | | | | | | | existentially typed expansions now work fineEugene Burmako2012-09-182-3/+14
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one tries to compile the following code with the parent of this commit: ru.reify(new Object().getClass) then the following error will occur: Test.scala:2: error: type mismatch; found : $u.Expr[Class[_ <: Object]] required: reflect.runtime.universe.Expr[Class[?0(in value <local Test>)]] where type ?0(in value <local Test>) <: Object ru.reify(new Object().getClass) ^ This happens because macro expansions are always typechecked against the return type of their macro definitions instantiated in the context of expandee. In this case the expected type contains skolems which are incompatible with wildcards in the type of the expansion. I tried all the incantations I could think of - without any success. Luckily I met Martin who pointed me at the same problem solved in adapt (see the diff w.r.t Typers.scala).
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 14:49:52 +0000