Fix Issue 19064 - [REG2.081] Vibe.d's InterfaceProxy no longer works

dlang · Jul 5, 2018 · d3f65c7 · d3f65c7
1 parent 025693e
commit d3f65c7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/dmd/traits.d b/src/dmd/traits.d
@@ -1009,6 +1009,7 @@ extern (C++) Expression semanticTraits(TraitsExp e, Scope* sc)
                 ifd = sym.isInterfaceDeclaration();
             // If the symbol passed as a parameter is an
             // interface that inherits other interfaces
+            overloadApply(f, &dg);
             if (ifd && ifd.interfaces)
             {
                 // check the overloads of each inherited interface individually
@@ -1018,8 +1019,6 @@ extern (C++) Expression semanticTraits(TraitsExp e, Scope* sc)
                         overloadApply(fd, &dg);
                 }
             }
-            else
-                overloadApply(f, &dg);
 
             auto tup = new TupleExp(e.loc, exps);
             return tup.expressionSemantic(scx);

diff --git a/test/runnable/test17373.d → test/compilable/test17373.d b/test/runnable/test17373.d → test/compilable/test17373.d
@@ -1,3 +1,4 @@
+// https://issues.dlang.org/show_bug.cgi?id=17373
 interface Foo { void visit (int); }
 interface Bar { void visit(double); }
 interface FooBar : Foo, Bar {}
@@ -17,4 +18,15 @@ interface Simple
 }
 static assert(__traits(getOverloads, Simple, "square").length == 2);
 
-void main() {}
+// https://issues.dlang.org/show_bug.cgi?id=19064
+interface InputStream {}
+interface OutputStream{}
+interface Stream : InputStream, OutputStream{}
+interface ConnectionStream : Stream
+{
+    @property bool connected() const;
+    void close();
+}
+
+static assert(__traits(getOverloads, ConnectionStream, "connected").length == 1);
+static assert(__traits(getOverloads, ConnectionStream, "close").length == 1);