From 53aba6c213f80ec6c184cc407068ad59de322e54 Mon Sep 17 00:00:00 2001
From: Bung <crc32@qq.com>
Date: Fri, 27 Jan 2023 00:50:44 -0800
Subject: [PATCH] Fix #13093 C++ Atomics: operator= is implicitly deleted
 because the default definition would be ill-formed  (#21169)

* add test

* fix #17982 Invalid C++ code generation when returning discardable var T

* fix #13093

* cpp atomic good example

* clearify the condition
---
 compiler/cgen.nim                |  4 ++++
 compiler/semstmts.nim            |  6 +++++-
 lib/pure/concurrency/atomics.nim |  2 +-
 tests/cpp/t13093.nim             | 24 ++++++++++++++++++++++++
 tests/cpp/t17982.nim             | 20 ++++++++++++++++++++
 5 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 tests/cpp/t13093.nim
 create mode 100644 tests/cpp/t17982.nim

diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 5bf9400c516d9..869c1bfdd0700 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -491,6 +491,10 @@ proc constructLoc(p: BProc, loc: var TLoc, isTemp = false) =
       nilLoc.r = rope("NIM_NIL")
       genRefAssign(p, loc, nilLoc)
     else:
+      if typ.kind == tyVar:
+        let tt = typ.skipTypes({tyVar})
+        if isImportedType(tt) and tfRequiresInit in tt.flags:
+          return
       linefmt(p, cpsStmts, "$1 = ($2)0;$n", [rdLoc(loc),
         getTypeDesc(p.module, typ, mapTypeChooser(loc))])
   else:
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index c7e48db4cd49c..12a346f63ac67 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -717,7 +717,11 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
                                           tyUserTypeClassInst})
         if actualType.kind in {tyObject, tyDistinct} and
            actualType.requiresInit:
-          defaultConstructionError(c, v.typ, v.info)
+           # imported type use requiresInit pragma prevent implicit initialization
+          if (tfRequiresInit in actualType.flags and sfImportc in actualType.sym.flags):
+            discard
+          else:
+            defaultConstructionError(c, v.typ, v.info)
         else:
           checkNilable(c, v)
         # allow let to not be initialised if imported from C:
diff --git a/lib/pure/concurrency/atomics.nim b/lib/pure/concurrency/atomics.nim
index c7b881bc55c11..49204bd4d5306 100644
--- a/lib/pure/concurrency/atomics.nim
+++ b/lib/pure/concurrency/atomics.nim
@@ -89,7 +89,7 @@ when defined(cpp) or defined(nimdoc):
         ## with other moSequentiallyConsistent operations.
 
   type
-    Atomic*[T] {.importcpp: "std::atomic", completeStruct.} = object
+    Atomic*[T] {.importcpp: "std::atomic", completeStruct, requiresInit.} = object
       ## An atomic object with underlying type `T`.
       raw: T
 
diff --git a/tests/cpp/t13093.nim b/tests/cpp/t13093.nim
new file mode 100644
index 0000000000000..17c730d16a73a
--- /dev/null
+++ b/tests/cpp/t13093.nim
@@ -0,0 +1,24 @@
+discard """
+  targets: "cpp"
+  action: reject
+  errormsg: "The PledgeObj type requires the following fields to be initialized: refCount"
+"""
+
+import atomics
+
+type
+  Pledge* = object
+    p: PledgePtr
+
+  PledgePtr = ptr PledgeObj
+  PledgeObj = object
+    refCount: Atomic[int32]
+
+proc main() =
+  var pledge: Pledge
+  pledge.p = createShared(PledgeObj)
+  let tmp = PledgeObj() # <---- not allowed: atomics are not copyable
+
+  pledge.p[] = tmp
+
+main()
diff --git a/tests/cpp/t17982.nim b/tests/cpp/t17982.nim
new file mode 100644
index 0000000000000..5413f06ffd8ab
--- /dev/null
+++ b/tests/cpp/t17982.nim
@@ -0,0 +1,20 @@
+discard """
+  targets: "cpp"
+  action: "compile"
+"""
+
+type
+  String* {.importcpp: "std::string", header: "string".} = object
+
+proc initString*(): String
+    {.importcpp: "std::string()", header: "string".}
+
+proc append*(this: var String, str: String): String
+    # bug seems to trigger when `#`, `@`, or `$1` is used inside `importcpp`
+    {.importcpp: "#.append(@)", header: "string", discardable.} # <- changed from `importcpp: "append"`
+
+var
+  s1 = initString()
+  s2 = initString()
+
+s1.append s2