---

yaml
---
r: 340607
b: refs/heads/rxwei-patch-1
c: 6cfcabd
h: refs/heads/master
i:
  340605: 3127938
  340603: 74bd244
  340599: b6624d5
  340591: 6c16df8
  340575: 3656f00
  340543: 0495c87
  340479: 1f0e439

Author: David Ungar

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 2d0a8f2c6af48be92d58e83fe2268f07a15647ec
+refs/heads/rxwei-patch-1: 6cfcabd8e543c7ea30f6b13f1dee6519346d5d46
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/Basic/LangOptions.h

@@ -240,6 +240,9 @@ namespace swift {
 
     /// Should we use \c ASTScope-based resolution for unqualified name lookup?
     bool EnableASTScopeLookup = false;
+    
+    /// Someday, ASTScopeLookup will supplant lookup in the parser
+    bool DisableParserLookup = false;
 
     /// Sound we compare to ASTScope-based resolution for debugging?
     bool CompareToASTScopeLookup = false;

branches/rxwei-patch-1/include/swift/Option/Options.td

@@ -857,6 +857,9 @@ def enable_astscope_lookup : Flag<["-"], "enable-astscope-lookup">,
   Flags<[FrontendOption]>,
   HelpText<"Enable ASTScope-based unqualified name lookup">;
 
+def disable_parser_lookup : Flag<["-"], "disable_parser_lookup">,
+  HelpText<"Disable parser lookup & use ast scope lookup only (experimental)">;
+
 def index_file : Flag<["-"], "index-file">,
   HelpText<"Produce index data for a source file">, ModeOpt,
   Flags<[NoInteractiveOption, DoesNotAffectIncrementalBuild]>;

branches/rxwei-patch-1/include/swift/Parse/Parser.h

@@ -714,17 +714,15 @@ class Parser {
 
   /// Add the given Decl to the current scope.
   void addToScope(ValueDecl *D, bool diagnoseRedefinitions = true) {
-    // FIXME: ASTScope lookup is not yet ready for this.
-    //    if (Context.LangOpts.EnableASTScopeLookup)
-    //      return;
+    if (Context.LangOpts.DisableParserLookup)
+      return;
 
     getScopeInfo().addToScope(D, *this, diagnoseRedefinitions);
   }
 
   ValueDecl *lookupInScope(DeclName Name) {
-    // FIXME: ASTScope lookup is not yet ready for this.
-    //    if (Context.LangOpts.EnableASTScopeLookup)
-    //      return nullptr;
+    if (Context.LangOpts.DisableParserLookup)
+          return nullptr;
 
     return getScopeInfo().lookupValueName(Name);
   }

branches/rxwei-patch-1/lib/Driver/ToolChains.cpp

@@ -226,6 +226,7 @@ static void addCommonFrontendArgs(const ToolChain &TC, const OutputInfo &OI,
   inputArgs.AddLastArg(arguments, options::OPT_package_description_version);
   inputArgs.AddLastArg(arguments, options::OPT_serialize_diagnostics_path);
   inputArgs.AddLastArg(arguments, options::OPT_enable_astscope_lookup);
+  inputArgs.AddLastArg(arguments, options::OPT_disable_parser_lookup);
 
   // Pass on any build config options
   inputArgs.AddAllArgs(arguments, options::OPT_D);

branches/rxwei-patch-1/lib/Frontend/CompilerInvocation.cpp

@@ -316,7 +316,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
       = A->getOption().matches(OPT_enable_target_os_checking);
   }
 
-  Opts.EnableASTScopeLookup |= Args.hasArg(OPT_enable_astscope_lookup);
+  Opts.EnableASTScopeLookup |= Args.hasArg(OPT_enable_astscope_lookup) || Args.hasArg(OPT_disable_parser_lookup);
   Opts.CompareToASTScopeLookup |= Args.hasArg(OPT_compare_to_astscope_lookup);
   Opts.DebugConstraintSolver |= Args.hasArg(OPT_debug_constraints);
   Opts.NamedLazyMemberLoading &= !Args.hasArg(OPT_disable_named_lazy_member_loading);

branches/rxwei-patch-1/test/lit.cfg

@@ -401,6 +401,8 @@ if 'syntax_parser_lib' in config.available_features:
     config.substitutions.append( ('%swift-syntax-parser-test', config.swift_syntax_parser_test) )
 if '-enable-astscope-lookup' in config.swift_test_options:
     config.available_features.add("enable-astscope-lookup")
+if '-disable-parser-lookup' in config.swift_test_options:
+    config.available_features.add("disable-parser-lookup")
 config.substitutions.append( ('%swift-format', config.swift_format) )
 config.substitutions.append( ('%llvm-link', config.llvm_link) )
 config.substitutions.append( ('%swift-llvm-opt', config.swift_llvm_opt) )