Merge pull request #15184 from adrian-prantl/38324861

Author: swift-ci

lib/IRGen/IRGenDebugInfo.cpp

@@ -1251,14 +1251,15 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     case TypeKind::BuiltinVector: {
       (void)MangledName; // FIXME emit the name somewhere.
       auto *BuiltinVectorTy = BaseTy->castTo<BuiltinVectorType>();
-      DebugTypeInfo ElemDbgTy(DbgTy.getDeclContext(),
-                              DbgTy.getGenericEnvironment(),
-                              BuiltinVectorTy->getElementType(),
-                              DbgTy.StorageType, DbgTy.size, DbgTy.align, true);
-      auto Subscripts = nullptr;
-      return DBuilder.createVectorType(BuiltinVectorTy->getNumElements(),
+      auto ElemTy = BuiltinVectorTy->getElementType();
+      auto ElemDbgTy = DebugTypeInfo::getFromTypeInfo(
+          DbgTy.getDeclContext(), DbgTy.getGenericEnvironment(), ElemTy,
+          IGM.getTypeInfoForUnlowered(ElemTy));
+      unsigned Count = BuiltinVectorTy->getNumElements();
+      auto Subscript = DBuilder.getOrCreateSubrange(0, Count ? Count : -1);
+      return DBuilder.createVectorType(SizeInBits,
                                        AlignInBits, getOrCreateType(ElemDbgTy),
-                                       Subscripts);
+                                       DBuilder.getOrCreateArray(Subscript));
     }
 
     // Reference storage types.

test/DebugInfo/vector.swift

@@ -0,0 +1,20 @@
+// RUN: %target-swift-frontend -emit-ir -g %s -o - -parse-stdlib | %FileCheck %s
+// REQUIRES: OS=macosx
+
+// CHECK: !DICompositeType(tag: DW_TAG_array_type, baseType: ![[FLOAT:[0-9]+]], size: 64, flags: DIFlagVector, elements: ![[ELTS:[0-9]+]])
+// CHECK: ![[FLOAT]] = !DIBasicType(name: "$SBf32_D", size: 32, encoding: DW_ATE_float)
+// CHECK: ![[ELTS]] = !{![[SR:[0-9]+]]}
+// CHECK: ![[SR]] = !DISubrange(count: 2)
+
+
+import Swift
+public struct float2 {
+  public var _vector: Builtin.Vec2xFPIEEE32
+  public subscript(index: Int) -> Float {
+    get {
+      let elt = Builtin.extractelement_Vec2xFPIEEE32_Int32(_vector,
+        Int32(index)._value)
+      return Float(_bits: elt)
+    }
+  }
+}