---

yaml
---
r: 278423
b: refs/heads/swift-5.1-old-llvm-branch
c: ee3c2ee
h: refs/heads/master
i:
  278421: 921efc3
  278419: 8e144b6
  278415: be75307

Author: davidungar

[refs]

@@ -1241,7 +1241,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-01-24-a: b6f62823aa5010b2ae53f15f72a57
 refs/heads/marcrasi-astverifier-disable: 3fac766a23a77ebd0640296bfd7fc116ea60a4e0
 refs/heads/revert-22227-a-tall-white-fountain-played: adfce60b2eaa54903ea189bed8a783bca609fa53
 refs/heads/revert-22300-revert-22227-a-tall-white-fountain-played: 5f92040224df7dd4e618fdfb367349df64d8acad
-refs/heads/swift-5.1-old-llvm-branch: 65ed915fc7c0117433181be6da5ec0b1c56fab40
+refs/heads/swift-5.1-old-llvm-branch: ee3c2eea8169f7fd967fa52ac56deaaeb9e955ee
 refs/heads/swift-5.1-branch: 8060872acb4105d9655e020fe047e1ebcd77d0fb
 refs/tags/swift-4.2.2-RELEASE: e429d1f1aaf59e69d38207a96e56265c7f6fccec
 refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-02-a: 3e5a03d32ff3b1e9af90d6c1198c14f938379a6e

branches/swift-5.1-old-llvm-branch/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)