Skip to content

Commit c1b07f0

Browse files
authored
Merge pull request #68283 from drexin/wip-narf
[Runtime] Use handleRefCountsAssignWithCopy in swift_generic_assignWi…
2 parents 2307bc0 + ee28da2 commit c1b07f0

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

stdlib/public/runtime/BytecodeLayouts.cpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,17 +1816,15 @@ static void handleRefCountsAssignWithCopy(const Metadata *metadata,
18161816
extern "C" swift::OpaqueValue *
18171817
swift_generic_assignWithCopy(swift::OpaqueValue *dest, swift::OpaqueValue *src,
18181818
const Metadata *metadata) {
1819-
// const uint8_t *layoutStr = metadata->getLayoutString();
1820-
// LayoutStringReader1 reader{layoutStr + layoutStringHeaderSize};
1821-
// uintptr_t addrOffset = 0;
1822-
// handleRefCountsAssignWithCopy(metadata, reader, addrOffset, (uint8_t
1823-
// *)dest, (uint8_t *)src);
1819+
const uint8_t *layoutStr = metadata->getLayoutString();
1820+
LayoutStringReader1 reader{layoutStr + layoutStringHeaderSize};
1821+
uintptr_t addrOffset = 0;
1822+
handleRefCountsAssignWithCopy(metadata, reader, addrOffset, (uint8_t *)dest,
1823+
(uint8_t *)src);
18241824

1825-
// assert(addrOffset == metadata->vw_size());
1826-
swift_generic_destroy(dest, metadata);
1827-
return swift_generic_initWithCopy(dest, src, metadata);
1825+
assert(addrOffset == metadata->vw_size());
18281826

1829-
// return dest;
1827+
return dest;
18301828
}
18311829

18321830
extern "C" swift::OpaqueValue *

0 commit comments

Comments
 (0)