Update inherited lookup test to include eager members

Author: j-hui

test/Interop/Cxx/class/inheritance/Inputs/inherited-lookup.h

@@ -1,13 +1,18 @@
 #pragma once
 
-struct Base1 {
-  int methodBase(void) const { return 1; }
+struct One {
+  int method(void) const { return 1; }
+  int operator[](int i) const { return 1; }
 };
 
-struct IBase1 : Base1 {
-  int methodIBase(void) const { return 11; }
+struct IOne : One {
+  int methodI(void) const { return -1; }
 };
 
-struct IIBase1 : IBase1 {
-  int methodIIBase(void) const { return 111; }
+struct IIOne : IOne {
+  int methodII(void) const { return -11; }
+};
+
+struct IIIOne : IIOne {
+  int methodIII(void) const { return -111; }
 };

test/Interop/Cxx/class/inheritance/inherited-lookup-executable.swift

@@ -6,11 +6,46 @@ import StdlibUnittest
 
 var InheritedMemberTestSuite = TestSuite("Test if inherited lookup works")
 
-InheritedMemberTestSuite.test("IIBase1::method() resolves to grandparent") {
-  let iibase1 = IIBase1()
-  expectEqual(iibase1.methodBase(), 1)
-  expectEqual(iibase1.methodIBase(), 11)
-  expectEqual(iibase1.methodIIBase(), 111)
+InheritedMemberTestSuite.test("Regular methods resolve to base classes") {
+  // No inheritance (sanity check)
+  let one = One()
+  expectEqual(one.method(), 1)
+
+  // One level of inheritance
+  let iOne = IOne()
+  expectEqual(iOne.method(), 1)
+  expectEqual(iOne.methodI(), -1)
+
+  // Two levels of inheritance
+  let iiOne = IIOne()
+  expectEqual(iiOne.method(), 1)
+  expectEqual(iiOne.methodI(), -1)
+  expectEqual(iiOne.methodII(), -11)
+
+  // Three levels of inheritance
+  let iiiOne = IIIOne()
+  expectEqual(iiiOne.method(), 1)
+  expectEqual(iiiOne.methodI(), -1)
+  expectEqual(iiiOne.methodII(), -11)
+  expectEqual(iiiOne.methodIII(), -111)
+}
+
+InheritedMemberTestSuite.test("Eagerly imported methods resolve to base classes") {
+  // No inheritance (sanity check)
+  let one = One()
+  expectEqual(one[0], 1)
+
+  // One level of inheritance
+  let iOne = IOne()
+  expectEqual(iOne[0], 1)
+
+  // Two levels of inheritance
+  let iiOne = IIOne()
+  expectEqual(iiOne[0], 1)
+
+  // Three levels of inheritance
+  let iiiOne = IIIOne()
+  expectEqual(iiiOne[0], 1)
 }
 
 runAllTests()

test/Interop/Cxx/class/inheritance/inherited-lookup-typechecker.swift

@@ -1,24 +1,86 @@
 // RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=default
 import InheritedLookup
 
-extension IIBase1 {
+extension One {
+    // Swift extensions of a base class should not affect its derived classes.
+    // We later attempt to call baseExt() in derived classes, which should fail.
+    func baseExt() -> Int32 { return 0 }
+
+    func ext() {
+        let _ = baseExt()
+        let _ = self[0]
+        let _ = method()
+        let _ = methodI()   // expected-error {{cannot find 'methodI' in scope}}
+        let _ = methodII()  // expected-error {{cannot find 'methodII' in scope}}
+        let _ = methodIII() // expected-error {{cannot find 'methodIII' in scope}}
+    }
+}
+
+func fOne(v: One) {
+    let _ = v.baseExt()
+    let _ = v[0]
+    let _ = v.method()
+    let _ = v.methodI()     // expected-error {{'One' has no member 'methodI'}}
+    let _ = v.methodII()    // expected-error {{'One' has no member 'methodII'}}
+    let _ = v.methodIII()   // expected-error {{'One' has no member 'methodIII'}}
+}
+
+extension IOne {
+    func ext() {
+        let _ = baseExt()   // expected-error {{cannot find 'baseExt' in scope}}
+        let _ = self[0]
+        let _ = method()
+        let _ = methodI()
+        let _ = methodII()  // expected-error {{cannot find 'methodII' in scope}}
+        let _ = methodIII() // expected-error {{cannot find 'methodIII' in scope}}
+    }
+}
+
+func fIOne(v: IOne) {
+    let _ = v.baseExt()     // expected-error {{'IOne' has no member 'baseExt'}}
+    let _ = v[0]
+    let _ = v.method()
+    let _ = v.methodI()
+    let _ = v.methodII()    // expected-error {{'IOne' has no member 'methodII'}}
+    let _ = v.methodIII()   // expected-error {{'IOne' has no member 'methodIII'}}
+}
+
+extension IIOne {
+    func ext() {
+        let _ = baseExt()   // expected-error {{cannot find 'baseExt' in scope}}
+        let _ = self[0]
+        let _ = method()
+        let _ = methodI()
+        let _ = methodII()
+        let _ = methodIII() // expected-error {{cannot find 'methodIII' in scope}}
+    }
+}
+
+func fIIOne(v: IIOne) {
+    let _ = v.baseExt()     // expected-error {{'IIOne' has no member 'baseExt'}}
+    let _ = v[0]
+    let _ = v.method()
+    let _ = v.methodI()
+    let _ = v.methodII()
+    let _ = v.methodIII()   // expected-error {{'IIOne' has no member 'methodIII'}}
+}
+
+extension IIIOne {
     func ext() {
-        // NOTE: we deliberately look up a missing member above because doing so
-        // forces multiple ClangRecordMemberLookup requests, which should be
-        // idempotent (though this hasn't always been the case, because bugs).
-        missing() // expected-error {{cannot find 'missing' in scope}}
-
-        // For instance, a non-idempotent ClangRecordMemberLookup would cause
-        // the following to appear ambiguous:
-        methodBase()
-        methodIBase()
-        methodIIBase()
+        let _ = baseExt()   // expected-error {{cannot find 'baseExt' in scope}}
+        let _ = self[0]
+        let _ = method()
+        let _ = methodI()
+        let _ = methodII()
+        let _ = methodIII()
     }
 }
 
-func f(v: IIBase1) {
-    v.missing() // expected-error {{'IIBase1' has no member 'missing'}}
-    v.methodBase()
-    v.methodIBase()
-    v.methodIIBase()
+func fIIIOne(v: IIIOne) {
+    let _ = v.baseExt()     // expected-error {{'IIIOne' has no member 'baseExt'}}
+    let _ = v[0]
+    let _ = v.method()
+    let _ = v.methodI()
+    let _ = v.methodII()
+    let _ = v.methodIII()
 }