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 37b3f62eef.
This commit is contained in:
Clay Sweetser 2022-09-11 16:56:11 -04:00 • committed by GitHub
commit 8850644cb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 10 deletions

View file

@ -190,9 +190,6 @@ proc evalTypeTrait(c: PContext; traitCall: PNode, operand: PType, context: PSym)
arg = arg.base.skipTypes(skippedTypes + {tyGenericInst}) arg = arg.base.skipTypes(skippedTypes + {tyGenericInst})
if not rec: break if not rec: break
result = getTypeDescNode(c, arg, operand.owner, traitCall.info) result = getTypeDescNode(c, arg, operand.owner, traitCall.info)
of "skipRanges":
var arg = operand.skipTypes({tyRange})
result = getTypeDescNode(c, arg, operand.owner, traitCall.info)
else: else:
localError(c.config, traitCall.info, "unknown trait: " & s) localError(c.config, traitCall.info, "unknown trait: " & s)
result = newNodeI(nkEmpty, traitCall.info) result = newNodeI(nkEmpty, traitCall.info)

View file

@ -9,8 +9,6 @@ proc isNamedTuple(T: typedesc): bool {.magic: "TypeTrait".}
proc distinctBase(T: typedesc, recursive: static bool = true): typedesc {.magic: "TypeTrait".} proc distinctBase(T: typedesc, recursive: static bool = true): typedesc {.magic: "TypeTrait".}
## imported from typetraits ## imported from typetraits
proc skipRanges(T: typedesc): typedesc {.magic: "TypeTrait".}
proc repr*(x: NimNode): string {.magic: "Repr", noSideEffect.} proc repr*(x: NimNode): string {.magic: "Repr", noSideEffect.}
proc repr*(x: int): string = proc repr*(x: int): string =
@ -98,10 +96,7 @@ proc repr*(p: proc): string =
repr(cast[ptr pointer](unsafeAddr p)[]) repr(cast[ptr pointer](unsafeAddr p)[])
template repr*(x: distinct): string = template repr*(x: distinct): string =
when x is range: # hacks for ranges with distinct sub types repr(distinctBase(typeof(x))(x))
repr(distinctBase(skipRanges(typeof(x)))(x))
else:
repr(distinctBase(typeof(x))(x))
template repr*(t: typedesc): string = $t template repr*(t: typedesc): string = $t

View file

@ -1,5 +1,4 @@
discard """ discard """
matrix: "--mm:refc; --mm:orc"
output: '''[1, 0, 0, 0, 0, 0, 0, 0] CTBool[Ct[system.uint32]]''' output: '''[1, 0, 0, 0, 0, 0, 0, 0] CTBool[Ct[system.uint32]]'''
""" """