Fix Issue 17441 - Template instantiation reused when arguments are mo… (

dlang#10724)

Fix Issue 17441 - Template instantiation reused when arguments are mo…
merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

src/dmd/dmodule.d

@@ -38,6 +38,7 @@ import dmd.root.filename;
 import dmd.root.outbuffer;
 import dmd.root.port;
 import dmd.root.rmem;
+import dmd.root.rootobject;
 import dmd.semantic2;
 import dmd.semantic3;
 import dmd.utils;
@@ -231,6 +232,15 @@ extern (C++) class Package : ScopeDsymbol
         return "package";
     }
 
+    override bool equals(const RootObject o) const
+    {
+        // custom 'equals' for bug 17441. "package a" and "module a" are not equal
+        if (this == o)
+            return true;
+        auto p = cast(Package)o;
+        return p && isModule() == p.isModule() && ident.equals(p.ident);
+    }
+
     /****************************************************
      * Input:
      *      packages[]      the pkg1.pkg2 of pkg1.pkg2.mod

src/dmd/module.h

@@ -37,6 +37,8 @@ class Package : public ScopeDsymbol
 
     const char *kind() const;
 
+    bool equals(const RootObject *o) const;
+
     Package *isPackage() { return this; }
 
     bool isAncestorPackageOf(const Package * const pkg) const;

test/compilable/imports/test17441foo/bar.d

@@ -0,0 +1 @@
+module imports.test17441foo.bar;

test/compilable/imports/test17441foo/package.d

@@ -0,0 +1 @@
+module imports.test17441foo;

test/compilable/test17441.d

@@ -0,0 +1,8 @@
+import m1 = imports.test17441foo.bar;
+import m2 = imports.test17441foo;
+alias p = __traits(parent, m1);
+enum e(alias thing) = thing.stringof;
+
+static assert(e!m1 == m1.stringof);
+static assert(e!m2 == m2.stringof);
+static assert( e!p == p.stringof );