Merge pull request #76717 from swiftlang/egorzhdan/6.0-frt-test-nonobjc

🍒[cxx-interop] C++ reference types are not `AnyObject`s

Author: egorzhdan

lib/Sema/CSSimplify.cpp

@@ -7704,6 +7704,10 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
     // Class and protocol metatypes are interoperable with certain Objective-C
     // runtime classes, but only when ObjC interop is enabled.
 
+    // Foreign reference types do *not* conform to AnyObject.
+    if (type1->isForeignReferenceType() && type2->isAnyObject())
+      return getTypeMatchFailure(locator);
+
     if (getASTContext().LangOpts.EnableObjCInterop) {
       // These conversions are between concrete types that don't need further
       // resolution, so we can consider them immediately solved.
@@ -7713,10 +7717,6 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
                                   type1, type2, locator);
           return getTypeMatchSuccess();
         };
-
-      // Foreign reference types do *not* conform to AnyObject.
-      if (type1->isForeignReferenceType() && type2->isAnyObject())
-        return getTypeMatchFailure(locator);
 
       if (auto meta1 = type1->getAs<MetatypeType>()) {
         if (meta1->getInstanceType()->mayHaveSuperclass()

test/Interop/Cxx/foreign-reference/not-any-object.swift

@@ -2,23 +2,17 @@
 // RUN: split-file %s %t
 // RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unknown -I %t/Inputs  %t/test.swift  -enable-experimental-cxx-interop
 
-// REQUIRES: objc_interop
-
 //--- Inputs/module.modulemap
 module Test {
   header "test.h"
   requires cplusplus
 }
 
 //--- Inputs/test.h
-#include <stdlib.h>
-
-inline void* operator new(unsigned long, void* p) { return p; }
-
 struct __attribute__((swift_attr("import_reference")))
        __attribute__((swift_attr("retain:immortal")))
        __attribute__((swift_attr("release:immortal"))) Empty {
-  static Empty *create() { return new (malloc(sizeof(Empty))) Empty(); }
+  static Empty *create() { return new Empty(); }
 };
 
 //--- test.swift