From fd1d008cce1ded7e0147309ff4e0fff3c5388896 Mon Sep 17 00:00:00 2001 From: metagn Date: Sat, 14 Sep 2024 05:20:30 +0300 Subject: [PATCH] fix regression with uint constant losing abstract type (#24105) fixes #24104, refs #23955 The line `result.typ = dstTyp` added in #23955 changes the type of `result`, which was the type of `n` due to the argument passed to `newIntNodeT`, to the abstract type skipped `dstTyp`. The line is removed to just keep the type as abstract. (cherry picked from commit 6d362e0ffe78791036af05e4224daebaf7cb3f81) --- compiler/semfold.nim | 1 - tests/int/t1.nim | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/semfold.nim b/compiler/semfold.nim index 3425aaaf6a5b..b892ce178b72 100644 --- a/compiler/semfold.nim +++ b/compiler/semfold.nim @@ -412,7 +412,6 @@ proc foldConv(n, a: PNode; idgen: IdGenerator; g: ModuleGraph; check = false): P if dstTyp.kind in {tyUInt..tyUInt64}: result = newIntNodeT(maskBytes(val, getSize(g.config, dstTyp)), n, idgen, g) result.transitionIntKind(nkUIntLit) - result.typ = dstTyp else: if check: rangeCheck(n, val, g) result = newIntNodeT(val, n, idgen, g) diff --git a/tests/int/t1.nim b/tests/int/t1.nim index a88a3f34cadc..28ffa76735b6 100644 --- a/tests/int/t1.nim +++ b/tests/int/t1.nim @@ -42,3 +42,10 @@ block: # bug #23954 doAssert testRT_u8 == 7 const testCT_u8 : uint8 = 0x107.uint8 doAssert testCT_u8 == 7 + +block: # issue #24104 + type P = distinct uint # uint, uint8, uint16, uint32, uint64 + let v = 0.P + case v + of 0.P: discard + else: discard