summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #900 from viktorklang/2.10.xAdriaan Moors2012-07-1310-132/+109
|\ | | | | critical enhancements to SIP-14
| * Changing to scala.concurrent.context. as namespace for the system properties ↵Viktor Klang2012-07-131-6/+5
| | | | | | | | for the global execution context
| * Fixing oversight in propagating the runnable into the newly created thread.Viktor Klang2012-07-131-1/+1
| |
| * Squashed critical enhancements to SIP-14: daemonizing global EC, giving EC ↵Viktor Klang2012-07-1310-132/+110
|/ | | | to DelayedLazyVal, removing currentExecutionContext, removing impl.Future.isFutureThrowable, implementing asExecutionContext, giving a decent fallback if ForkJoinPool cannot be created
* Merge pull request #892 from xuwei-k/either-scaladocJosh Suereth2012-07-133-11/+11
|\ | | | | fix Right,Left and Either scaladoc links
| * fix Right,Left and Either scaladoc linksxuwei-k2012-07-133-11/+11
| |
* | Merge pull request #870 from paulp/topic/partest-no-actorsAdriaan Moors2012-07-139-1175/+900
|\ \ | | | | | | faster partest
| * | Eliminated more logic.Paul Phillips2012-07-114-349/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why hand out big blocks of tests to workers. Just put them all in a queue and let the threads consume them when they can. This speeds up partest a fair bit in those not uncommon situations where one worker would end up lagging well behind the others, and drops another 150ish lines of code. Test suite time on my 8-core machine goes from 28:21 to 22:34.
| * | Eliminated actors from partest.Paul Phillips2012-07-117-496/+364
| | | | | | | | | | | | | | | The actors in partest were offering nothing but unnecessary complication and an extra dependency.
* | | Merge pull request #891 from lrytz/t5975Adriaan Moors2012-07-133-1/+25
|\ \ \ | |_|/ |/| | SI-5957 enable direct parsing of nested java class classfile
| * | SI-5957 enable direct parsing of nested java class classfileLukas Rytz2012-07-123-1/+25
|/ / | | | | | | by weakening an assertion. explained in the source comment.
* | Merge pull request #885 from soc/scaladoc-hashsetmapAdriaan Moors2012-07-122-4/+2
|\ \ | | | | | | Fix doc about specialized subclasses of c.i.HashMap/HashSet.
| * | Fix doc about specialized subclasses of c.i.HashMap/HashSet.Simon Ochsenreither2012-07-112-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation was wrong and judging from the “TODO: add HashMap2, HashMap3, ...” in the source file I refrained from mentioning any specific number, so overall it has gotten a bit less precise, but hopefully more correct. Review: @heathermiller
* | | Further optimization of asSeenFrom.Paul Phillips2012-07-121-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After some more early exclusion of uninteresting arguments, asSeenFrom is now over twice as fast. Compiling the collections, three runs: -- Without these two commits: 8108775ms, 8132052ms, 8257527ms in asSeenFrom Wall clock: 0m54.202s, 0m54.877s, 0m55.925s -- With these two commits: 3568719ms, 3542860ms, 3570892ms in asSeenFrom Wall clock: 0m50.730s, 0m51.213s, 0m50.850s (Rebase of https://github.com/scala/scala/pull/835)
* | | Optimization in asSeenFrom.Paul Phillips2012-07-121-51/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminated about half the allocations of AsSeenFromMap by examining the arguments more closely. The impact is not what one might conclude from that statistic, because those were the cheap asSeenFrom calls - but now they are cheaper. Also, - worked in some eager vals rather than lazy ones. - changed hot-spot comparison to use eq - simplified annotationArgRewriter - elimnated separate tracking of capturedPre Statistics from compiling scala/collection/**.scala: - 4209382 calls to asSeenFrom - 1025945 maps created (instantiations of AsSeenFromMap) - 1525649 maps avoided (these were instantiations before this patch) Review by most honorable performance-san @gkossakowski . (Rebase of https://github.com/scala/scala/pull/835)
* | | Merge pull request #884 from dcsobral/si/6032Adriaan Moors2012-07-112-12/+76
|\ \ \ | | | | | | | | SI-6032 Enhance TaskSupport documentation.
| * | | SI-6032 Enhance TaskSupport documentation.Daniel C. Sobral2012-07-112-12/+76
| | |/ | |/|
* | | Merge pull request #877 from magarciaEPFL/fixesAdriaan Moors2012-07-111-1/+1
|\ \ \ | | | | | | | | SI-6015 assertion (in Type-flow analysis) that wasn't, valid counterexample found
| * | | SI-6015 assertion (in Type-flow analysis) that wasn't, valid counterexample ↵Miguel Garcia2012-07-111-1/+1
| |/ / | | | | | | | | | found
* | | Merge pull request #874 from adriaanm/ticket-6022Adriaan Moors2012-07-113-8/+44
|\ \ \ | | | | | | | | SI-6022 model type-test-implication better
| * | | SI-6022 model type-test-implication betterAdriaan Moors2012-07-113-8/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we use subtyping as a model for implication between instanceof tests i.e., when S <:< T we assume x.isInstanceOf[S] implies x.isInstanceOf[T] unfortunately this is not true in general. SI-6022 expects instanceOfTpImplies(ProductClass.tpe, AnyRefClass.tpe), but ProductClass.tpe <:< AnyRefClass.tpe does not hold because Product extends Any however, if x.isInstanceOf[Product] holds, so does x.isInstanceOf[AnyRef], and that's all we care about when modeling type tests
* | | | Merge pull request #878 from adriaanm/topic-polyvalclassAdriaan Moors2012-07-119-49/+128
|\ \ \ \ | | | | | | | | | | polymorphic value classes
| * | | | polymorphic value classesMartin Odersky2012-07-117-47/+126
| | | | | | | | | | | | | | | | | | | | dropping boxing code, which turned out to be a dead end.
| * | | | statistics: print millis instead of micros.Martin Odersky2012-07-111-1/+1
| | | | |
| * | | | don't crash on syntactically incorrect value classesMartin Odersky2012-07-111-1/+1
| | | | |
* | | | | Merge pull request #887 from paulp/topic/pickledflagsAdriaan Moors2012-07-1110-60/+59
|\ \ \ \ \ | | | | | | | | | | | | major fixes to how flags are pickled
| * | | | | Removed EXISTENTIAL special case in unpickler.Paul Phillips2012-07-111-6/+1
| | | | | |
| * | | | | Merge branch '2.10.x' into topic/pickledflagsPaul Phillips2012-07-1168-194/+675
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/reflect/scala/reflect/internal/Flags.scala
| * | | | | | Pickled flag reorgMartin Odersky2012-07-119-54/+49
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up and optimized code that maps between raw and pickled flags. Avoids mystery constants. Makes a whole bunch of new flags be pickled which were not pickled before (more precisely: Everything in InitialFlags with value greater than 1 << 31 which is not in FlagsNotPickled now gets pickled whereas before it wasn't. Among these: VARARGS, IMPLCLASS, SPECIALZED, DEFAULTINIT, SYNCHRONIZED. I am curious how many tickets will get fixed by this change. The first one I noted is t5504, which previously enforced the buggy behavior through a neg check! There are also some build manager check file changes that have to do with the fact that flags now print in a different order for performance reasons.
* | | | | | Merge pull request #881 from lrytz/t4763Josh Suereth2012-07-1119-20/+40
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | SI-4763 deprecated `@cloneable` annotation
| * | | | | SI-4763 Deprecated the `cloneable` annotationLukas Rytz2012-07-1112-14/+24
| | | | | |
| * | | | | Moved cloneable class to package `scala.annotation`.Lukas Rytz2012-07-1110-157/+8
| | | | | | | | | | | | | | | | | | | | | | | | Requires a new starr.
| * | | | | starr sources to move cloneable class to package `annotation`Lukas Rytz2012-07-115-1/+160
| | |/ / / | |/| | |
* | | | | Merge commit 'refs/pull/851/head' into 2.10.xAdriaan Moors2012-07-118-10/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added a HIDDEN flag.Paul Phillips2012-07-088-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Still not a fan of the massive overlap between GenJVM and GenASM. I do not think such duplication should be allowed into master at all, neither in experimental backends nor anywhere else. Putting us in the position that we have to actually switch to stop incurring the duplication is engineering-by-prayer.] The SYNTHETIC flag was long ago discovered to be inadequately specific to allow for emitting ACC_SYNTHETIC in bytecode. In this commit is born a HIDDEN flag, which signals the flagged symbol as implementation detail which should not be considered during typechecking, and which will receive ACC_SYNTHETIC during code generation. Unsure what should be hidden, I conservatively marked a few things which seem safely hidable. - $outer fields and accessors - classes whose classfile has the jvm Synthetic attribute (not to be confused with the SYNTHETIC flag) I leave additional choices to those who have a better idea how this will materialize (i.e. IDE guys.) It is easy to selectively introduce this flag; but the SYNTHETIC flag is set or checked for in so many places, it is very difficult to alter the logic around it (either by setting it less, or checking for HIDDEN only) with much confidence. So right now HIDDEN is only used to help ACC_SYNTHETIC make it into bytecode - it is only set in conjunction with SYNTHETIC, and it doesn't help anyone hide from the typechecker. Review by @dragos, @odersky.
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
*-------. \ \ \ \ Merge commit 'refs/pull/825/head'; commit 'refs/pull/827/head'; commit ↵Adriaan Moors2012-07-1162-184/+652
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | 'refs/pull/828/head'; commit 'refs/pull/850/head'; commit 'refs/pull/858/head' into 2.10.x
| | | | | * | | | bandaid in GenASM for SI-6049Miguel Garcia2012-07-101-4/+10
| | | | | | | | |
| | | | * | | | | SI-6042 Improve type selection from volatile type errorJason Zaugg2012-07-084-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Display the type of the typed qualifier (qual1), to avoid the message "Illegal type selection from volatile type null". - Show the upper bound, which is used to calculate the volatility.
| | | * | | | | | SI-5974 make collection.convert.Wrappers serializableLukas Rytz2012-07-053-1/+13
| | | | | | | | |
| | * | | | | | | Allow attachments for symbols, just like for trees.Lukas Rytz2012-07-0515-74/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the two global hash maps in Namers, and the one in NamesDefaults. Also fixes SI-5975.
| | * | | | | | | Enhanced presentation compiler test infrastructureMirco Dotta2012-07-0510-46/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed unneeded .flags. * Renamed a few methods in `InteractiveTest`. * Force the presentation compiler to shut down after each test. * -sourcepath in the .flags file is now relative to the test's base directory. * Use `InteractiveReporter` in Presentation Compiler tests. By using the `InteractiveReporter`, compilation errors are collected in the compilation unit. This was necessary for testing SI-5975.
| * | | | | | | | removes special case for BigIntegerDominik Gruntz2012-07-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After rebasing, the commit 34d36108bf is in the history, therefore a patch in my code can be removed as an implicit conversion from BigInteger to BigInt was added in commit 34d36108bf. The tests cases test this case and still pass.
| * | | | | | | | stringinterpolation macro test filesAdriaan Moors2012-07-064-0/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds test files neg: checks the error messages generated by the compiler run: checks the macro implementation features
| * | | | | | | | adds the sha1 files of the new starr / stringContext.fDominik Gruntz2012-07-0622-58/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit provides the new sha1 codes of the new STARR. Moreover, it replaces the implementation of StringContext.f to `macro ???`. The implementation is magically hardwired into `scala.tools.reflect.MacroImplementations.macro_StringInterpolation_f` by the new STARR.
| * | | | | | | | macro-based string interpolation formatterAdriaan Moors2012-07-065-6/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit provides a macro based string interpolation formatter. The macro is implemented in MacroImplementations.scala. In order to still be able to build a new STARR, the implementation in StringContext.f is not yet changed. This will be replaced in a later commit.
* | | | | | | | | Merge pull request #861 from dragos/revert-genasm-bg-threadv2.10.0-M5Adriaan Moors2012-07-103-91/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "GenASM: pipeline disk-write with building of classfiles"
| * | | | | | | | | Revert "GenASM: pipeline disk-write with building of classfiles"Iulian Dragos2012-07-103-91/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5d12fa4b791e73d5c99a0e145d28cbaba12823d2.
* | | | | | | | | | Merge pull request #864 from jsuereth/fix/critical-build-fixinsJosh Suereth2012-07-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | FIXING THE SAME MISTAKE BUT IN STRAP. Yay for copy-paste ant-magic
| * | | | | | | | | | FIXING THE SAME MISTAKE BUT IN STRAP. Yay for copy-paste ant-magicJosh Suereth2012-07-101-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #860 from jsuereth/fix/critical-build-fixinsAdriaan Moors2012-07-101-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Fixed very bad build.xml issue and quick.bin missing ASM.