summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* No-op merge of [nomaster] subset of 2.10.1.Adriaan Moors2013-02-270-0/+0
|\ | | | | | | These fixed binary compatibility issues that are out of scope for 2.11.
| * check scala-swing for binary compatibilityAdriaan Moors2013-02-121-0/+31
| |
| * [nomaster] Revert "Added a Swing ColorChooser wrapper"Adriaan Moors2013-02-123-120/+0
| | | | | | | | | | | | This reverts commit 08ab007c5c97f153902c4ac58f87e30fbf7cf99f. This is necessary to maintain binary compatibility with 2.10.0.
| * [nomaster] Revert "Added a Swing PopupMenu wrapper"Adriaan Moors2013-02-123-116/+0
| | | | | | | | | | | | This reverts commit bdff881f8a15d4de0c0ff2aa2427f0d8244d2d42. This is necessary to maintain binary compatibility with 2.10.0.
| * Merge pull request #2103 from adriaanm/bin-compatv2.10.1-RC1Adriaan Moors2013-02-1120-236/+792
| |\ | | | | | | Forward and backward binary compatibility between 2.10.0 and 2.10.1-RC1
| | * [nomaster] Revert "SI-6548 reflection now correctly enters jinners"Adriaan Moors2013-02-107-64/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 54a84a36d5b435a787d93ca48d45399136c7e162. This is necessary to maintain binary compatibility with 2.10.0. run/t6989.check had to be updated as it also (indirectly) tested SI-6548 Conflicts: test/files/lib/javac-artifacts.jar.desired.sha1 test/files/run/t6548.check test/files/run/t6548/Test_2.scala
| | * [nomaster] inline importPrivateWithinFromJavaFlags into SymbolTableAdriaan Moors2013-02-093-28/+19
| | | | | | | | | | | | | | | | | | This reworks 02ed5fb so that we don't change JavaUniverse's super classes. This is necessary to maintain binary compatibility with 2.10.0.
| | * [nomaster] Revert "cosmetic renamings in runtime reflection"Adriaan Moors2013-02-094-54/+54
| | | | | | | | | | | | | | | | | | This reverts commit 0429f0fd9224499cd8b606490d04b1a8dcffbca8. This is necessary to maintain binary compatibility with 2.10.0.
| | * [nomaster] refactor AdaptedForkJoinTask, uncaughtExceptionHandlerAdriaan Moors2013-02-092-28/+25
| | | | | | | | | | | | | | | | | | Inlined AdaptedForkJoinTask, made uncaughtExceptionHandler private[this]. This is necessary to maintain binary compatibility with 2.10.0.
| | * [nomaster] can't add new class BatchingExecutorAdriaan Moors2013-02-093-130/+113
| | | | | | | | | | | | This is necessary to maintain binary compatibility with 2.10.0.
| | * [nomaster] bring back SerializeStart from fa3b8040ebAdriaan Moors2013-02-092-10/+14
| | | | | | | | | | | | This is necessary to maintain binary compatibility with 2.10.0.
| | * [nomaster] duplicate tailImpl as a private methodAdriaan Moors2013-02-093-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | Reworks d526f8bd74. This is necessary to maintain binary compatibility with 2.10.0. matchName="scala.collection.mutable.MutableList.tailImpl" problemName=MissingMethodProblem
| | * [nomaster] Revert "SI-4664 Make scala.util.Random Serializable"Adriaan Moors2013-02-093-25/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also revert "SI-4664 [Make scala.util.Random Serializable] Add test case" This reverts commit 0b92073a38f9d1823f051ac18173078bfcfafc8a. This reverts commit 2aa66bec86fd464712b0d15251cc400ff9d52821. This is necessary to maintain binary compatibility with 2.10.0.
| | * [nomaster] Revert "Fixes SI-6521, overrides Range#head to be faster"Adriaan Moors2013-02-092-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a557a973608a75c7a02f251bbcf49fe6f6b6655e. This is necessary to maintain binary compatibility with 2.10.0. Mima says: matchName="scala.collection.immutable.Range.head" problemName=IncompatibleResultTypeProblem The bridge method appeared because result is now Int, whereas the super-method's result type erases to Object
| | * [nomaster] run mima both ways, filter out failuresAdriaan Moors2013-02-093-3/+557
| |/ | | | | | | | | | | | | | | | | | | Using @gkossakowski's contribution to mima (in 0.1.5-SNAPSHOT), make sure bc.run doesn't fail by filtering out all binary incompatibilities. Each subsequent commit will comment out the filters it makes irrelevant, until we only need to filter out permitted binary incompatibilities. We only allow binary incompatibilities in scala.reflect.internal.
* | Merge pull request #2171 from paulp/pr/stabilityPaul Phillips2013-02-272-12/+5
|\ \ | | | | | | Reconcile definitions of stability.
| * | Reconcile definitions of stability.Paul Phillips2013-02-262-12/+5
| | |
* | | Merge pull request #2170 from rkuhn/wip-duration-sleep-∂πJames Iry2013-02-261-2/+3
|\ \ \ | | | | | | | | relax time constraint in duration-tck.scala (for Windows)
| * | | relax time constraint in duration-tck.scala (for Windows VMs)Roland2013-02-261-2/+3
| |/ /
* | | Merge pull request #2169 from JamesIry/master_SI-7181Grzegorz Kossakowski2013-02-266-97/+279
|\ \ \ | | | | | | | | SI-7181 Eliminate unnecessary duplicates of finally blocks
| * | | SI-7181 Eliminate unnecessary duplication of finally blocksJames Iry2013-02-264-83/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main body of a try and each exception handler were getting a copy of the finally block for the "normal" flow case (i.e. where they don't throw an uncaught exception or use "return" to exit early). But that's not necessary. With this commit the try body and each exception handler can all jump to the same copy of the finally block on a normal exit. A byte code test is included to ensure we're getting fewer copies of the finally block. inline-ex-handlers.check is updated because the icode is a bit different without the extra finally block copies.
| * | | SI-7181 Prepare to remove duplicated finally blocksJames Iry2013-02-253-21/+157
| |/ / | | | | | | | | | | | | | | | | | | As a first step towards fixing 7181, this commit improves the comments and variable names around generating try/catch/finally blocks in GenICode and adds a test verifying the current functionality of try/catch/finally blocks
* | | Merge pull request #2158 from JamesIry/master_7006Grzegorz Kossakowski2013-02-266-203/+223
|\ \ \ | |/ / |/| | SI-7006 Eliminate NOPs and unreachable code
| * | SI-7006 Simplify jump-only block destination determinationJames Iry2013-02-253-114/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With proper reachability analysis, the code for finding the final destination of jump-only blocks was more complicated than needed. This commit simplifies and speeds up that process using a standard Tortoise and Hare algorithm on a Map from jump-only blocks to their immediate destinations. Test t7006 is increased a bit to make sure we don't get stuck on infinite loops and to make sure we're deleting all but the essential jump.
| * | SI-7006 Eliminate unreachable blocksJames Iry2013-02-254-63/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GenASM was doing a bunch of stuff to eliminate unreachable exception handlers, but it was still leaving behind other unreachable blocks, for instance a finally block associated with an exception handler that got removed would still be left lying around. ASM would in turn turn those into a big pile of NOPs, which just take up space uselessly. This commit replaces all the logic for eliding exception handlers with a single unreachable block remover that catches unused exception handlers and a whole lot more.
| * | SI-7006 Recognize more jump only blocksJames Iry2013-02-252-26/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During ASM code emission we would recognize a block that consisted of ICode-only artifacts (ENTER_SCOPE, EXIT_SCOPE, and LOAD_EXCEPTION) followed by a jump. But we weren't using the same logic to recognize all jump-only blocks. So jump-elision wasn't removing them. And that in fact was why the ASM code emission had to do its special case. This commit makes all jump-only block recognition use the same logic: a jump-only block is one that has 0 or more ICode-only instructions followed by a JUMP. It does't necessarily have to start with a JUMP. There's now a debugWarning if the old NOP emitting code is triggered and test t6102 is enhanced to error if that warning occurs.
| * | SI-7006 Improve jump-elision code in GenASMJames Iry2013-02-252-40/+36
|/ / | | | | | | | | | | While working on SI-7006 I found a O(N*M) loop in jump-elision that should be O(N). This commit clean that up. It also improves the diagnostics in Members#removeBlock.
* | Merge pull request #2165 from retronym/topic/empty-parenPaul Phillips2013-02-25294-1613/+1612
|\ \ | | | | | | Spring cleaning
| * | Address some ScaladocrotJason Zaugg2013-02-2522-57/+35
| | | | | | | | | | | | | | | | | | - @param tags whose name drifted from the corresponding parameter - Remove or complete a few stray stub comments (@param foo ...) - Use @tparam where appropriate.
| * | Modernize legacy backquotes in comments.Jason Zaugg2013-02-2519-52/+52
| | | | | | | | | | | | | | | Was: ``blah'' Now: `blah`
| * | Remove redundant explicit returns.Jason Zaugg2013-02-2511-16/+16
| | |
| * | Don't wrap an array just to get its length.Jason Zaugg2013-02-258-11/+11
| | | | | | | | | | | | Use .length directly, avoiding the allocation of the WrappedArray.
| * | Remove redundant 'val' from case class params.Jason Zaugg2013-02-2519-33/+33
| | |
| * | Fix two malformed format strings.Jason Zaugg2013-02-242-2/+2
| | |
| * | More explicit empty paren lists in method calls.Jason Zaugg2013-02-24133-550/+552
| | |
| * | Reorder to avoid code appearing like a forward reference.Jason Zaugg2013-02-241-12/+12
| | | | | | | | | | | | | | | It isn't, because LOOP_HEADER and friends are compile time constants. But I'd argue that its clearer not to rely on that here.
| * | Banish needless semicolons.Jason Zaugg2013-02-24104-519/+538
| | |
| * | Be explicit about empty param list calls.Jason Zaugg2013-02-2466-390/+390
| | | | | | | | | | | | With the exception of toString and the odd JavaBean getter.
| * | Don't override empty-paren methods as paren-less.Jason Zaugg2013-02-243-4/+4
| | | | | | | | | | | | An exception is made for toString.
* | | Merge pull request #2161 from scalamacros/topic/7112-followup-masterJames Iry2013-02-241-1/+1
|\ \ \ | |/ / |/| | fixes the test for SI-7112
| * | fixes the test for SI-7112Eugene Burmako2013-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Freshly released Java 1.6.0_41 for OSX fails with "IllegalAccessError: tried to access class JavaSimpleEnumeration_1 from class sun.proxy.$Proxy6", and rightfully so, because that class isn't public. I think I will avoid the usual "how could this even work before" in this commit message.
* | | Merge pull request #2125 from retronym/ticket/7120Paul Phillips2013-02-237-1/+53
|\ \ \ | | | | | | | | SI-7120 Erasure must honor typeref prefixes
| * | | SI-7120 Erasure must honor typeref prefixesJason Zaugg2013-02-147-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Erasure was discarding these, which led to unnecessarily wide types in quite particular circumstances. This showed up as a double definition error in the reported bug when the bridge method clashed with the erased signature.
* | | | Merge pull request #2162 from paulp/merge-210Paul Phillips2013-02-2318-286/+307
|\ \ \ \ | | | | | | | | | | Merge 2.10.x into master.
| * | | | Merge remote-tracking branch 'origin/2.10.x' into masterPaul Phillips2013-02-2318-286/+307
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/2.10.x: SI-7171 Consider prefix when assessing type finality. please ant with filenames, add comments Fixed error in reflection API docs about linearization order on method baseClasses Shadowed Implict typo (fixes no issue) remove unused imports Conflicts: src/reflect/scala/reflect/internal/Types.scala
| * | | | Merge pull request #2157 from retronym/ticket/7171James Iry2013-02-228-2/+69
| |\ \ \ \ | | | | | | | | | | | | SI-7171 Consider prefix when assessing type finality.
| | * | | | SI-7171 Consider prefix when assessing type finality.Jason Zaugg2013-02-228-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Type#isFinalType` determines if a type could have a non-bottom subtype. This property is exploited by the pattern matcher to flag impossible patterns. This check was ignoring the type's prefix, and incorrectly deemed that `T#A` in `trait T { final class A }` was a final type. But it could have been subtyped by `U#A` where `U` <:< `T`, or, more simply, by `T.this.A`. Now, type finality requires that the prefix is stable. The existing test cases in neg/patmat-type-check.scala still correctly flag incompatiblities. `isFinalType` is also used by some code that massages pattern matches post specialization. That is actually either broken or obsolete under virtpatmat, I've opened SI-7172 to invesigate that. It is also used by GenICode to determine whether to emit the appropriate equality checks that are correct in the face of boxing. It is possible that this change will force the slow path in some rare cases, but it won't affect correctness.
| * | | | | Merge pull request #2120 from adriaanm/patmat-refactorAdriaan Moors2013-02-229-3862/+3951
| |\ \ \ \ \ | | | | | | | | | | | | | | refactor the pattern matcher into smaller files
| | * | | | | please ant with filenames, add commentsAdriaan Moors2013-02-216-21/+37
| | | | | | |
| | * | | | | remove unused importsAdriaan Moors2013-02-157-263/+206
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-26 09:56:37 +0000