From 8850644cb750c3134f3ae2d54a5d76262888de11 Mon Sep 17 00:00:00 2001 From: Clay Sweetser Date: Sun, 11 Sep 2022 16:56:11 -0400 Subject: [PATCH] Revert "fixes #20155; repr range with distinct types is broken with ORC" (#20334) Revert "fixes #20155; repr range with distinct types is broken with ORC (#20158)" This reverts commit 37b3f62eef16b0e7cb89e18f9ddc1fb96e17fb1b. --- compiler/semmagic.nim | 3 --- lib/system/repr_v2.nim | 7 +------ tests/metatype/tmetatype_various.nim | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/compiler/semmagic.nim b/compiler/semmagic.nim index a6832de50..d3e12670b 100644 --- a/compiler/semmagic.nim +++ b/compiler/semmagic.nim @@ -190,9 +190,6 @@ proc evalTypeTrait(c: PContext; traitCall: PNode, operand: PType, context: PSym) arg = arg.base.skipTypes(skippedTypes + {tyGenericInst}) if not rec: break result = getTypeDescNode(c, arg, operand.owner, traitCall.info) - of "skipRanges": - var arg = operand.skipTypes({tyRange}) - result = getTypeDescNode(c, arg, operand.owner, traitCall.info) else: localError(c.config, traitCall.info, "unknown trait: " & s) result = newNodeI(nkEmpty, traitCall.info) diff --git a/lib/system/repr_v2.nim b/lib/system/repr_v2.nim index d87e07b7e..0e9bec0f3 100644 --- a/lib/system/repr_v2.nim +++ b/lib/system/repr_v2.nim @@ -9,8 +9,6 @@ proc isNamedTuple(T: typedesc): bool {.magic: "TypeTrait".} proc distinctBase(T: typedesc, recursive: static bool = true): typedesc {.magic: "TypeTrait".} ## imported from typetraits -proc skipRanges(T: typedesc): typedesc {.magic: "TypeTrait".} - proc repr*(x: NimNode): string {.magic: "Repr", noSideEffect.} proc repr*(x: int): string = @@ -98,10 +96,7 @@ proc repr*(p: proc): string = repr(cast[ptr pointer](unsafeAddr p)[]) template repr*(x: distinct): string = - when x is range: # hacks for ranges with distinct sub types - repr(distinctBase(skipRanges(typeof(x)))(x)) - else: - repr(distinctBase(typeof(x))(x)) + repr(distinctBase(typeof(x))(x)) template repr*(t: typedesc): string = $t diff --git a/tests/metatype/tmetatype_various.nim b/tests/metatype/tmetatype_various.nim index 30169aa1e..9faeeec4a 100644 --- a/tests/metatype/tmetatype_various.nim +++ b/tests/metatype/tmetatype_various.nim @@ -1,5 +1,4 @@ discard """ - matrix: "--mm:refc; --mm:orc" output: '''[1, 0, 0, 0, 0, 0, 0, 0] CTBool[Ct[system.uint32]]''' """