Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift-ci
2017-07-13 14:28:51 -07:00
9 changed files with 10 additions and 73 deletions

View File

@@ -1003,8 +1003,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
}
Opts.EnableASTScopeLookup |= Args.hasArg(OPT_enable_astscope_lookup);
Opts.EnableRecursiveConstraints |=
Args.hasArg(OPT_enable_recursive_constraints);
Opts.DebugConstraintSolver |= Args.hasArg(OPT_debug_constraints);
Opts.EnableConstraintPropagation |= Args.hasArg(OPT_propagate_constraints);
Opts.IterativeTypeChecker |= Args.hasArg(OPT_iterative_type_checker);