summaryrefslogtreecommitdiff
path: root/src/compiler
Commit message (Collapse)AuthorAgeFilesLines
* Fix SI-7107: scala now thinks every exception is polymorphicGrzegorz Kossakowski2013-02-251-0/+3
| | | | | | | | | | | | | | | We need to force info of the `cls` in `parseExceptions` because we pass `cls` to `addThrowsAnnotation` which in turn calls `Symbol.isMonomorphicType` that relies on a symbol being initialized to give right answers. In the future we should just clean up implementation of `isMonomorphicType` method to not rely on a symbol being initialized as there's no inherent reason for that in most cases. In cases where there's reason for that we should just force the initialization. This patch does not come with a test-case because it's hard to reproduce not initialized symbols in partest reliably.
* 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
| |
| * [refactor] move some logic-related codeAdriaan Moors2013-02-123-352/+358
| |
| * [refactor] better name for symbolicCaseAdriaan Moors2013-02-121-16/+6
| |
| * [refactor] make hash-consing more robustAdriaan Moors2013-02-122-21/+23
| |
| * drop Cond in favor of PropAdriaan Moors2013-02-123-129/+93
| | | | | | | | | | | | | | | | | | | | This brings the optimizations and the analyses closer together. In the future we may consider using a solver in the optimizations. For now, implication is checked ad-hoc using hash-consing and equality/subset tests... NOTE: prepareNewAnalysis resets said hash-consing, so must be called before approximating a match to propositions
| * [refactor] prepare migration from Cond to PropAdriaan Moors2013-02-121-52/+52
| | | | | | | | | | There's no change in behavior. Remove `modelNull` boolean in favor of subclassing.
| * [refactor] type analysis consolidationAdriaan Moors2013-02-122-21/+19
| | | | | | | | move instanceOfTpImplies out of CodeGen into TypeAnalysis
| * [refactor] move PatternMatching.scala to transform.patmatAdriaan Moors2013-02-129-3806/+4032
| |
| * re-align 2.10.x's pattern matcher with master'sAdriaan Moors2013-02-121-93/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The diff was mostly code cleanup, so most of that was propagated from master to 2.10.x. The remaining diff is encapsulated in compatibility stubs (see below). (There was also the on/off potential for the 2.10.x "new" pattern matcher. The old one is gone in 2.11, so no turning off new patmat, of course.) The stubs: ``` protected final def dealiasWiden(tp: Type) = tp.dealias // 2.11: dealiasWiden protected final def mkTRUE = CODE.TRUE_typed // 2.11: CODE.TRUE protected final def mkFALSE = CODE.FALSE_typed // 2.11: CODE.FALSE protected final def hasStableSymbol(p: Tree) = p.hasSymbol && p.symbol.isStable // 2.11: p.hasSymbolField && p.symbol.isStable protected final def devWarning(str: String) = global.debugwarn(str) // 2.11: omit ```
* | Merge pull request #2133 from som-snytt/typos-2.10.xPaul Phillips2013-02-221-1/+1
|\ \ | | | | | | Shadowed Implict typo (fixes no issue)
| * | Shadowed Implict typo (fixes no issue)Som Snytt2013-02-161-1/+1
| | |
* | | Merge pull request #2118 from lrytz/annotatedRetypingJames Iry2013-02-191-9/+5
|\ \ \ | | | | | | | | Fix typing idempotency bug with Annotated trees
| * | | Fix typing idempotency bug with Annotated treesLukas Rytz2013-02-121-9/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typedAnnotated transforms an Annotated tree into a Typed tree. The original field of the result is set to the Annotated tree. The bug was that typedAnnotated was using the untyped Annotated tree as original, but also set its type. When re-typing later on the same Annotated tree, the typer would consider it as alreadyTyped. This is incorrect, the typer needs to convert Annotated trees to Typed. Also, the Annotated tree only had its type field set, but its children were still untyped. This crashed the compiler lateron, non-typed trees would get out of the typing phase.
* | | Merge pull request #2136 from vigdorchik/scannersJames Iry2013-02-191-21/+13
|\ \ \ | | | | | | | | SI-7143 Fix scanner docComment production.
| * | | SI-7143 Fix scanner docComment: docBuffer and docPos are initializedEugene Vigdorchik2013-02-191-21/+13
| | |/ | |/| | | | | | | | | | in different places and as a result can get out of sync and as a result the invariant that docComment has a position is broken.
* | | Merge pull request #2130 from vigdorchik/relax_docJames Iry2013-02-194-31/+34
|\ \ \ | | | | | | | | SI-7134: don't require doc.Settings in base api of scaladoc.
| * | | SI-7134: don't require doc.Settings in base api of scaladoc.Eugene Vigdorchik2013-02-154-31/+34
| |/ /
* / / SI-5744 evidence params are now SYNTHETICUladzimir Abramchuk2013-02-163-10/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro def <-> macro impl correspondence check compares names of the corresponding parameters in def and impl and reports an error if they don't match. This was originally designed to avoid confusion w.r.t named arguments (which ended up being never implemented as described in SI-5920). Sometimes parameter names are generated by the compiler, which puts the user in a tough position. Luckily, there's an escape hatch built it, which omits the name correspondence check if one of the parameters is SYNTHETIC. Everything went well until we realized that evidences generated by context bounds aren't SYNTHETIC, which led to the bug at hand. Marking auto-generated evidence parameters SYNTHETIC was only the first step, as the correspondence checker uses parameter symbols, not parameter trees. Why's that a problem? Because SYNTHETIC doesn't get propagated from def trees to their underlying symbols (see ValueParameterFlags). Unfortunately one cannot just change ValueParameterFlags, because that would break printouts generated in TypeDiagnostics, which is designed to not print synthetic symbols. Thus we modify methodTypeErrorString in TypeDiagnostics to always print synthetic symbols. Therefore now we propagate all paramSym.flags when doing correspondent sweeps to keep them in sync between def trees and their underlying symbols. This fixes the problem.
* | Merge pull request #2115 from retronym/ticket/7091Adriaan Moors2013-02-121-1/+5
|\ \ | |/ |/| SI-7091 Don't try to put a protected accessor in a package.
| * SI-7091 Don't try to put a protected accessor in a package.Jason Zaugg2013-02-111-0/+1
| | | | | | | | | | | | | | This shows up when a protected[pack] class has a constructor with a default argument. Regressed in f708b87 / SI-2296.
| * SI-7091 Add a diagnostic for the "no acc def buf" error.Jason Zaugg2013-02-101-1/+4
| |
* | Merge pull request #2113 from scalamacros/topic/silencePaul Phillips2013-02-111-1/+1
|\ \ | | | | | | silences t6323a
| * | silences t6323aEugene Burmako2013-02-111-1/+1
| | | | | | | | | | | | | | | | | | Tag materialization notices enabled with -Xlog-implicits are now echoes not printlns. Therefore, they go into stderr, not stdout, getting logged by partest and not spamming stdout of partest.
* | | Merge pull request #2111 from retronym/2.10.xJames Iry2013-02-112-8/+15
|\ \ \ | | | | | | | | SI-6514 Avoid spurious dead code warnings
| * | | SI-6514 Avoid spurious dead code warningsJason Zaugg2013-02-102-8/+15
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `deadCode.expr` stores the method symbol most recently encountered in `handleMonomorphicCall`, and uses this to avoid warnings for arguments to label jumps and `Object#synchronized` (which sneakily acts by-name without advertising the fact in its type.) But this scheme was insufficient if the argument itself contains another method call, such as `matchEnd(throw e(""))`. This commit changes the single slot to a stack, and also grants exemption to `LabelDef` trees. They were incorrectly flagged in the enclosed test case after I made the the first change.
* | | Merge pull request #2102 from retronym/topic/tree-checker-leniancyJames Iry2013-02-111-0/+3
|\ \ \ | | | | | | | | Tolerate symbol sharing between accessor/field.
| * | | Tolerate symbol sharing between accessor/field.Jason Zaugg2013-02-091-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently, TreeCheckers (-Ycheck) was extended to report on references to symbols that were not in scope, which is often a sign that some substitution or ownership changes have been omitted. But, accessor methods directly use the type of the underlying field, without cloning symbols defined in that type, such as quantified types in existentials, at the new owner. My attempt to change this broke pos/existentials.scala. Instead, I'll just look the other way in TreeCheckers.
* | | Merge pull request #2098 from retronym/ticket/6225James Iry2013-02-111-1/+8
|\ \ \ | |_|/ |/| | SI-6225 Fix import of inherited package object implicits
| * | SI-6225 Fix import of inherited package object implicitsJason Zaugg2013-02-091-1/+8
| | | | | | | | | | | | | | | The prefix in the ImplicitInfo must be com.acme.`package`.type, rather than com.acme.
* | | Merge pull request #2100 from paulp/pr/fix-super-varargs-savedJames Iry2013-02-091-1/+1
|\ \ \ | |_|/ |/| | Fixing binary compat for $super regression
| * | Fix for paramaccessor alias regression.Paul Phillips2013-02-081-1/+1
| |/ | | | | | | | | A binary incompatibility with 2.10.0 revealed a bug I had introduced in c58647f5f2.
* | Merge pull request #2094 from scalamacros/ticket/6591James Iry2013-02-084-20/+57
|\ \ | |/ |/| SI-6591 Reify and path-dependent types
| * accommodates pull request feedbackEugene Burmako2013-02-082-8/+32
| | | | | | | | https://github.com/scala/scala/pull/2072
| * term and type reftrees are now reified uniformlyEugene Burmako2013-02-081-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Top-level (i.e. owned by a package) => Ident(symbol) Nested (i.e. owned by an object or a package object) => Select(owner, symbol) Inner (i.e. owned by a static class) => selectTerm/selectType(owner, name) Non-locatable (i.e. everything else) => see GenTrees.scala for more details Changes w.r.t the previous approaches: * Top-level refs are no longer reified as Select(This(package), symbol). Proposed reification scheme is as resistant to resetAttrs as previous one, but is at the same time much shorter. * Refs to definitions from package objects are no longer Ident(symbol). Otherwise reflective compilation of things like `_ :: _` fails. * Contents of Predef._ and scala._ are no longer treated specially. This increases the size of reificode, but is more hygienic.
| * SI-6591 Reify and path-dependent typesDmitry Bushev2013-02-084-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reification scheme changed. Now Select an SelectFromTypeTree trees reified appropriately, as Select and SelectFromTypeTree accordingly. Packages and Predef object was excluded in order not to break the existing reification scheme and not to break tests which rely on it. Reified free terms can contain flag <stable> to make reified values become stable identifiers. For example in the case of reify_newimpl_15.scala class C { type T reify { val v: List[T] = List(2) } } class C reified as free term C$value, and List[C.T] becomes List[C$value().T], so C$value.apply() need to pass stability test isExprSafeToInline at scala.reflect.internal.TreeInfo. For this purpose special case for reified free terms was added to isExprSafeToInline function. test run/reify_newipl_30 disabled due to SI-7082 test t6591_4 moved to pending due to SI-7083
* | Merge pull request #2095 from hubertp/ticket/5675James Iry2013-02-081-3/+3
|\ \ | | | | | | SI-5675 Discard duplicate feature warnings at a position
| * | SI-5675 Discard duplicate feature warnings at a positionJason Zaugg2013-02-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When -feature has not been enabled, we were double counting identical feature warnings that were emitted at the same position. Normal error reporting only reports the first time a warning appears at a position; feature warning counter incrementing should behave the same way. @hubertp: Fixed .check files that were broken in the original commit.
* | | Merge pull request #2017 from retronym/ticket/6666James Iry2013-02-083-36/+62
|\ \ \ | |_|/ |/| | Booking more progress on SI-6666
| * | Class symbols can't be contravariant.Jason Zaugg2013-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During development of the fix for SI-6666, I encountered: % test/files/pos/t4842.scala test/files/pos/t4842.scala:10: error: contravariant class Bar occurs in covariant position in type ()this.Bar of constructor Bar this(new { class Bar { println(Bar.this); new { println(Bar.this) } }; new Bar } ) // okay I had incorrectly set the INCONSTRUCTOR flag on the class symbol `Bar`. (It isn't directly in the self constructor call, as it is nested an intervening anonymous class.) But, this flag shares a slot with CONTRAVARIANT, and the variance validation intepreted it as such. ClassSymbol already has this code to resolve the ambiguous flags for display purposes: override def resolveOverloadedFlag(flag: Long) = flag match { case INCONSTRUCTOR => "<inconstructor>" // INCONSTRUCTOR / CONTRAVARIANT / LABEL case EXISTENTIAL => "<existential>" // EXISTENTIAL / MIXEDIN case IMPLCLASS => "<implclass>" // IMPLCLASS / PRESUPER case _ => super.resolveOverloadedFlag(flag) } This commit overrides `isContravariant` to reflect the same logic.
| * | SI-6666 Catch VerifyErrors in the making in early defs.Jason Zaugg2013-02-021-5/+5
| | | | | | | | | | | | | | | | | | As we did for self/super calls, add a backstop into explicitouter and lambdalift to check when we try to get an outer pointer to an under-construction instance.
| * | Broader checks for poisonous this references.Jason Zaugg2013-02-022-33/+56
| | | | | | | | | | | | Replaces more VerifyErrors with implementation restrictions.
| * | SI-6666 Account for nesting in setting INCONSTRUCTORJason Zaugg2013-02-021-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag is calcualed in Namers, and assigned to class and module class symbols that are defined in self/super-calls, and in early definitions. For example, class D is INCONSTRUCTOR in each case below: class C extends Super({class D; ()}) class C(a: Any) { def this(a: Any) = this({class D; ()}) } new { val x = { class D; () } with Super(()) But, the calculation of this flag failed to account for nesting, so it was not set in cases like: class C(a: Any) { def this(a: Any) = this({val x = {class D; ()}; x}) } This patch searches the enclosing context chain, rather than just the immediate context. The search is terminated at the first non term-owned context. In the following example, this avoids marking `E` as INCONSTRUCTOR; only `D` should be. class C extends Super({class D { class E }; ()}) This closes SI-6259 and SI-6506, and fixes one problem in the recently reopened SI-6957.
* | | Merge pull request #2035 from scalamacros/ticket/6989Eugene Burmako2013-02-081-17/+4
|\ \ \ | | | | | | | | SI-6989 privateWithin is now populated in reflect
| * | | SI-6989 privateWithin is now populated in reflectEugene Burmako2013-02-041-17/+4
| | | | | | | | | | | | | | | | | | | | Runtime reflection in JavaMirrors previously forgot to fill in privateWithin when importing Java reflection artifacts. Now this is fixed.
* | | | Merge pull request #2085 from scalamacros/ticket/5824Eugene Burmako2013-02-082-5/+9
|\ \ \ \ | | | | | | | | | | SI-5824 Fix crashes in reify with _*
| * | | | SI-5824 Fix crashes in reify with _*Evgeny Kotelnikov2013-02-072-5/+9
| | | | | | | | | | | | | | | | | | | | Reification crashes if "foo: _*" construct is used. This happens besause type tree is represented either with TypeTree, or with Ident (present case), and `toPreTyperTypedOrAnnotated' only matches of the former. The fix is to cover the latter too. A test is included.
* | | | | Merge pull request #2090 from adriaanm/rebase-pr-2011James Iry2013-02-072-24/+84
|\ \ \ \ \ | | | | | | | | | | | | SI-6187 Make partial functions re-typable
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-12 18:25:28 +0000