---

yaml
---
r: 334839
b: refs/heads/rxwei-patch-1
c: ee3c2ee
h: refs/heads/master
i:
  334837: 3e4a5bf
  334835: 1e1d6de
  334831: 9e2abff

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: 65ed915fc7c0117433181be6da5ec0b1c56fab40
+refs/heads/rxwei-patch-1: ee3c2eea8169f7fd967fa52ac56deaaeb9e955ee
 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

@@ -1944,7 +1944,7 @@ namespace {
       populateLookupDeclsFromContext(ED, lookupDecls);
     return PerScopeLookupState{
       ScopeLookupResult::next,
-                               DC,
+                               ED,
                                std::move(lookupDecls),
                                ED,
                                ED,
@@ -1961,10 +1961,10 @@ namespace {
       populateLookupDeclsFromContext(ND, lookupDecls);
     return PerScopeLookupState{
       ScopeLookupResult::next,
-                               DC,
+                               ND,
                                std::move(lookupDecls),
-                               DC,
-                               DC,
+                               ND,
+                               ND,
                                isCascadingUse.hasValue()
                                    ? isCascadingUse.getValue()
       : ND->isCascadingContextForLookup(false)