[interop][SwiftToCxx] annotate OpaqueStorage with noexcept

Author: hyp

lib/PrintAsClang/PrintSwiftToClangCoreScaffold.cpp

@@ -133,32 +133,34 @@ inline void opaqueFree(void * _Nonnull p) {
 }
 
 static void printSwiftResilientStorageClass(raw_ostream &os) {
-  // FIXME: mark noexcept.
   auto name = cxx_synthesis::getCxxOpaqueStorageClassName();
   static_assert(TargetValueWitnessFlags<uint64_t>::AlignmentMask ==
                     TargetValueWitnessFlags<uint32_t>::AlignmentMask,
                 "alignment mask doesn't match");
   os << "/// Container for an opaque Swift value, like resilient struct.\n";
   os << "class " << name << " {\n";
   os << "public:\n";
-  os << "  inline " << name << "() : storage(nullptr) { }\n";
+  os << "  inline " << name << "() noexcept : storage(nullptr) { }\n";
   os << "  inline " << name
-     << "(ValueWitnessTable * _Nonnull vwTable) : storage("
+     << "(ValueWitnessTable * _Nonnull vwTable) noexcept : storage("
         "reinterpret_cast<char *>(opaqueAlloc(vwTable->size, (vwTable->flags &"
      << TargetValueWitnessFlags<uint64_t>::AlignmentMask << ") + 1))) { }\n";
   os << "  inline " << name << "(" << name
-     << "&& other) : storage(other.storage) { other.storage = nullptr; }\n";
-  os << "  inline " << name << "(const " << name << "&) = delete;\n";
+     << "&& other) noexcept : storage(other.storage) { other.storage = "
+        "nullptr; }\n";
+  os << "  inline " << name << "(const " << name << "&) noexcept = delete;\n";
   os << "  inline ~" << name
-     << "() { if (storage) { opaqueFree(static_cast<char "
+     << "() noexcept { if (storage) { opaqueFree(static_cast<char "
         "* _Nonnull>(storage)); } }\n";
   os << "  void operator =(" << name
-     << "&& other) { auto temp = storage; storage = other.storage; "
+     << "&& other) noexcept { auto temp = storage; storage = other.storage; "
         "other.storage = temp; }\n";
-  os << "  void operator =(const " << name << "&) = delete;\n";
-  os << "  inline char * _Nonnull getOpaquePointer() { return static_cast<char "
+  os << "  void operator =(const " << name << "&) noexcept = delete;\n";
+  os << "  inline char * _Nonnull getOpaquePointer() noexcept { return "
+        "static_cast<char "
         "* _Nonnull>(storage); }\n";
-  os << "  inline const char * _Nonnull getOpaquePointer() const { return "
+  os << "  inline const char * _Nonnull getOpaquePointer() const noexcept { "
+        "return "
         "static_cast<char * _Nonnull>(storage); }\n";
   os << "private:\n";
   os << "  char * _Nullable storage;\n";

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

@@ -65,15 +65,15 @@
 // CHECK-NEXT: /// Container for an opaque Swift value, like resilient struct.
 // CHECK-NEXT: class OpaqueStorage {
 // CHECK-NEXT: public:
-// CHECK-NEXT:   inline OpaqueStorage() : storage(nullptr) { }
-// CHECK-NEXT:   inline OpaqueStorage(ValueWitnessTable * _Nonnull vwTable) : storage(reinterpret_cast<char *>(opaqueAlloc(vwTable->size, (vwTable->flags &255) + 1))) { }
-// CHECK-NEXT:   inline OpaqueStorage(OpaqueStorage&& other) : storage(other.storage) { other.storage = nullptr; }
-// CHECK-NEXT:   inline OpaqueStorage(const OpaqueStorage&) = delete;
-// CHECK-NEXT:   inline ~OpaqueStorage() { if (storage) { opaqueFree(static_cast<char * _Nonnull>(storage)); } }
-// CHECK-NEXT:   void operator =(OpaqueStorage&& other) { auto temp = storage; storage = other.storage; other.storage = temp; }
-// CHECK-NEXT:   void operator =(const OpaqueStorage&) = delete;
-// CHECK-NEXT:   inline char * _Nonnull getOpaquePointer() { return static_cast<char * _Nonnull>(storage); }
-// CHECK-NEXT:   inline const char * _Nonnull getOpaquePointer() const { return static_cast<char * _Nonnull>(storage); }
+// CHECK-NEXT:   inline OpaqueStorage() noexcept : storage(nullptr) { }
+// CHECK-NEXT:   inline OpaqueStorage(ValueWitnessTable * _Nonnull vwTable) noexcept : storage(reinterpret_cast<char *>(opaqueAlloc(vwTable->size, (vwTable->flags &255) + 1))) { }
+// CHECK-NEXT:   inline OpaqueStorage(OpaqueStorage&& other) noexcept : storage(other.storage) { other.storage = nullptr; }
+// CHECK-NEXT:   inline OpaqueStorage(const OpaqueStorage&) noexcept = delete;
+// CHECK-NEXT:   inline ~OpaqueStorage() noexcept { if (storage) { opaqueFree(static_cast<char * _Nonnull>(storage)); } }
+// CHECK-NEXT:   void operator =(OpaqueStorage&& other) noexcept { auto temp = storage; storage = other.storage; other.storage = temp; }
+// CHECK-NEXT:   void operator =(const OpaqueStorage&) noexcept = delete;
+// CHECK-NEXT:   inline char * _Nonnull getOpaquePointer() noexcept { return static_cast<char * _Nonnull>(storage); }
+// CHECK-NEXT:   inline const char * _Nonnull getOpaquePointer() const noexcept { return static_cast<char * _Nonnull>(storage); }
 // CHECK-NEXT: private:
 // CHECK-NEXT:   char * _Nullable storage;
 // CHECK-NEXT: };