Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

lib/ClangImporter/ClangImporter.cpp

@@ -7096,8 +7096,9 @@ clang::FunctionDecl *ClangImporter::instantiateCXXFunctionTemplate(
     // TODO: Use the location of the apply here.
     // TODO: This error message should not reference implementation details.
     // See: https://github.com/apple/swift/pull/33053#discussion_r477003350
-    ctx.Diags.diagnose(SourceLoc(), diag::unable_to_convert_generic_swift_types,
-                       getFuncName(), failedTypesStr);
+    Impl.diagnose(HeaderLoc(func->getBeginLoc()),
+                  diag::unable_to_convert_generic_swift_types, getFuncName(),
+                  failedTypesStr);
     return nullptr;
   }
 
@@ -7116,9 +7117,9 @@ clang::FunctionDecl *ClangImporter::instantiateCXXFunctionTemplate(
                                       templateParamsStream,
                                       /*IncludeType*/ true);
                           });
-    ctx.Diags.diagnose(SourceLoc(),
-                       diag::unable_to_substitute_cxx_function_template,
-                       getFuncName(), templateParams);
+    Impl.diagnose(HeaderLoc(func->getBeginLoc()),
+                  diag::unable_to_substitute_cxx_function_template,
+                  getFuncName(), templateParams);
     return nullptr;
   }
   sema.InstantiateFunctionDefinition(clang::SourceLocation(), spec);

lib/ClangImporter/ImportName.cpp

