summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* do nothing when closing closed block in ignoremodeAdriaan Moors2012-03-233-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this came to light with the virtual pattern matcher, which emits jumps like `matchEnd3(_test(Test.this, false))`, where _test is a tailcall the nested jumping caused double-closing (the second time in ignore mode) thus. when closing a closed block in ignore mode, simply do nothing from genLoad for label-jumps: note: when one of the args to genLoadLabelArguments is a jump to a label, it will call back into genLoad and arrive at this case, which will then set ctx1.bb.ignore to true, this is okay, since we're jumping unconditionally, so the loads and jumps emitted by the outer call to genLoad (by calling genLoadLabelArguments and emitOnly) can safely be ignored, however, as emitOnly will close the block, which reverses its instructions (when it's still open), we better not reverse when the block has already been closed but is in ignore mode (if it's not in ignore mode, double-closing is an error) @dragos figured it out, all I did was write the comment and the `if` test case to repro basic blocks crasher the tailcall in the forward jump `matchEnd3(_test(Test.this, false))` in the following program crashes the back-end (error below) @scala.annotation.tailrec final def test(meh: Boolean): Boolean = { <synthetic> val _$this: Test.type = Test.this; _test(_$this,meh){ case <synthetic> val x1: Some[String] = new Some[String]("a"); case3(){ matchEnd2({ case <synthetic> val x1: Some[String] = x1; case4(){ if (x1.ne(null)) matchEnd3(if (meh) _test(Test.this, false) else false) else case5() }; case5(){ matchEnd3(_test(Test.this, false)) }; matchEnd3(x){ x } }) }; matchEnd2(x){ x } } }; The last instruction (of basic block 11) is not a control flow instruction: CONSTANT(false) // methods def test(meh: Boolean (BOOL)): Boolean { locals: value meh, value _$this, value x1, value x, value x, value x1 startBlock: 1 blocks: [1,2,3,4,5,6,7,8,9,10,11,12,13] 1: 4 JUMP 2 2: 5 NEW REF(class Some) 5 DUP(REF(class Some)) 5 CONSTANT("a") 5 CALL_METHOD scala.Some.<init> (static-instance) 5 STORE_LOCAL(value x1) 5 SCOPE_ENTER value x1 5 JUMP 3 3: 5 LOAD_LOCAL(value x1) 7 STORE_LOCAL(value x1) 7 SCOPE_ENTER value x1 7 JUMP 4 4: 7 LOAD_LOCAL(value x1) 7 CZJUMP (REF(class Object))NE ? 5 : 6 5: 8 LOAD_LOCAL(value meh) 8 CZJUMP (BOOL)NE ? 8 : 9 6: ? JUMP 11 7: 7 DROP BOOL 7 JUMP 11 8: 8 CONSTANT(false) 8 STORE_LOCAL(value meh) 8 JUMP 2 9: 8 CONSTANT(false) 8 JUMP 10 10: 8 STORE_LOCAL(value x) 8 JUMP 12 11: 9 JUMP 2 9 STORE_LOCAL(value meh) 9 CONSTANT(false) 12: 7 LOAD_LOCAL(value x) 7 SCOPE_EXIT value x1 7 STORE_LOCAL(value x) 7 JUMP 13 13: 5 LOAD_LOCAL(value x) 5 SCOPE_EXIT value x1 5 RETURN(BOOL)
* [vpm] avoid verifyerror: leave jump to tail-pos labelAdriaan Moors2012-03-234-2/+22
| | | | | the following commit deals with the fall-out in basicblocks (double closing of blocks in ignore mode)
* don't throw error in setError when -YdebugAdriaan Moors2012-03-231-4/+6
|
* [vpm] typeMatchAnonFun improvementsAdriaan Moors2012-03-235-114/+101
| | | | | | | | | | need to set up symbols with approximated info for the method and its owner before typing the method's body; when the body has been typed, we know what its result type will be, so update info of class and method to reflect that better detection of synthesized matches: annotate selector rather than relying on symbol info encapsulate CASE | SYNTHETIC flags (setting and querying)
* Merge pull request #318 from lrytz/revRevLukas Rytz2012-03-233-20/+8
|\ | | | | Undo the revert.
| * Undo the revert.Lukas Rytz2012-03-233-20/+8
|/ | | | | reverts 3db29dde051614d976bca92a1cdeb109c9c0ab01 and 5af2bf54d21ac63236cd6e68586b2c38fa0f28c3 restores 19a48510c2e18430a35319c04dfe3bad7119f23f
* Test case for cause of previous commit's reversion.Paul Phillips2012-03-222-0/+16
|
* Revert "Made changeOwner more robust; now also deals with return expressions."Paul Phillips2012-03-221-8/+4
| | | | This reverts commit 19a48510c2e18430a35319c04dfe3bad7119f23f.
*-------. Merge remote-tracking branches 'axel22/feature/pc-execution-contexts', ↵Paul Phillips2012-03-22193-4186/+5980
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 'VladUreche/issue/5593', 'dragos/master', 'VladUreche/issue/5599', 'adriaanm/ticket/treeannot' and 'heathermiller/issue/5291' into develop
| | | | | * Scaladoc: improved usecases, display full signature. Closes #5291Heather Miller2012-03-222-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the full signature of a use case member available, but still hidden under a drop-down menu.
| | | | | * Test case closes SI-4987.Paul Phillips2012-03-222-0/+6
| | | | | |
| | | | * | minimalist refactoring to allow annotating treesAdriaan Moors2012-03-225-10/+54
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | not tested for performance, but shouldn't add any memory overhead see https://github.com/adriaanm/scala/commit/44362c557f for an example usage
| | | * / Fixed SI-5599Vlad Ureche2012-03-221-26/+33
| | | |/ | | | | | | | | | | | | Eliminated the spurious warnings and made the code easier to follow.
| | * / Increased the timeout from 5s to 60s to make the presentation compiler ↵Iulian Dragos2012-03-221-1/+1
| | |/ | | | | | | | | | shutdown test more resilient on slow machines.
| | * Merge pull request #311 from lrytz/windowsScriptsJosh Suereth2012-03-221-2/+0
| | |\ | | | | | | | | disable version numbers on windows, they're broken.
| | | * disable version numbers on windows, they're broken.Lukas Rytz2012-03-221-2/+0
| | |/
| | * An illustrative delayedInit test.Paul Phillips2012-03-214-0/+242
| | |
| | * Merge branch 'issue/SI-5580' of /scala/trunk into developPaul Phillips2012-03-2119-1323/+1654
| | |\
| | | * Overhaul of JavaConver{sions,ters}.Paul Phillips2012-03-2115-1303/+1551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially motivated by SI-5580, then just motivated. I broke up the opaquely named JavaConversions and JavaConverters into the following traits encapsulating some permutation of { to java, to scala, bidirectional } { wrappers, decorators } I named everything consistently in terms of either Wrappers or Decorators. Decorators install those asJava/asScala methods onto collections of the right kind; Wrappers hide the process. JavaConversions then reduces to an object which (ill-advisedly) extends both WrapAsJava and WrapAsScala. And JavaConverters is an object extending DecorateAsScala and DecorateAsJava. However other more clearly named vals exist in the newly created scala.collection.convert package object. val decorateAsJava = new DecorateAsJava { } val decorateAsScala = new DecorateAsScala { } val decorateAll = new DecorateAsJava with DecorateAsScala { } val wrapAsJava = new WrapAsJava { } val wrapAsScala = new WrapAsScala { } val wrapAll = new WrapAsJava with WrapAsScala { } So for instance to import asScala decorators, and only those: scala> import scala.collection.convert.decorateAsScala._ import scala.collection.convert.decorateAsScala._ scala> new java.util.ArrayList[String].asScala groupBy (x => x) res0: scala.collection.immutable.Map[String,scala.collection.mutable.Buffer[String]] = Map() I propose we put those vals or a subset of them in the scala package object rather than way down in scala.collection.convert.
| | | * Fix for SI-5580.Paul Phillips2012-03-211-11/+37
| | | | | | | | | | | | | | | | | | | | Lub explosions mean we can't expect sane types in error messages. Defend against the insane.
| | | * Clarifying MethodSynthesis.Paul Phillips2012-03-213-9/+66
| | | | | | | | | | | | | | | | | | | | Tried to paint a picture of how one might synthesize an implicit method to accompany an implicit class.
| | * | Fixed test cases.Martin Odersky2012-03-213-28/+10
| | | |
| | * | Fixed SI-5063.Martin Odersky2012-03-213-6/+9
| | | |
| | * | Allows now private primary constructors in value classes.Martin Odersky2012-03-215-20/+77
| | |/
| * / Fixes SI-5593Vlad Ureche2012-03-224-4/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After hours of debugging and understanding all the root causes why scaladoc is rummaging through the current directory for classes, I decided to treat the symptoms rather than the cause. I'll document the decision here in case anyone is interested: - in order to find documentable entities, scaladoc exhaustively looks at all the symbols starting from the root package and going all the way to the leaves, visiting all classes in the classpath - if the classpath is empty, scaladoc and scalac add "." as the default classpath. This leads to scaladoc going on a class hunting spree in the current directory. If it happens that the current directory contains package objects and they're not in the expected path (like scala.tools.nsc in build/quick/classes/.../nsc) errors start to pop up - scalac is also affected by this, but to a more limited scope, since it will lazily expand packages whenever necessary. To show this, run the repl in the root directory of the scala source code, after compiling scala: scala> import build.quick.classes.compiler.scala.tools.nsc._ error: error while loading package, class file './build/quick/classes/ compiler/scala/tools/nsc/package.class' contains wrong package package The cleanest solution I can see now is to look at the tree resulting from compilation and use it for guidance -- I will look into this.
| * Overhauling mixin.Paul Phillips2012-03-211-146/+140
| | | | | | | | Feel the bugs falling away.
| * Restore irrefutability commits.Paul Phillips2012-03-2012-21/+169
| | | | | | | | This reverts commit d8ba5d091e5641553b438ef9930a6023a2709dcd.
| * Fix for stability failure.Paul Phillips2012-03-202-1/+38
| | | | | | | | | | | | | | Pattern matcher! Totally unrelated to irrefutability, the pattern matcher at some point stopped sorting its lookup switch cases, and the butterfly's wings flapped enough to swap two cases. Now they're sorted in ascending order like they're supposed to be.
| * Lots of tedious warning and tree printing work.Paul Phillips2012-03-2034-201/+286
| | | | | | | | | | | | | | | | | | | | | | Fewer deprecation warnings, prettier trees, prettier symbols, more polished error messages. Oh the interesting people you meet handling warnings, I feel sorry for you all that I get to do it all the time. One of the characters I met invited me into the "Dead Code Society" and that's what I'm doing on Tuesdays now. No of course you haven't, it's a SECRET society.
| * Tweak to string coloring.Paul Phillips2012-03-203-13/+22
| | | | | | | | Concluded String->String would be more useful more often.
| * Revert irrefutability commits.Paul Phillips2012-03-2012-169/+21
| | | | | | | | | | Temporary reversion of irrefutability commits in interests of stable milestone. Expect to restore shortly.
| *-. Merge remote-tracking branches 'vjovanov/duration-cleanup', ↵Paul Phillips2012-03-20101-1859/+2738
| |\ \ | | | | | | | | | | | | 'adriaanm/topic/virtpatmat' and 'vjovanov/actor-hierarchy' into develop
| | | * Prepared actors hierarchy for migration.Vojin Jovanovic2012-03-2014-646/+702
| | | | | | | | | | | | | | | | | | | | | | | | Internal nodes added so methods relevant to akka can be overridden. Review by: @phaller
| | * | [vpm] pack types of if branches before lubbingAdriaan Moors2012-03-201-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this way we don't end up with fresh, incompatible, skolems for every branch, but a neatly packed existential you get much nicer lubs this way -- threw in a fast path (I hope) that avoids lubbing when unnecessary (same types) since lub isn't robust enough to deal with the result of packedType, and we only really need the trivial case (S =:= T), special case it for now ... don't pack in ifs after typer, also only when virtPatmat
| | * | [vpm] fix half of my existential troublesAdriaan Moors2012-03-204-15/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | no need for the clunky repackExistential pack the type of each case instead, since the skolems we've created shouldn't last beyond the case anyway this way we don't end up with fresh, incompatible, skolems for every case, but a neatly packed existential
| | * | [vpm] typer synths Function{} for empty-sel matchAdriaan Moors2012-03-2011-249/+481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typedMatchAnonFun is called from typedFunction when the function's body is a match this is work-in-progres: the compiler currently won't bootstrap under -Yvirtpatmat see also the pending test make sure to use the right context in typeFunction when the body is a Match when typer is set up for type checking a Function, the current owner is the symbol for the function, but we'll type check a Block(List(ClassDef(cd)), New(cd)) when the function is a match, and the function symbol is nowhere to be found, so go to outer context in patmatvirt: - simplified default case gen (no need for a Casegen instance) - using CASE | SYNTHETIC to detect generated matches (for switches) and avoid typing them endlessly more uniform, and necessary for new-style anon Function class instance gen for matches
| | * | specialize symbols for labeldef paramsAdriaan Moors2012-03-201-2/+10
| | | |
| | * | [vpm] tailcalls support for jumpy vpmAdriaan Moors2012-03-202-12/+119
| | | |
| | * | [vpm] label-based translation of matchesAdriaan Moors2012-03-201-185/+173
| | | |
| | * | [vpm] TODO note: make unapply type list stricterAdriaan Moors2012-03-204-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when an unapply returns Option[T] where T is some ProductN, does that mean the unapply returns 1 result, i.e., that T, or did it mean to return N results? to disambiguate, falling back to stricter spec-adherence, which requires T be exactly TupleN for N results for now, allow extractor result to be any product, not just tuple
| | * | [vpm] test file for regression on old patmatAdriaan Moors2012-03-202-0/+9
| | |/ | | | | | | | | | it's a warning on new patmat -- TODO: dig deeper
| | *-. Merge remote-tracking branches 'hubertp/topic/buildinfo', ↵Paul Phillips2012-03-2023-266/+512
| | |\ \ | | | | | | | | | | | | | | | 'VladUreche/issue/5248' and 'VladUreche/issue/5054-usecase-cleanup2' into develop
| | | | * Merge branch 'issue/5054-usecase-cleanup'Vlad Ureche2012-03-2019-261/+489
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/scaladoc/scala/html/HtmlFactoryTest.scala
| | | | | * Adapted usecases to full signature displayVlad Ureche2012-03-2014-243/+359
| | | | | |
| | | | | * Adapted indentation in scaladoc code blocksVlad Ureche2012-03-205-19/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and fixed a pesky crash in the syntax highlighting caused by invalid chars (0x0E) in MarkupParser.scala.
| | | * | | Fixes SI-5248Vlad Ureche2012-03-204-5/+23
| | | | | |
| | * | | | optimise flag should be shown in scalac.args infoHubert Plociniczak2012-03-201-2/+2
| | | |/ / | | |/| |
| | * | | Merge pull request #294 from jsuereth/another-version-fixJosh Suereth2012-03-204-44/+4
| | |\ \ \ | | | |/ / | | |/| | Yet another attempt to make the version a good one
| | | * | Yet another attempt to make the version a good oneJosh Suereth2012-03-204-44/+4
| | |/ / | | | | | | | | | | | | | | | | This fixes the git commit drift issue and gives us enough granularity to make releases at any time that are cronologically increasing.
| | * | Test cases closes SI-4574.Paul Phillips2012-03-192-0/+15
| | | | | | | | | | | | | | | | Looks like I got that irrefutability bug too.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 21:17:27 +0000