aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/config
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2016-02-09 00:55:52 +0100
committerGuillaume Martres <smarter@ubuntu.com>2016-02-09 00:55:52 +0100
commit6e7bb3ac7a78354d29e791bc1cb01637791c038e (patch)
tree648e160506720350a787d119dfa6a4550868f478 /src/dotty/tools/dotc/config
parentcb5935ec641b5e36b1b2c7da7d25a5013dfab890 (diff)
parent7d3f6d02141bb362c4c1e383cb21a476383b5c60 (diff)
downloaddotty-6e7bb3ac7a78354d29e791bc1cb01637791c038e.tar.gz
dotty-6e7bb3ac7a78354d29e791bc1cb01637791c038e.tar.bz2
dotty-6e7bb3ac7a78354d29e791bc1cb01637791c038e.zip
Merge pull request #1058 from dotty-staging/fix-#864-v2
Prune constraints that could turn into cycles
Diffstat (limited to 'src/dotty/tools/dotc/config')
-rw-r--r--src/dotty/tools/dotc/config/Config.scala9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/config/Config.scala b/src/dotty/tools/dotc/config/Config.scala
index 212defbbf..3cc3091b5 100644
--- a/src/dotty/tools/dotc/config/Config.scala
+++ b/src/dotty/tools/dotc/config/Config.scala
@@ -15,11 +15,12 @@ object Config {
*/
final val checkConstraintsNonCyclic = false
- /** Like `checkConstraintsNonCyclic`, but all constrained parameters
- * are tested for direct or indirect dependencies, each time a
- * constraint is added in TypeComparer.
+ /** Make sure none of the bounds of a parameter in an OrderingConstraint
+ * contains this parameter at its toplevel (i.e. as an operand of a
+ * combination of &'s and |'s.). The check is performed each time a new bound
+ * is added to the constraint.
*/
- final val checkConstraintsNonCyclicTrans = false
+ final val checkConstraintsSeparated = false
/** Check that each constraint resulting from a subtype test
* is satisfiable.