From 46cb304770b3dd03756fdafe9743c6ff547ffca0 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Sat, 13 Jul 2019 07:55:56 +0200
Subject: [PATCH] fixes #11715 (#11721)

(cherry picked from commit de1ede77fe91170269d5bf54a01e61ff95f6dc56)
---
 compiler/sigmatch.nim        | 2 +-
 tests/distinct/tdistinct.nim | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
index 39dcfedcfe..003bca646e 100644
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@@ -1293,7 +1293,7 @@ proc typeRel(c: var TCandidate, f, aOrig: PType,
           inc(c.inheritancePenalty, depth)
           result = isSubtype
   of tyDistinct:
-    skipOwned(a)
+    a = a.skipTypes({tyOwned, tyGenericInst, tyRange})
     if a.kind == tyDistinct:
       if sameDistinctTypes(f, a): result = isEqual
       #elif f.base.kind == tyAnything: result = isGeneric  # issue 4435
diff --git a/tests/distinct/tdistinct.nim b/tests/distinct/tdistinct.nim
index c6bfb2490e..2c01967452 100644
--- a/tests/distinct/tdistinct.nim
+++ b/tests/distinct/tdistinct.nim
@@ -6,6 +6,7 @@ false
 false
 false
 false
+Foo
 '''
 """
 
@@ -98,3 +99,10 @@ proc `<=`(a, b: Id): bool {.borrow.}
 var xs: array[Id, bool]
 
 for x in xs: echo x # type mismatch: got (T) but expected 'bool'
+
+# bug #11715
+
+type FooD = distinct int
+proc `<=`(a, b: FooD): bool {.borrow.}
+
+for f in [FooD(0): "Foo"]: echo f