@@ -1531,6 +1531,11 @@ ImportedName NameImporter::importNameImpl(const clang::NamedDecl *D,
   if (isa<clang::ObjCCategoryDecl>(D))
     return ImportedName();
 
+  // C++ interop was not available in Swift 2
+  if (!swift3OrLaterName && isa<clang::CXXMethodDecl>(D)) {
+    return ImportedName();
+  }
+
   // Dig out the definition, if there is one.
   if (auto def = getDefinitionForClangTypeDecl(D)) {
     if (*def)

lib/ClangImporter/SwiftDeclSynthesizer.cpp

@@ -2125,6 +2125,8 @@ clang::CXXMethodDecl *SwiftDeclSynthesizer::synthesizeCXXForwardingMethod(
     // convention.
     newMethod->addAttr(clang::CFReturnsRetainedAttr::CreateImplicit(clangCtx));
   }
+  if (auto swiftNameAttr = method->getAttr<clang::SwiftNameAttr>())
+    newMethod->addAttr(swiftNameAttr->clone(clangCtx));
 
   llvm::SmallVector<clang::ParmVarDecl *, 4> params;
   for (size_t i = 0; i < method->getNumParams(); ++i) {

lib/Demangling/NodePrinter.cpp

@@ -3493,35 +3493,9 @@ NodePointer NodePrinter::printEntity(NodePointer Entity, unsigned depth,
     }
   }
 
-  if (hasName || !OverwriteName.empty()) {
-    if (!ExtraName.empty() && MultiWordName) {
-      Printer << ExtraName;
-      if (ExtraIndex >= 0)
-        Printer << ExtraIndex;
-
-      Printer << " of ";
-      ExtraName = "";
-      ExtraIndex = -1;
-    }
-    size_t CurrentPos = Printer.getStringRef().size();
-    if (!OverwriteName.empty()) {
-      Printer << OverwriteName;
-    } else {
-      auto Name = Entity->getChild(1);
-      if (Name->getKind() != Node::Kind::PrivateDeclName)
-        print(Name, depth + 1);
+  printFunctionName(hasName, OverwriteName, ExtraName, MultiWordName,
+                    ExtraIndex, Entity, depth);
 
-      if (auto PrivateName = getChildIf(Entity, Node::Kind::PrivateDeclName))
-        print(PrivateName, depth + 1);
-    }
-    if (Printer.getStringRef().size() != CurrentPos && !ExtraName.empty())
-      Printer << '.';
-  }
-  if (!ExtraName.empty()) {
-    Printer << ExtraName;
-    if (ExtraIndex >= 0)
-      Printer << ExtraIndex;
-  }
   if (TypePr != TypePrinting::NoType) {
     NodePointer type = getChildIf(Entity, Node::Kind::Type);
     assert(type && "malformed entity");

test/Interop/Cxx/class/inheritance/Inputs/virtual-methods.h

@@ -6,6 +6,8 @@ inline void testFunctionCollected() {
 
 struct Base {
   virtual void foo() = 0;
+  virtual void virtualRename() const
+      __attribute__((swift_name("swiftVirtualRename()")));
 };
 
 struct Base2 { virtual int f() = 0; };
@@ -49,48 +51,3 @@ struct DerivedFromCallsPureMethod : CallsPureMethod {
 };
 
 struct DerivedFromDerivedFromCallsPureMethod : DerivedFromCallsPureMethod {};
-
-struct HasDestructor {
-  ~HasDestructor() {}
-};
-
-// MARK: Reference Types:
-
-#define IMMORTAL_FRT                                                           \
-  __attribute__((swift_attr("import_reference")))                              \
-  __attribute__((swift_attr("retain:immortal")))                               \
-  __attribute__((swift_attr("release:immortal")))
-
-struct IMMORTAL_FRT ImmortalBase {
-  int value = 0;
-
-  virtual int get42() const { return 42; }
-  virtual int getOverridden42() const { return 123; }
-  virtual int getIntValue() const { return value; }
-};
-
-struct IMMORTAL_FRT Immortal : public ImmortalBase {
-  static Immortal *_Nonnull create() { return new Immortal(); }
-
-  virtual int getOverridden42() const override { return 42; }
-  virtual void setIntValue(int newValue) { this->value = newValue; }
-};
-
-struct IMMORTAL_FRT DerivedFromImmortal : public Immortal {
-  static DerivedFromImmortal *_Nonnull create() { return new DerivedFromImmortal(); }
-};
-
-struct IMMORTAL_FRT Immortal2 {
-public:
-  virtual void virtualMethod(HasDestructor) = 0;
-};
-
-inline const ImmortalBase *_Nonnull castToImmortalBase(
-    const Immortal *_Nonnull immortal) {
-  return static_cast<const ImmortalBase *>(immortal);
-}
-
-inline const Immortal *_Nonnull castToImmortal(
-    const DerivedFromImmortal *_Nonnull immortal) {
-  return static_cast<const Immortal *>(immortal);
-}

test/Interop/Cxx/class/inheritance/functions-module-interface.swift

@@ -28,8 +28,6 @@
 // CHECK-NEXT:   public static func staticInBase() -> UnsafePointer<CChar>!
 // CHECK-NEXT:   @discardableResult
 // CHECK-NEXT:   public mutating func swiftRenamed(input i: Int32) -> Int32
-// CHECK-NEXT:   @available(swift, obsoleted: 3, renamed: "swiftRenamed(input:)")
-// CHECK-NEXT:   public mutating func renamed(_ i: Int32) -> Int32
 // CHECK-NEXT:   @discardableResult
 // CHECK-NEXT:   @_effects(readonly) public func pure() -> Int32
 // CHECK-NEXT:   @discardableResult
@@ -64,8 +62,6 @@
 // CHECK-NEXT:   public func returnsNonTrivialInBase() -> NonTrivial
 // CHECK-NEXT:   @discardableResult
 // CHECK-NEXT:   public mutating func swiftRenamed(input i: Int32) -> Int32
-// CHECK-NEXT:   @available(swift, obsoleted: 3, renamed: "swiftRenamed(input:)")
-// CHECK-NEXT:   public mutating func renamed(_ i: Int32) -> Int32
 // CHECK-NEXT:   @discardableResult
 // CHECK-NEXT:   @_effects(readonly) public func pure() -> Int32
 // CHECK-NEXT:   @discardableResult
@@ -96,8 +92,6 @@
 // CHECK-NEXT:   public func returnsNonTrivialInBase() -> NonTrivial
 // CHECK-NEXT:   @discardableResult
 // CHECK-NEXT:   public mutating func swiftRenamed(input i: Int32) -> Int32
-// CHECK-NEXT:   @available(swift, obsoleted: 3, renamed: "swiftRenamed(input:)")
-// CHECK-NEXT:   public mutating func renamed(_ i: Int32) -> Int32
 // CHECK-NEXT:   @discardableResult
 // CHECK-NEXT:   @_effects(readonly) public func pure() -> Int32
 // CHECK-NEXT:   @discardableResult

test/Interop/Cxx/class/inheritance/virtual-methods-module-interface.swift

@@ -7,6 +7,7 @@
 // CHECK-NEXT:   init()
 // CHECK-NEXT:   @available(*, unavailable, message: "virtual function is not available in Swift because it is pure")
 // CHECK-NEXT:   mutating func foo()
+// CHECK-NEXT:   func swiftVirtualRename()
 // CHECK: }
 
 // CHECK: struct Base3 {
@@ -25,12 +26,3 @@
 // CHECK: struct VirtualNonAbstractBase {
 // CHECK-NEXT:  init()
 // CHECK-NEXT:  func nonAbstractMethod()
-
-// CHECK: class ImmortalBase {
-// CHECK:  func get42() -> Int32
-// CHECK:  func getOverridden42() -> Int32
-// CHECK: }
-// CHECK: class Immortal {
-// CHECK:  func getOverridden42() -> Int32
-// CHECK:  func get42() -> Int32
-// CHECK: }

test/Interop/Cxx/class/inheritance/virtual-methods-typechecker.swift

@@ -15,25 +15,7 @@ let _ = DerivedFromDerived2()
 
 VirtualNonAbstractBase().nonAbstractMethod()
 
-@available(SwiftStdlib 5.8, *)
-func takesImmortalBase(_ i: ImmortalBase) {
-  let _ = i.get42()
-  let _ = i.getOverridden42()
-  let _ = i.getIntValue()
-}
-
-@available(SwiftStdlib 5.8, *)
-func takesImmortal(_ i: Immortal) {
-  let _ = i.get42()
-  let _ = i.getOverridden42()
-  let _ = i.getIntValue()
-  i.setIntValue(1)
-}
-
-@available(SwiftStdlib 5.8, *)
-func takesDerivedFromImmortal(_ i: DerivedFromImmortal) {
-  let _ = i.get42()
-  let _ = i.getOverridden42()
-  let _ = i.getIntValue()
-  i.setIntValue(1)
+func callVirtualRenamedMethod(_ b: Base) {
+  b.virtualRename()  // expected-error {{value of type 'Base' has no member 'virtualRename'}}
+  b.swiftVirtualRename()
 }

test/Interop/Cxx/class/inheritance/virtual-methods.swift

@@ -29,39 +29,4 @@ VirtualMethodsTestSuite.test("value type") {
   expectEqual(789, d6.getPureInt())
 }
 
-if #available(SwiftStdlib 5.8, *) {
-  VirtualMethodsTestSuite.test("immortal reference type") {
-    let i = Immortal.create()
-    expectEqual(42, i.get42())
-    expectEqual(0, i.getIntValue())
-
-    let base = castToImmortalBase(i)
-    expectEqual(42, base.get42())
-    expectEqual(42, base.getOverridden42())
-    expectEqual(0, base.getIntValue())
-
-    i.setIntValue(566)
-    expectEqual(566, i.getIntValue())
-    expectEqual(566, base.getIntValue())
-
-    let d = DerivedFromImmortal.create()
-    expectEqual(42, d.get42())
-    expectEqual(42, d.getOverridden42())
-    d.setIntValue(321)
-    expectEqual(321, d.getIntValue())
-    let base2 = castToImmortalBase(castToImmortal(d))
-    expectEqual(321, base2.getIntValue())
-  }
-}
-
-#if !os(Windows) 
-// FIXME in Windows, non-trivial C++ class with trivial ABI is not yet available in Swift
-VirtualMethodsTestSuite.test("C++ virtual method with complex parameter") {
-  @available(SwiftStdlib 5.8, *)
-  func f(simpleClass: HasDestructor, immortalClass: Immortal2) {
-    immortalClass.virtualMethod(simpleClass)
-  }
-}
-#endif
-
 runAllTests()

test/Interop/Cxx/foreign-reference/Inputs/member-inheritance.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#define FRT                                       \
+#define IMMORTAL_FRT                              \
   __attribute__((swift_attr("import_reference"))) \
   __attribute__((swift_attr("retain:immortal")))  \
   __attribute__((swift_attr("release:immortal")))
@@ -28,7 +28,7 @@ class CopyTrackedBaseClass {
     }
 private:
     int x;
-} FRT;
+} IMMORTAL_FRT;
 
 class CopyTrackedDerivedClass: public CopyTrackedBaseClass {
 public:
@@ -37,7 +37,7 @@ class CopyTrackedDerivedClass: public CopyTrackedBaseClass {
     int getDerivedX() const {
         return getX();
     }
-} FRT;
+} IMMORTAL_FRT;
 
 CopyTrackedDerivedClass *makeCopyTrackedDerivedClass(int x) {
     return new CopyTrackedDerivedClass(x);
@@ -50,12 +50,12 @@ class NonEmptyBase {
     }
 private:
     int y = 11;
-} FRT;
+} IMMORTAL_FRT;
 
 class CopyTrackedDerivedDerivedClass: public NonEmptyBase, public CopyTrackedDerivedClass {
 public:
     CopyTrackedDerivedDerivedClass(int x) : CopyTrackedDerivedClass(x) {}
-} FRT;
+} IMMORTAL_FRT;
 
 CopyTrackedDerivedDerivedClass *makeCopyTrackedDerivedDerivedClass(int x) {
     return new CopyTrackedDerivedDerivedClass(x);
@@ -66,15 +66,14 @@ class BaseReturningFRTFromSubscript {
     CopyTrackedDerivedClass &operator[](int x) const {
         return *new CopyTrackedDerivedClass(x);
     }
-} FRT;
+} IMMORTAL_FRT;
 
 BaseReturningFRTFromSubscript *makeBaseReturningFRTFromSubscript() {
     return new BaseReturningFRTFromSubscript();
 }
 
