From 6f15af41a7ea7aeb09b9c9b9c1d7ca3b505107c9 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Thu, 7 Oct 2021 15:07:24 +0200
Subject: [PATCH] fixes a regression caused by overloadable enums even though
 they're opt-in (#18970)

---
 compiler/semtempl.nim      | 10 +++++++---
 tests/enum/mregression.nim |  4 ++++
 tests/enum/tregression.nim | 13 +++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 tests/enum/mregression.nim
 create mode 100644 tests/enum/tregression.nim

diff --git a/compiler/semtempl.nim b/compiler/semtempl.nim
index c10917bcba..49ce55a64f 100644
--- a/compiler/semtempl.nim
+++ b/compiler/semtempl.nim
@@ -250,7 +250,7 @@ proc semTemplSymbol(c: PContext, n: PNode, s: PSym; isField: bool): PNode =
   of skUnknown:
     # Introduced in this pass! Leave it as an identifier.
     result = n
-  of OverloadableSyms:
+  of OverloadableSyms-{skEnumField}:
     result = symChoice(c, n, s, scOpen, isField)
   of skGenericParam:
     if isField and sfGenSym in s.flags: result = n
@@ -261,8 +261,12 @@ proc semTemplSymbol(c: PContext, n: PNode, s: PSym; isField: bool): PNode =
     if isField and sfGenSym in s.flags: result = n
     else: result = newSymNodeTypeDesc(s, c.idgen, n.info)
   else:
-    if isField and sfGenSym in s.flags: result = n
-    else: result = newSymNode(s, n.info)
+    if s.kind == skEnumField and overloadableEnums in c.features:
+      result = symChoice(c, n, s, scOpen, isField)
+    elif isField and sfGenSym in s.flags:
+      result = n
+    else:
+      result = newSymNode(s, n.info)
     # Issue #12832
     when defined(nimsuggest):
       suggestSym(c.graph, n.info, s, c.graph.usageSym, false)
diff --git a/tests/enum/mregression.nim b/tests/enum/mregression.nim
new file mode 100644
index 0000000000..9c3e3cf8bf
--- /dev/null
+++ b/tests/enum/mregression.nim
@@ -0,0 +1,4 @@
+
+type
+  OtherEnum* = enum
+    Success, Failed, More
diff --git a/tests/enum/tregression.nim b/tests/enum/tregression.nim
new file mode 100644
index 0000000000..597f0c80aa
--- /dev/null
+++ b/tests/enum/tregression.nim
@@ -0,0 +1,13 @@
+discard """
+  action: "compile"
+"""
+import options, mregression
+
+type
+  MyEnum = enum
+    Success
+
+template t =
+  echo some(Success)
+
+t()