Skip to content

Commit 12f6d97

Browse files
committed
[interop][SwiftToCxx] mark the alloc/free heap allocation functions as noexcept
1 parent 1821b62 commit 12f6d97

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/PrintAsClang/PrintSwiftToClangCoreScaffold.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static void printTypeMetadataResponseType(SwiftToClangInteropContext &ctx,
145145
}
146146

147147
static void printOpaqueAllocFee(raw_ostream &os) {
148-
os << R"text(inline void * _Nonnull opaqueAlloc(size_t size, size_t align) {
148+
os << R"text(inline void * _Nonnull opaqueAlloc(size_t size, size_t align) noexcept {
149149
#if defined(_WIN32)
150150
void *r = _aligned_malloc(size, align);
151151
#else
@@ -156,7 +156,7 @@ static void printOpaqueAllocFee(raw_ostream &os) {
156156
#endif
157157
return r;
158158
}
159-
inline void opaqueFree(void * _Nonnull p) {
159+
inline void opaqueFree(void * _Nonnull p) noexcept {
160160
#if defined(_WIN32)
161161
_aligned_free(p);
162162
#else

test/Interop/SwiftToCxx/core/swift-impl-defs-in-cxx.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
// CHECK-NEXT: }
6464
// CHECK-NEXT: #endif
6565
// CHECK-EMPTY:
66-
// CHECK-NEXT: inline void * _Nonnull opaqueAlloc(size_t size, size_t align) {
66+
// CHECK-NEXT: inline void * _Nonnull opaqueAlloc(size_t size, size_t align) noexcept {
6767
// CHECK-NEXT: #if defined(_WIN32)
6868
// CHECK-NEXT: void *r = _aligned_malloc(size, align);
6969
// CHECK-NEXT: #else
@@ -74,7 +74,7 @@
7474
// CHECK-NEXT: #endif
7575
// CHECK-NEXT: return r;
7676
// CHECK-NEXT: }
77-
// CHECK-NEXT: inline void opaqueFree(void * _Nonnull p) {
77+
// CHECK-NEXT: inline void opaqueFree(void * _Nonnull p) noexcept {
7878
// CHECK-NEXT: #if defined(_WIN32)
7979
// CHECK-NEXT: _aligned_free(p);
8080
// CHECK-NEXT: #else

0 commit comments

Comments
 (0)