Fixes

Author: David Ungar

include/swift/Basic/LangOptions.h

@@ -249,7 +249,7 @@ namespace swift {
     /// Default is in \c ParseLangArgs
     ///
     /// This is a staging flag; eventually it will be removed.
-    bool EnableASTScopeLookup = true;
+    bool EnableASTScopeLookup = false;
 
     /// Someday, ASTScopeLookup will supplant lookup in the parser
     bool DisableParserLookup = false;

lib/Frontend/CompilerInvocation.cpp

@@ -327,7 +327,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.DisableParserLookup |= Args.hasArg(OPT_disable_parser_lookup);
   Opts.EnableASTScopeLookup =
       Args.hasFlag(options::OPT_enable_astscope_lookup,
-                   options::OPT_disable_astscope_lookup, EnableASTScopeLookup) ||
+                   options::OPT_disable_astscope_lookup, Opts.EnableASTScopeLookup) ||
       Opts.DisableParserLookup;
   Opts.CompareToASTScopeLookup |= Args.hasArg(OPT_compare_to_astscope_lookup);