---

yaml
---
r: 346071
b: refs/heads/master
c: d23dc4c
h: refs/heads/master
i:
  346069: 6a251b4
  346067: 3075a9c
  346063: d42446b

Author: bob-wilson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4e9e3a1a3ee2b99727d876cf7b28af42af9f1561
+refs/heads/master: d23dc4c9489952c31b07cfaa9c3300762800ce9a
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/DebugInfo/Constructors.swift

@@ -4,7 +4,7 @@ struct Foo {
   // CHECK: !DISubprogram(name: "init", linkageName: "$s12Constructors3FooV1xACs5Int64V_tcfC",
   // CHECK-SAME:          line: [[@LINE+3]]
   // CHECK-NOT:           scopeLine: 0
-  // CHECK-SAME:          isDefinition: true
+  // CHECK-SAME:          DISPFlagDefinition
   init(x: Int64) {}
   func bar(_ x: Int64) {}
 }

trunk/test/DebugInfo/archetype.swift

@@ -12,7 +12,7 @@ protocol RandomAccessIndex : IntegerArithmetic {
 // archetype.ExistentialTuple <A : RandomAccessIndex, B>(x : A, y : A) -> B
 // CHECK: !DISubprogram(name: "ExistentialTuple", linkageName: "$s9archetype16ExistentialTuple
 // CHECK-SAME:          line: [[@LINE+2]]
-// CHECK-SAME:          isDefinition: true
+// CHECK-SAME:          DISPFlagDefinition
 func ExistentialTuple<T: RandomAccessIndex>(_ x: T, y: T) -> T.Distance {
   // (B, Swift.Bool)
   // CHECK: !DILocalVariable(name: "tmp"

trunk/test/DebugInfo/test-foundation.swift

@@ -32,15 +32,15 @@ class MyObject : NSObject {
   }
 }
 
-// SANITY-DAG: !DISubprogram(name: "blah",{{.*}} line: [[@LINE+2]],{{.*}} isDefinition: true
+// SANITY-DAG: !DISubprogram(name: "blah",{{.*}} line: [[@LINE+2]],{{.*}} DISPFlagDefinition
 extension MyObject {
   @objc func blah() {
     var _ = MyObject()
   }
 }
 
 // SANITY-DAG: ![[NSOBJECT:.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "NSObject",{{.*}} identifier: "$sSo8NSObjectC"
-// SANITY-DAG: !DIGlobalVariable(name: "NsObj",{{.*}} line: [[@LINE+1]],{{.*}} type: ![[NSOBJECT]],{{.*}} isDefinition: true
+// SANITY-DAG: !DIGlobalVariable(name: "NsObj",{{.*}} line: [[@LINE+1]],{{.*}} type: ![[NSOBJECT]],{{.*}} DISPFlagDefinition
 var NsObj: NSObject
 NsObj = MyObject()
 var MyObj: MyObject
@@ -74,7 +74,7 @@ func useOptions(_ opt: URL.BookmarkCreationOptions)
 
 // LOC-CHECK: ![[THUNK:.*]] = distinct !DISubprogram({{.*}}linkageName: "$s4main8MyObjectC0B3ArrSo7NSArrayCvgTo"
 // LOC-CHECK-NOT:                           line:
-// LOC-CHECK-SAME:                          isDefinition: true
+// LOC-CHECK-SAME:                          DISPFlagDefinition
 // LOC-CHECK: ![[DBG]] = !DILocation(line: 0, scope: ![[THUNK]])
 
 // These debug locations should all be in ordered by increasing line number.