-class DerivedFromBaseReturningFRTFromSubscript: public BaseReturningFRTFromSubscript {
-public:
-} FRT;
+class DerivedFromBaseReturningFRTFromSubscript
+    : public BaseReturningFRTFromSubscript{public : } IMMORTAL_FRT;
 
 DerivedFromBaseReturningFRTFromSubscript *makeDerivedFromBaseReturningFRTFromSubscript() {
     return new DerivedFromBaseReturningFRTFromSubscript();
@@ -90,12 +89,53 @@ class BaseReturningFRTFromSubscriptPointer {
 
 private:
     CopyTrackedDerivedClass *value;
-} FRT;
+} IMMORTAL_FRT;
 
-class DerivedFromBaseReturningFRTFromSubscriptPointer: public BaseReturningFRTFromSubscriptPointer {
-public:
-} FRT;
+class DerivedFromBaseReturningFRTFromSubscriptPointer
+    : public BaseReturningFRTFromSubscriptPointer{public : } IMMORTAL_FRT;
 
 DerivedFromBaseReturningFRTFromSubscriptPointer *makeDerivedFromBaseReturningFRTFromSubscriptPointer() {
     return new DerivedFromBaseReturningFRTFromSubscriptPointer();
 }
+
+struct IMMORTAL_FRT ImmortalBase {
+  int value = 0;
+
+  virtual int get42() const { return 42; }
+  virtual int getOverridden42() const { return 123; }
+  virtual int getIntValue() const { return value; }
+};
+
+struct IMMORTAL_FRT Immortal : public ImmortalBase {
+  static Immortal *_Nonnull create() { return new Immortal(); }
+
+  virtual int getOverridden42() const override { return 42; }
+  virtual void setIntValue(int newValue) { this->value = newValue; }
+};
+
+struct IMMORTAL_FRT DerivedFromImmortal : public Immortal {
+  static DerivedFromImmortal *_Nonnull create() {
+    return new DerivedFromImmortal();
+  }
+};
+
+struct HasDestructor {
+  ~HasDestructor() {}
+};
+
+struct IMMORTAL_FRT Immortal2 {
+public:
+  virtual void virtualMethod(HasDestructor) = 0;
+  virtual void virtualRename() const
+      __attribute__((swift_name("swiftVirtualRename()")));
+};
+
+inline const ImmortalBase *_Nonnull castToImmortalBase(
+    const Immortal *_Nonnull immortal) {
+  return static_cast<const ImmortalBase *>(immortal);
+}
+
+inline const Immortal *_Nonnull castToImmortal(
+    const DerivedFromImmortal *_Nonnull immortal) {
+  return static_cast<const Immortal *>(immortal);
+}