summaryrefslogtreecommitdiff
path: root/src/compiler
Commit message (Collapse)AuthorAgeFilesLines
* Remove -Xcheck-null setting.Paul Phillips2013-03-135-47/+28
| | | | | | | | | | Maybe this was useful in some way; but no way I ever saw. I have comments which tell me this is exposed in the IDE so I left a stub. I also removed mkCheckInit. That probably sounds like it's related to -Xcheckinit. Guess again, guy-who-thinks-names-mean-things. It was only used by -Xcheck-null.
* Removed -Ynotnull setting.Paul Phillips2013-03-133-26/+16
| | | | | | | | | | It never worked and it would periodically jump out and bite someone. Slash and burn so new plants can take root. Eliminated NotNullType and NotNullClass, internal elements. Removed notNull method on Type, which no longer has a purpose. Retained 'def isNotNull' because there are types which are known by construction not to be null (ThisType, ConstantType as long as the constant isn't null, etc.) and that's still useful to know.
* Merge pull request #2215 from paulp/issue/7228Paul Phillips2013-03-133-33/+30
|\ | | | | SI-7228, bug in subtyping.
| * Fix it-never-happened performance regression.Paul Phillips2013-03-131-3/+4
| | | | | | | | | | | | | | | | | | | | | | Diligent reviewer observed that a hot spot was possibly being made hotter. Reviewer's suggested remedy was a spectacular bust, but studious observation revealed the news lash that expensive methods are expensive and we should avoid calling them if we can. Put short-circuit test back in front of unapply call. Now the time spent in unapply is within a few percent.
| * Moved some numeric subtyping logic closer to center.Paul Phillips2013-03-101-3/+6
| | | | | | | | | | Fixed bug in numeric widening related to continuations, which enabled simplifying isNumericSubType.
| * Simplified the widening logic.Paul Phillips2013-03-101-17/+13
| | | | | | | | | | | | | | | | | | | | Should speak for itself. Whenever someone changed @switch from an error to a warning, it broke all the tests which depended on the error. I added -Xfatal-warnings to a couple which needed it. And one of those tests was then failing, as it must now since we couldn't get away with what was being attempted, so I moved it to pending.
| * SI-7228, bug in weak subtyping.Paul Phillips2013-03-102-14/+11
| | | | | | | | | | | | | | | | | | Another in the category of bugs which involve narrowing, widening, mediuming, dealiasing, weakening, normalizing, denormalizing, supernormalizing, subnormalizing, and double-bounded supersubnormalizing. This is probably not the ideal fix, but it is an improvement.
* | Merge pull request #2242 from adriaanm/merge-2.10.xPaul Phillips2013-03-134-11/+20
|\ \ | | | | | | Merge 2.10.x into master
| * \ Merge 2.10.x into masterAdriaan Moors2013-03-123-10/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/reflect/reify/Errors.scala src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
| | * \ Merge pull request #2224 from retronym/ticket/7238Adriaan Moors2013-03-111-3/+3
| | |\ \ | | | | | | | | | | SI-7328 Bail out of names/defaults when args are error typed
| | | * | SI-7328 Bail out of names/defaults if args are error typedJason Zaugg2013-03-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | To avoid a crasher later on with a null type inside a sequence argument.
| | * | | Merge pull request #2225 from retronym/ticket/7234Adriaan Moors2013-03-111-7/+10
| | |\ \ \ | | | | | | | | | | | | SI-7234 Make named args play nice with dep. method types
| | | * | | SI-7234 Make named args play nice with dep. method typesJason Zaugg2013-03-091-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some care is needed to avoid interaction with constant types (e.g pos/z1730.scala) and with existentials (e.g. t3507-old.scala).
| | * | | | Merge pull request #2223 from scalamacros/ticket/7235Adriaan Moors2013-03-112-0/+6
| | |\ \ \ \ | | | |_|/ / | | |/| | | reifier is now aware of SI-7235
| | | * | | reifier is now aware of SI-7235Eugene Burmako2013-03-092-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-7235 is caused by a long-standing todo in typedRefinement, which leads to originals of compound type trees swallowing their stats. I'm not sure how exactly to fix SI-7235, but what I am sure about is that we shouldn't silently discard stats during reification. This patch introduces a new implementation restrictions, which now reports that reify of compound type trees with non-empty stats isn't going to work.
| * | | | | Merge 2.10.x into masterAdriaan Moors2013-03-121-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/typechecker/Typers.scala
| | * | | | Fix SI-7224.Iulian Dragos2013-03-071-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't focus positions assigned to the TypeTree of a parent of a Template when the parent exists in the source. A focused position (instance of `OffsetPosition`) makes it invisible to the presentation compiler when it looks for the innermost enclosing tree of a given position (breaking hyperlinking, for example).
* | | | | Merge pull request #2236 from retronym/ticket/6601-2Paul Phillips2013-03-122-1/+3
|\ \ \ \ \ | | | | | | | | | | | | SI-6601 Close access loophole for value class constructors
| * | | | | SI-6601 Close access loophole for value class constructorsJason Zaugg2013-03-112-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExtensionMethods marks private constructors of value classes as notPRIVATE before pickling. When the pickler reads the flags of this symbol, the anti-shift mechanism folds this into the regular PRIVATE flag, so the class is pickled as though it was public all along. A seprately compiled client can then call this constructor. To remedy this, we must: - pickle `rawFlags`, rather than `flags`. This is symmetric with unpickling, which sets `rawFlags` with the value it reads. - Add `notPRIVATE` to the flagset `PickledFlags`. We cannot make this change in a minor version, as the pickler and unpickler must agree on `PickledFlags`. I believe that this won't change the size of pickled flags for the majority of symbols (ie, those without the notPRIVATE flag) due to the variable length encoding in `writeLongNat`. This also improves the situation for SI-6608. Reflection and scalap (and, by extension, IntelliJ), no longer will see as public methods that have had their access widened in SuperAccessors (which is done selectively to support inlining under separate compilation.)
* | | | | Merge pull request #2240 from paulp/pr/warn-forward-referencePaul Phillips2013-03-121-0/+35
|\ \ \ \ \ | |_|/ / / |/| | | | Warn about locally identifiable init order issues.
| * | | | Warn about locally identifiable init order issues.Paul Phillips2013-03-121-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This warns about a subset of initialization order issues which can easily be identified by inspection, such as val x = y val y = 5 The likelihood of this formulation being intentional is miniscule.
* | | | | SI-874 actual JSR-223 implementationRaphael Jolly2013-03-115-4/+26
|/ / / /
* | | | Merge pull request #2229 from srinivasreddy/masterAdriaan Moors2013-03-111-1/+1
|\ \ \ \ | | | | | | | | | | A small typo corrected
| * | | | a typo correctedsrinivasreddy2013-03-101-1/+1
| | | | |
* | | | | Modularized the repl.Paul Phillips2013-03-1156-5930/+55
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following in the footsteps of scaladoc and interactive. The interpreter sources move into src/repl, and are given a separate build target. As with the others, at present they are still packaged into scala-compiler.jar. A summary of changes: - repl requires use of ReplGlobal (this was already implied) - macro code's repl-specific classloader hack pulled into overridable method and overridden in ReplGlobal - removed -Ygen-javap option to eliminate backend's dependency on javap - removed -Yrepl-debug option (can still be enabled with -Dscala.repl.debug) - pushed javap code into src/repl so javax.tools dependency can bee weakened to the repl only - removed some "show pickled" related code which hasn't worked right in a while and isn't the right way to do it anymore anyway. Will return to fix showPickled and provide it with some tests.
* | | | Deprecated custom ant task 'Same'.Paul Phillips2013-03-092-3/+1
| | | |
* | | | Eliminated all forInteractive/forScaladoc uses.Paul Phillips2013-03-094-66/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the commit which brings it all together. The booleans forInteractive and forScaladoc are now deprecated and are not inspected for any purpose. All behavioral changes formerly accomplished via tests of those flags are embodied in the globals built specifically for those tasks.
* | | | Moved scaladoc code into src/scaladoc.Paul Phillips2013-03-095-141/+77
| | | | | | | | | | | | | | | | | | | | | | | | This leverages the preceding several commits to push scaladoc specific code into src/scaladoc. It also renders some scanner code more comprehensible.
* | | | Moved interactive sources into separate directory.Paul Phillips2013-03-0924-3456/+0
| | | | | | | | | | | | | | | | | | | | As with the preceding commit, this has build-internal effects only.
* | | | Moved scaladoc sources into separate directory.Paul Phillips2013-03-09117-24244/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is not externally visible. It moves the scaladoc sources into src/scaladoc and adds an ant target for building them. The compilation products are still packaged into scala-compiler.jar as before, but with a small change to build.xml a separate jar can be created instead.
* | | | Enabling commit for interactive/scaladoc modules.Paul Phillips2013-03-0913-90/+96
|/ / / | | | | | | | | | | | | | | | This is a non-behaviorally-changing setup commit which re-routes bits of code through avenues which can more easily be influenced by subclasses of Global.
* | | Merge pull request #2216 from JamesIry/master_7231James Iry2013-03-081-1/+1
|\ \ \ | | | | | | | | SI-7231 Fix assertion when adapting Null type to Array type
| * | | SI-7231 Fix assertion when adapting Null type to Array typeJames Iry2013-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GenICode was doing a sanity check when adapting an expression of type Null to something else. It was just doing the wrong one. Instead of checking whether the result expression type was a reference type it was checking to see if it was an class reference type. This commit fixes that and adds a test to make sure both forms of adaptation work as expected.
* | | | Merge pull request #2185 from JamesIry/master_unreachableGrzegorz Kossakowski2013-03-084-39/+123
|\ \ \ \ | |/ / / |/| | | SI-7006 Prevent unreachable blocks in GenICode
| * | | SI-7006 Cleanup from code reviewJames Iry2013-03-071-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor cleanup from review of https://github.com/scala/scala/pull/2185 * Changed several instances of |= to ||= for better clarity (and bonus savings!) * Documented the return of two methods that compute the reachability of follow-on blocks.
| * | | SI-7006 Prevent unreachable blocks in GenICodeJames Iry2013-03-064-39/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes GenICode prevent the generation of most unreachable blocks. The new unreachable block prevention code can be disabled with a compiler flag. Because full unreachable analysis is no longer necessary for normal code it makes the unreachable block analysis run only under -optimise. A test is included to make sure unreachable code doesn't cause issues in code gen. A concrete example will help. def foo(): X = { try return something() catch { case e: Throwable => println(e) throw e } unreachableCode() ] Here unreachableCode() is unreachable but GenICode would create ICode for it and then ASM would turn it into a pile of NOPS. A previous commit added a reachability analysis step to eliminate that unreachable code but that added a bit of time to the compilation process even when optimization was turned off. This commit avoids generating most unreachable ICode in the first place so that full reachability analysis is only needed after doing other optimization work. The new code works by extending a mechanism that was already in place. When GenICode encountered a THROW or RETURN it would put the current block into "ignore" mode so that no further instructions would be written into the block. However, that ignore mode flag was itself ignored when it came to figuring out if follow on blocks should be written. So this commit goes through places like try/catch and if/else and uses the ignore mode of the current block to decide whether to create follow on blocks, or if it already has, to kill by putting them into ignore mode and closing them where they'll be removed from the method's list of active blocks. It's not quite as good as full reachability analysis. In particular because a label def can be emitted before anything that jumps to it, this simple logic is forced to leave label defs alone and that means some of them may be unreachable without being removed. However, in practice it gets close the the benefit of reachability analysis at very nearly no cost.
* | | | Merge pull request #2204 from adriaanm/merge-2.10.xPaul Phillips2013-03-0617-411/+459
|\ \ \ \ | |/ / / |/| | | Merge 2.10.x into master
| * | | Merge 2.10.x into master.Adriaan Moors2013-03-057-107/+117
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resurrect some undead code from 373ded2ad3 (tuple2Pickler). Conflicts: src/compiler/scala/tools/nsc/interactive/CompilerControl.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala
| | * | Merge pull request #2156 from vigdorchik/hierarchyAdriaan Moors2013-03-055-61/+65
| | |\ \ | | | | | | | | | | SI-7109 SI-7153 Generalize the API to get docComments: allow to force do...
| | | * | SI-7109 SI-7153 Generalize the API to get docComments: allow to force docTreesEugene Vigdorchik2013-02-245-61/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for given fragments. Don't type-check when forcing doc comments, but rather do it directly. Test the new functionality as well as better tests for the old one.
| * | | | Merge 2.10.x into master.Adriaan Moors2013-03-056-283/+305
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
| | * | | Merge pull request #2193 from adriaanm/patmat-refactorAdriaan Moors2013-03-059-303/+342
| | |\ \ \ | | | | | | | | | | | | merge 2.10.1 into 2.10.x
| | | * \ \ Merge 2.10.1 into 2.10.xAdriaan Moors2013-03-031-3/+10
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for SI-7183 in 440bf0a8c2 was forward ported in f73d50f46c. Conflicts: src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
| | | | * | | [nomaster] SI-7195 minor version mustn't introduce warningsAdriaan Moors2013-03-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want 2.10.1 to be a drop-in replacement for 2.10.0, so we can't start warning where we weren't warning in 2.10.0. See SI-5954 (#1882, #2079) for when it was an implementation restriction, which was then weakened to a warning. It's now hidden behind -Ydebug.
| | | | * | | Merge pull request #2168 from retronym/ticket/7183Adriaan Moors2013-03-011-14/+28
| | | | |\ \ \ | | | | | | | | | | | | | | | | SI-7183 Disable unreachability for withFilter matches.
| | | | | * | | SI-7183 Disable unreachability for withFilter matches.Jason Zaugg2013-02-251-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids spurious unreachable warnings on code that the user didn't write. The parser desugars for-comprehensions such as: for (A(a) <- List(new A)) yield a To: List(new A()).withFilter(((check$ifrefutable$2) => check$ifrefutable$2: @scala.unhecked match { case A((a @ _)) => true case _ => false }) ) But, if `A.unapply` returns `Some[_]`, the last case is dead code. (Matching against a regular case class *would* fall through in the caes of a null scrutinee.) In SI-6902, we enabled unreachability warnings, even if the scrutinee was annotated as @unchecked. That was consistent with the 2.9.2 behaviour, it was only disabled temporarily (actually, accidentally) in 2.10.0. But, the old pattern matcher didn't warn about this code. This commit makes the pattern matcher recognise the special scrutinee based on its name and disables both exhaustivity *and* unreachability analysis. To do so, the we generalize the boolean flag `unchecked` to the class `Suppression`.
| | | * | | | | [port] SI-7183 Disable unreachability for withFilter matches.Adriaan Moors2013-03-033-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a forward port of #2168 (originally for 2.10.1, but the pattern matcher has since been refactored in 2.10.x.)
| | | * | | | | better names for components of MatchTranslatorAdriaan Moors2013-03-033-34/+33
| | | | | | | |
| | | * | | | | move sat solving to separate fileAdriaan Moors2013-03-033-233/+243
| | | | | | | |
| * | | | | | | Merge 2.10.x into master.Adriaan Moors2013-03-051-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/transform/Erasure.scala
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-07 20:29:33 +0000