Merge pull request #64363 from hyp/eng/cxx-noexcept-coll-overlay

hyp · web-flow · commit c71cdccd54be · 2023-03-14T16:19:43.000-07:00
[interop][SwiftToCxx] use unconditional noexcept for C++ collection o…
diff --git a/lib/PrintAsClang/_SwiftStdlibCxxOverlay.h b/lib/PrintAsClang/_SwiftStdlibCxxOverlay.h
@@ -93,10 +93,10 @@ template <class Collection, class T> class CollectionIterator {
     // FIXME: End read access.
   }
 
-  SWIFT_INLINE_THUNK T operator*() const noexcept(noexcept(collection[index])) {
+  SWIFT_INLINE_THUNK T operator*() const noexcept {
     return collection[index];
   }
-  SWIFT_INLINE_THUNK void operator++() noexcept(noexcept(++index)) {
+  SWIFT_INLINE_THUNK void operator++() noexcept {
     ++index;
     // FIXME: assert(index <= endIndex); // No need to go past the end.
   }

Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,10 @@ template <class Collection, class T> class CollectionIterator {`
`93`	`93`	`// FIXME: End read access.`
`94`	`94`	`}`
`95`	`95`
`96`		`- SWIFT_INLINE_THUNK T operator*() const noexcept(noexcept(collection[index])) {`
	`96`	`+ SWIFT_INLINE_THUNK T operator*() const noexcept {`
`97`	`97`	`return collection[index];`
`98`	`98`	`}`
`99`		`- SWIFT_INLINE_THUNK void operator++() noexcept(noexcept(++index)) {`
	`99`	`+ SWIFT_INLINE_THUNK void operator++() noexcept {`
`100`	`100`	`++index;`
`101`	`101`	`// FIXME: assert(index <= endIndex); // No need to go past the end.`
`102`	`102`	`}`