jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #18410 (Errors initializing an object of RootObj with the C++ backend) [backport] (#18836)

Browse source 
* fix #18410

* one line comment

* typo

* typo

* cover cpp
This commit is contained in:
flywind 2021-10-31 13:22:00 +08:00 • committed by GitHub
commit 2f730afe9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/cgen.nim
View file

@ -363,7 +363,8 @@ proc genObjectInit(p: BProc, section: TCProcSection, t: PType, a: var TLoc,
else: else:
linefmt(p, section, "$1.m_type = $2;$n", [r, genTypeInfoV1(p.module, t, a.lode.info)]) linefmt(p, section, "$1.m_type = $2;$n", [r, genTypeInfoV1(p.module, t, a.lode.info)])
of frEmbedded: of frEmbedded:
if optTinyRtti in p.config.globalOptions: # inheritance in C++ does not allow struct initialization: bug #18410
if not p.module.compileToCpp and optTinyRtti in p.config.globalOptions:
var tmp: TLoc var tmp: TLoc
if mode == constructRefObj: if mode == constructRefObj:
let objType = t.skipTypes(abstractInst+{tyRef}) let objType = t.skipTypes(abstractInst+{tyRef})

3
tests/arc/tconst_to_sink.nim
View file

@ -1,6 +1,7 @@
discard """ discard """
output: '''@[(s1: "333", s2: ""), (s1: "abc", s2: "def"), (s1: "3x", s2: ""), (s1: "3x", s2: ""), (s1: "3x", s2: ""), (s1: "3x", s2: ""), (s1: "lastone", s2: "")]''' output: '''@[(s1: "333", s2: ""), (s1: "abc", s2: "def"), (s1: "3x", s2: ""), (s1: "3x", s2: ""), (s1: "3x", s2: ""), (s1: "3x", s2: ""), (s1: "lastone", s2: "")]'''
cmd: "nim c --gc:arc $file" matrix: "--gc:arc"
targets: "c cpp"
""" """
# bug #13240 # bug #13240

15
tests/cpp/torc.nim Normal file
View file

@ -0,0 +1,15 @@
discard """
targets: "cpp"
matrix: "--gc:orc"
"""
import std/options
# bug #18410
type
O = object of RootObj
val: pointer
proc p(): Option[O] = none(O)
doAssert $p() == "none(O)"