summary refs log tree commit diff stats
path: root/lib/pure
diff options
context:
space:
mode:
authorringabout <43030857+ringabout@users.noreply.github.com>2022-07-26 22:48:01 +0800
committerGitHub <noreply@github.com>2022-07-26 16:48:01 +0200
commit1c39af3389b2251eb93b2f8e77911078cb7d5679 (patch)
treedc1fc6a60536d24d4d90bcf652e43354db4feff2 /lib/pure
parent3d5f10f0d05b3510f0738471fa78b0fda1873fdf (diff)
downloadNim-1c39af3389b2251eb93b2f8e77911078cb7d5679.tar.gz
fixes #20089; remove setPointer since strings/seqs are not pointers with ORC (#20090)
fixes #20089; remove setPointer since strings/seqs are not pointers anymore
Diffstat (limited to 'lib/pure')
-rw-r--r--lib/pure/marshal.nim10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/pure/marshal.nim b/lib/pure/marshal.nim
index 452af54d5..df527853e 100644
--- a/lib/pure/marshal.nim
+++ b/lib/pure/marshal.nim
@@ -163,7 +163,10 @@ proc loadAny(p: var JsonParser, a: Any, t: var Table[BiggestInt, pointer]) =
   of akSequence:
     case p.kind
     of jsonNull:
-      setPointer(a, nil)
+      when defined(nimSeqsV2):
+        invokeNewSeq(a, 0)
+      else:
+        setPointer(a, nil)
       next(p)
     of jsonArrayStart:
       next(p)
@@ -230,7 +233,10 @@ proc loadAny(p: var JsonParser, a: Any, t: var Table[BiggestInt, pointer]) =
   of akString:
     case p.kind
     of jsonNull:
-      setPointer(a, nil)
+      when defined(nimSeqsV2):
+        setString(a, "")
+      else:
+        setPointer(a, nil)
       next(p)
     of jsonString:
       setString(a, p.str)