Fix bad merge in DebugInfo tests.

(cherry picked from commit ec63c19)

Author: gottesmm

test/DebugInfo/bound-namealiastype.swift

@@ -11,5 +11,5 @@ func dispatch_queue_create() -> dispatch_queue_t! {
 // CHECK: !DIGlobalVariable(name: "queue",
 // CHECK-SAME:              line: [[@LINE+3]], type: ![[T:[0-9]+]]
 // CHECK: ![[T]] = !DICompositeType(tag: DW_TAG_union_type,
-// CHECK-SAME:             identifier: "_TtGSQa4main16dispatch_queue_t_"
+// CHECK-SAME:             identifier: "_TtGSqa4main16dispatch_queue_t_"
 public var queue = dispatch_queue_create()

test/DebugInfo/protocolarg.swift

@@ -7,10 +7,10 @@ public protocol IGiveOutInts {
 }
 
 // CHECK: define {{.*}}@_TF11protocolarg16printSomeNumbersFPS_12IGiveOutInts_T_
-// CHECK: @llvm.dbg.declare(metadata %P11protocolarg12IGiveOutInts_** %
-// CHECK-SAME:              metadata ![[ARG:[0-9]+]], metadata ![[DEREF:[0-9]+]])
 // CHECK: @llvm.dbg.declare(metadata %P11protocolarg12IGiveOutInts_* %
-// CHECK-SAME:              metadata ![[VAR:[0-9]+]], metadata ![[EMPTY:[0-9]+]])
+// CHECK-SAME:              metadata ![[VAR:.*]], metadata ![[EMPTY:.*]])
+// CHECK: @llvm.dbg.declare(metadata %P11protocolarg12IGiveOutInts_** %
+// CHECK-SAME:              metadata ![[ARG:.*]], metadata ![[DEREF:.*]])
 
 // CHECK: ![[EMPTY]] = !DIExpression()
 // FIXME: Should be DW_TAG_interface_type
@@ -22,7 +22,6 @@ public func printSomeNumbers(_ gen: IGiveOutInts) {
   // CHECK: ![[ARG]] = !DILocalVariable(name: "gen", arg: 1,
   // CHECK-SAME:                        line: [[@LINE-4]], type: ![[PT]]
   // CHECK: ![[DEREF]] = !DIExpression(DW_OP_deref)
-  // CHECK: ![[VAR]] = !DILocalVariable(name: "gen", {{.*}} line: [[@LINE-5]]
   markUsed(gen.callMe())
 }