Merge pull request #10669 from eeckstein/fix-aep

Author: swift-ci

lib/SILOptimizer/Transforms/ArrayElementValuePropagation.cpp

@@ -320,7 +320,14 @@ class ArrayElementPropagation : public SILFunctionTransform {
     for (const ArrayAllocation::AppendContentOfReplacement &Repl : Repls) {
       ArraySemanticsCall AppendContentsOf(Repl.AppendContentOfCall);
       assert(AppendContentsOf && "Must be AppendContentsOf call");
-      
+
+      NominalTypeDecl *AppendSelfArray = AppendContentsOf.getSelf()->getType().
+        getSwiftRValueType()->getAnyNominal();
+
+      // In case if it's not an Array, but e.g. an ContiguousArray
+      if (AppendSelfArray != Ctx.getArrayDecl())
+        continue;
+
       SILType ArrayType = Repl.Array->getType();
       auto *NTD = ArrayType.getSwiftRValueType()->getAnyNominal();
       SubstitutionMap ArraySubMap = ArrayType.getSwiftRValueType()

test/SILOptimizer/array_contentof_opt.swift

@@ -53,3 +53,7 @@ public func testString(_ a: inout [String], s: String) {
   a += [s]
 }
 
+// This is not supported yet. Just check that we don't crash on this.`
+public func dontPropagateContiguousArray(_ a: inout ContiguousArray<UInt8>) {
+  a += [4]
+}