---

yaml
---
r: 334845
b: refs/heads/rxwei-patch-1
c: 92faaae
h: refs/heads/master
i:
  334843: 1a9abee

Author: davidungar

[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: 2fd4e2d9de5278b07bf5c4fef204ffeeb8948200
+refs/heads/rxwei-patch-1: 92faaae093897d348cea9baa20a19e2915c15ec4
 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/lib/AST/NameLookup.cpp

@@ -1341,11 +1341,11 @@ namespace {
     using PerScopeLookupState = ExpUnqualifiedLookup::PerScopeLookupState;
 
     const DeclName Name;
-    DeclContext *const DC; // NOT CONST
+    DeclContext *const DC;
     ModuleDecl &M;
-    ASTContext &Ctx;
+    const ASTContext &Ctx;
     LazyResolver *const TypeResolver;
-    SourceLoc Loc;
+    const SourceLoc Loc;
     const SourceManager &SM;
     /// Used to find the file-local names.
     DebuggerClient *const DebugClient;
@@ -1356,6 +1356,8 @@ namespace {
     Optional<bool> isCascadingUse; // CLEAN ME UP
     SmallVectorImpl<LookupResultEntry> &Results;
     size_t &IndexOfFirstOuterResult;
+    
+    // For debugging:
     SourceFile const *&recordedSF;
     DeclName &recordedName;
     bool &recordedIsCascadingUse;