From ae4b47c5bd48d244ee1f93ec6ba5f6bcf55eb973 Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Sat, 15 Jun 2024 22:07:49 +0800
Subject: [PATCH] fixes #20048; fixes #15746; don't sink object fields if it's
 of openarray type (#23608)

fixes #20048
fixes #15746
---
 compiler/injectdestructors.nim |  3 ++-
 tests/views/tviews1.nim        | 10 ++++++++++
 tests/views/tviews2.nim        | 12 ++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/compiler/injectdestructors.nim b/compiler/injectdestructors.nim
index 85d7a65d27be..98751c7c5b2c 100644
--- a/compiler/injectdestructors.nim
+++ b/compiler/injectdestructors.nim
@@ -872,7 +872,8 @@ proc p(n: PNode; c: var Con; s: var Scope; mode: ProcessMode; tmpFlags = {sfSing
       for i in 1..<n.len:
         if n[i].kind == nkExprColonExpr:
           let field = lookupFieldAgain(t, n[i][0].sym)
-          if field != nil and sfCursor in field.flags:
+          if field != nil and (sfCursor in field.flags or field.typ.kind in {tyOpenArray, tyVarargs}):
+            # don't sink fields with openarray types
             result[i][1] = p(n[i][1], c, s, normal)
           else:
             result[i][1] = p(n[i][1], c, s, m)
diff --git a/tests/views/tviews1.nim b/tests/views/tviews1.nim
index 1cc9fcdec33c..9785d25e5e51 100644
--- a/tests/views/tviews1.nim
+++ b/tests/views/tviews1.nim
@@ -124,3 +124,13 @@ proc bug22597 = # bug #22597
   doAssert i == 1
 
 bug22597()
+
+block: # bug #20048
+  type
+    Test = object
+      tokens: openArray[string]
+
+  func init(Self: typedesc[Test], tokens: openArray[string]): Self = Self(tokens: tokens)
+
+  let data = Test.init(["123"])
+  doAssert @(data.tokens) == @["123"] 
diff --git a/tests/views/tviews2.nim b/tests/views/tviews2.nim
index e06cc2d5359f..29aff76df167 100644
--- a/tests/views/tviews2.nim
+++ b/tests/views/tviews2.nim
@@ -58,6 +58,18 @@ block: # bug #16671
 
     f()
 
+block: # bug #15746
+  type
+    Reader = object
+      data: openArray[char]
+      current: int
+
+  proc initReader(data: openArray[char], offset = 0): Reader =
+    result = Reader(data: data, current: offset)
+
+  let s = "\x01\x00\x00\x00"
+  doAssert initReader(s).data[0].int == 1
+
 block:
   proc foo(x: openArray[char]) =
     discard x