Merge pull request #3323 from compnerd/test-fixes

Author: swift-ci

test/DebugInfo/parent-scope.swift

@@ -19,8 +19,7 @@ public struct Generic<T : P> {
 // But only one concrete type is expected.
 // CHECK: !DISubprogram({{.*}}linkageName: "_TFV4main8Concrete3getfT_GSqSi_",
 // CHECK-SAME:          scope: ![[CONC:[0-9]+]],
-// CHECK: ![[CONC]] = !DICompositeType({{.*}}, name: "Concrete",
-// CHECK-SAME-NOT: DIFlagFwdDecl
+// CHECK: ![[CONC]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Concrete", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, align: {{[0-9]+}}, elements: !{{[0-9]+}}, runtimeLang: DW_LANG_Swift, identifier: "_TtV4main8Concrete")
 public struct Concrete {
   public func get() -> Int? {
     return nil