File nim-fix-build-with-gcc14.patch of Package nim

Overview Repositories Revisions Requests Users Attributes Meta

File nim-fix-build-with-gcc14.patch of Package nim (Revision fc20035f8079496e4f5cf18cd31f4e33)

Currently displaying revision fc20035f8079496e4f5cf18cd31f4e33 , Show latest

From b9951e8c8725359dc340b7c070f30b6126c63a89 Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Thu, 16 May 2024 02:52:18 +0800
Subject: [PATCH] fixes lifting subtype calling parent's hooks (#23612)

ref https://forum.nim-lang.org/t/11587

Tested with `gcc version 14.0.1 20240412` locally

(cherry picked from commit 2c8551556e5b51b7a7e487b1043b92d4ad34dbf0)
---
 compiler/liftdestructors.nim |  5 ++++-
 tests/arc/tarc_orc.nim       | 25 ++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/compiler/liftdestructors.nim b/compiler/liftdestructors.nim
index 193e3eae6784..749e4ff49108 100644
--- a/compiler/liftdestructors.nim
+++ b/compiler/liftdestructors.nim
@@ -221,7 +221,10 @@ proc fillBodyObj(c: var TLiftCtx; n, body, x, y: PNode; enforceDefaultOp: bool)
 
 proc fillBodyObjTImpl(c: var TLiftCtx; t: PType, body, x, y: PNode) =
   if t.len > 0 and t[0] != nil:
-    fillBody(c, skipTypes(t[0], abstractPtrs), body, x, y)
+    let obj = newNodeIT(nkHiddenSubConv, c.info, t[0])
+    obj.add newNodeI(nkEmpty, c.info)
+    obj.add x
+    fillBody(c, skipTypes(t[0], abstractPtrs), body, obj, y)
   fillBodyObj(c, t.n, body, x, y, enforceDefaultOp = false)
 
 proc fillBodyObjT(c: var TLiftCtx; t: PType, body, x, y: PNode) =
diff --git a/tests/arc/tarc_orc.nim b/tests/arc/tarc_orc.nim
index 594950d71e76..674ba0dbbe86 100644
--- a/tests/arc/tarc_orc.nim
+++ b/tests/arc/tarc_orc.nim
@@ -136,4 +136,27 @@ proc main2 =
     doAssert a.len == 2
     doAssert b.len == 0
 
-main2()
\ No newline at end of file
+main2()
+
+block:
+  type
+    TestObj = object of RootObj
+      name: string
+    
+    TestSubObj = object of TestObj
+      objname: string
+
+  proc `=destroy`(x: TestObj) =
+    `=destroy`(x.name)
+
+  proc `=destroy`(x: TestSubObj) =
+    `=destroy`(x.objname)
+    `=destroy`(TestObj(x))
+
+  proc testCase() =
+    let t1 {.used.} = TestSubObj(objname: "tso1", name: "to1")
+
+  proc main() =
+    testCase()
+
+  main()

Places

File nim-fix-build-with-gcc14.patch of Package nim (Revision fc20035f8079496e4f5cf18cd31f4e33)

Places