Merge pull request #61224 from hyp/eng/prohibit-moves

[interop][SwiftToCxx] trap on moves of Swift values for now

Author: hyp

lib/PrintAsClang/PrintClangValueType.cpp

@@ -263,12 +263,12 @@ void ClangValueTypePrinter::printValueTypeDecl(
         "*>(other._getOpaquePointer()), metadata._0);\n";
   os << "  }\n";
 
-  // FIXME: the move constructor should be hidden somehow.
-  os << "  inline ";
+  // FIXME: implement the move constructor.
+  os << "  [[noreturn]] inline ";
   printer.printBaseName(typeDecl);
   os << "(";
   printer.printBaseName(typeDecl);
-  os << " &&) = default;\n";
+  os << " &&) { abort(); }\n";
 
   bodyPrinter();
   if (typeDecl->isStdlibDecl())

stdlib/public/SwiftShims/swift/shims/_SwiftCxxInteroperability.h

@@ -103,8 +103,11 @@ class RefCountedClass {
     _opaquePointer = other._opaquePointer;
     return *this;
   }
-  // FIXME: What to do in 'move'?
-  inline RefCountedClass(RefCountedClass &&) noexcept = default;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-noreturn"
+  // FIXME: implement 'move'?
+  inline RefCountedClass(RefCountedClass &&) noexcept { abort(); }
+#pragma clang diagnostic pop
 
 protected:
   inline RefCountedClass(void *_Nonnull ptr) noexcept : _opaquePointer(ptr) {}

test/Interop/SwiftToCxx/expose-attr/expose-swift-decls-to-cxx.swift

@@ -77,7 +77,7 @@ public final class ExposedClass {
 // CHECK: class ExposedClass final
 // CHECK: class ExposedStruct final {
 // CHECK: class ExposedStruct2 final {
-// CHECK: ExposedStruct2(ExposedStruct2 &&) = default;
+// CHECK: ExposedStruct2(ExposedStruct2 &&)
 // CHECK-NEXT: swift::Int getY() const;
 // CHECK-NEXT: void setY(swift::Int value);
 // CHECK-NEXT: static inline ExposedStruct2 init();

test/Interop/SwiftToCxx/initializers/init-in-cxx.swift

@@ -32,7 +32,7 @@ public struct FirstSmallStruct {
 
 // CHECK: class FirstSmallStruct final {
 // CHECK-NEXT: public:
-// CHECK:   inline FirstSmallStruct(FirstSmallStruct &&) = default;
+// CHECK:   inline FirstSmallStruct(FirstSmallStruct &&)
 // CHECK-NEXT:   inline uint32_t getX() const;
 // CHECK-NEXT:   static inline FirstSmallStruct init();
 // CHECK-NEXT:   static inline FirstSmallStruct init(swift::Int x);

test/Interop/SwiftToCxx/methods/method-in-cxx.swift

@@ -85,7 +85,7 @@ public final class PassStructInClassMethod {
 // CHECK-NEXT:   inline ClassWithMethods deepCopy(swift::Int x);
 
 // CHECK: class LargeStruct final {
-// CHECK: inline LargeStruct(LargeStruct &&) = default;
+// CHECK: inline LargeStruct(LargeStruct &&)
 // CHECK-NEXT: inline LargeStruct doubled() const;
 // CHECK-NEXT: inline void dump() const;
 // CHECK-NEXT: inline LargeStruct scaled(swift::Int x, swift::Int y) const;

test/Interop/SwiftToCxx/methods/mutating-method-in-cxx.swift

@@ -57,14 +57,14 @@ public struct SmallStruct {
 // CHECK: SWIFT_EXTERN void $s7Methods11SmallStructV6invertyyF(SWIFT_CONTEXT void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // invert()
 
 // CHECK: class LargeStruct final {
-// CHECK: inline LargeStruct(LargeStruct &&) = default;
+// CHECK: inline LargeStruct(LargeStruct &&)
 // CHECK-NEXT:   inline void dump() const;
 // CHECK-NEXT:   inline void double_();
 // CHECK-NEXT:   inline LargeStruct scale(swift::Int x, swift::Int y);
 // CHECK-NEXT: private
 
 // CHECK: class SmallStruct final {
-// CHECK:   inline SmallStruct(SmallStruct &&) = default;
+// CHECK:   inline SmallStruct(SmallStruct &&)
 // CHECK-NEXT:   inline void dump() const;
 // CHECK-NEXT:   inline SmallStruct scale(float y);
 // CHECK-NEXT:   inline void invert();

test/Interop/SwiftToCxx/properties/getter-in-cxx.swift

@@ -10,7 +10,7 @@ public struct FirstSmallStruct {
 
 // CHECK: class FirstSmallStruct final {
 // CHECK: public:
-// CHECK:   inline FirstSmallStruct(FirstSmallStruct &&) = default;
+// CHECK:   inline FirstSmallStruct(FirstSmallStruct &&)
 // CHECK-NEXT:   inline uint32_t getX() const;
 // CHECK-NEXT:   private:
 
@@ -28,7 +28,7 @@ public struct LargeStruct {
 
 // CHECK: class LargeStruct final {
 // CHECK: public:
-// CHECK: inline LargeStruct(LargeStruct &&) = default;
+// CHECK: inline LargeStruct(LargeStruct &&)
 // CHECK-NEXT: inline swift::Int getX1() const;
 // CHECK-NEXT: inline swift::Int getX2() const;
 // CHECK-NEXT: inline swift::Int getX3() const;
@@ -82,7 +82,7 @@ public struct SmallStructWithGetters {
 
 // CHECK: class SmallStructWithGetters final {
 // CHECK: public:
-// CHECK:   inline SmallStructWithGetters(SmallStructWithGetters &&) = default;
+// CHECK:   inline SmallStructWithGetters(SmallStructWithGetters &&)
 // CHECK-NEXT:  inline uint32_t getStoredInt() const;
 // CHECK-NEXT:  inline swift::Int getComputedInt() const;
 // CHECK-NEXT:  inline LargeStruct getLargeStruct() const;

test/Interop/SwiftToCxx/properties/setter-in-cxx.swift

@@ -10,7 +10,7 @@ public struct FirstSmallStruct {
 
 // CHECK: class FirstSmallStruct final {
 // CHECK: public:
-// CHECK:   inline FirstSmallStruct(FirstSmallStruct &&) = default;
+// CHECK:   inline FirstSmallStruct(FirstSmallStruct &&)
 // CHECK-NEXT:   inline uint32_t getX() const;
 // CHECK-NEXT:   inline void setX(uint32_t value);
 // CHECK-NEXT:   private:
@@ -21,7 +21,7 @@ public struct LargeStruct {
 
 // CHECK: class LargeStruct final {
 // CHECK: public:
-// CHECK: inline LargeStruct(LargeStruct &&) = default;
+// CHECK: inline LargeStruct(LargeStruct &&)
 // CHECK-NEXT: inline swift::Int getX1() const;
 // CHECK-NEXT: inline void setX1(swift::Int value);
 // CHECK-NEXT: inline swift::Int getX2() const;
@@ -97,7 +97,7 @@ public struct SmallStructWithProps {
 
 // CHECK: class SmallStructWithProps final {
 // CHECK: public:
-// CHECK:   inline SmallStructWithProps(SmallStructWithProps &&) = default;
+// CHECK:   inline SmallStructWithProps(SmallStructWithProps &&)
 // CHECK-NEXT:    inline uint32_t getStoredInt() const;
 // CHECK-NEXT:    inline void setStoredInt(uint32_t value);
 // CHECK-NEXT:    inline swift::Int getComputedInt() const;

test/Interop/SwiftToCxx/stdlib/swift-stdlib-in-cxx.swift

@@ -52,7 +52,7 @@
 // CHECK:  }
 // CHECK-NEXT:  inline String(const String &other) {
 // CHECK:  }
-// CHECK-NEXT:  inline String(String &&) = default;
+// CHECK-NEXT:  inline String(String &&) { abort(); }
 // CHECK-NEXT:  static inline String init();
 // CHECK-NEXT:  #if defined(__OBJC__)
 // CHECK-NEXT:  inline __attribute__((always_inline)) operator NSString * _Nonnull () const noexcept {

test/Interop/SwiftToCxx/structs/struct-with-refcounted-member.swift

@@ -47,5 +47,5 @@ public func printBreak(_ x: Int) {
 // CHECK-NEXT: #endif
 // CHECK-NEXT:     vwTable->initializeWithCopy(_getOpaquePointer(), const_cast<char *>(other._getOpaquePointer()), metadata._0);
 // CHECK-NEXT:   }
-// CHECK-NEXT:   inline StructWithRefcountedMember(StructWithRefcountedMember &&) = default;
+// CHECK-NEXT:   inline StructWithRefcountedMember(StructWithRefcountedMember &&) { abort(); }
 // CHECK-NEXT: private:

test/Interop/SwiftToCxx/structs/swift-struct-in-cxx.swift

@@ -25,7 +25,7 @@
 // CHECK:        }
 // CHECK-NEXT:   inline StructWithIntField(const StructWithIntField &other) {
 // CHECK:        }
-// CHECK-NEXT:   inline StructWithIntField(StructWithIntField &&) = default;
+// CHECK-NEXT:   noreturn]] inline StructWithIntField(StructWithIntField &&) { abort(); }
 // CHECK-NEXT: private:
 // CHECK-NEXT:   inline StructWithIntField() {}
 // CHECK-NEXT:   static inline StructWithIntField _make() { return StructWithIntField(); }