[cxx-interop] Mark *all* iterators as unsafe; update tests accordingly; fix a few remaining tests that use raw pointers.

Author: zoecarver

lib/ClangImporter/ClangImporter.cpp

@@ -6865,9 +6865,8 @@ bool IsSafeUseOfCxxDecl::evaluate(Evaluator &evaluator,
           return true;
 
         if (hasIteratorAPIAttr(cxxRecordReturnType) ||
-            isIterator(cxxRecordReturnType)) {
-          return !parentIsSelfContained;
-        }
+            isIterator(cxxRecordReturnType))
+          return false;
 
         // Mark this as safe to help our diganostics down the road.
         if (!cxxRecordReturnType->getDefinition()) {

test/Interop/Cxx/stdlib/overlay/Inputs/custom-sequence.h

@@ -24,7 +24,9 @@ struct SimpleCopyAwareSequence {
   SimpleCopyAwareSequence(const SimpleCopyAwareSequence &other) { copiesCount++; }
 };
 
-struct SimpleArrayWrapper {
+struct
+  __attribute__((swift_attr("import_owned")))
+SimpleArrayWrapper {
 private:
   int a[5] = {10, 20, 30, 40, 50};
 
@@ -33,7 +35,9 @@ struct SimpleArrayWrapper {
   const int *end() const __attribute__((returns_nonnull)) { return &a[5]; }
 };
 
-struct SimpleArrayWrapperNullableIterators {
+struct
+  __attribute__((swift_attr("import_owned")))
+SimpleArrayWrapperNullableIterators {
 private:
   int a[5] = {10, 20, 30, 40, 50};
 
@@ -42,7 +46,9 @@ struct SimpleArrayWrapperNullableIterators {
   const int *end() const { return &a[5]; }
 };
 
-struct SimpleEmptySequence {
+struct
+  __attribute__((swift_attr("import_owned")))
+SimpleEmptySequence {
   const int *begin() const { return nullptr; }
   const int *end() const { return nullptr; }
 };