mirror of
https://github.com/nim-lang/Nim.git
synced 2026-05-31 09:05:37 +00:00
43ac102ca8
fixes #25800 closes https://github.com/nim-lang/Nim/pull/25807 ref https://github.com/nim-lang/Nim/issues/25800 This pull request improves the handling of move semantics and the `=wasMoved` hook in the Nim compiler, especially for C++ code generation and user-defined types. It refactors the move operation logic to better support custom hooks, adds new tests for edge cases, and ensures that the `move` operation is safer and more predictable. **Move semantics and `=wasMoved` handling:** * Refactored the move operation in `compiler/ccgexprs.nim` by introducing helper procs (`canGenMoveCall`, `genMoveCall`, `genWasMovedCall`, `genMoveWithWasMoved`) to better handle cases with user-defined `=wasMoved` hooks, especially for generics and C++ interop. The logic now distinguishes between simple assignments and when to call custom hooks, improving correctness and maintainability. [[1]](diffhunk://#diff-4509107d295d7d32b1887c8993cd0f56113ae60f36113e7d8778646dabd92ebcL2818-R2851) [[2]](diffhunk://#diff-4509107d295d7d32b1887c8993cd0f56113ae60f36113e7d8778646dabd92ebcL2841-R2882) * Updated the `move` proc in `lib/system.nim` to include the `nodestroy` pragma, preventing double destruction and making move semantics safer. **Testing and validation:** * Added a new test (`tests/ccgbugs2/t25800.nim`) to ensure that user-defined `=wasMoved` hooks with `{.importcpp.}` are correctly generated and invoked in C++ code, addressing a specific bug with invalid preprocessor directives. * Expanded `tests/destructor/twasmoved.nim` with additional test cases for objects with and without custom `=wasMoved` hooks, including multithreaded scenarios using `threadpool`, to verify correct behavior in a variety of contexts. **Minor cleanup:** * Added a blank line for code style consistency in `compiler/semmagic.nim`.
63 lines
800 B
Nim
63 lines
800 B
Nim
type
|
|
Foo = object
|
|
id: int
|
|
|
|
proc `=wasMoved`(x: var Foo) =
|
|
x.id = -1
|
|
|
|
proc foo =
|
|
var s = Foo(id: 999)
|
|
var m = move s
|
|
doAssert s.id == -1
|
|
doAssert m.id == 999
|
|
|
|
foo()
|
|
|
|
block:
|
|
type Foo = object
|
|
a,b,c: int
|
|
|
|
var dest: Foo
|
|
|
|
# proc `=wasMoved`(x: var Foo) =
|
|
# debugEcho "wasMoved called"
|
|
|
|
proc main() =
|
|
var x = Foo(a:11, b:12, c:13)
|
|
dest = move(x)
|
|
|
|
main()
|
|
|
|
block:
|
|
type Foo = object
|
|
a,b,c: int
|
|
|
|
var dest: Foo
|
|
|
|
proc `=wasMoved`(x: var Foo) =
|
|
discard "wasMoved called"
|
|
|
|
proc main() =
|
|
var x = Foo(a:11, b:12, c:13)
|
|
dest = move(x)
|
|
|
|
main()
|
|
|
|
|
|
import std/threadpool
|
|
|
|
block:
|
|
type Foo = object
|
|
data: string
|
|
|
|
proc `=wasMoved`(x: var Foo) =
|
|
discard
|
|
|
|
proc work(x: Foo) =
|
|
discard
|
|
|
|
var x = Foo(data: "hello")
|
|
spawn work(x)
|
|
sync()
|
|
|