[Diagnostics] NFC: Adjust some binary operator checks to verify exact diagnostic location

If one of the arguments to binary operator is invalid, let's
verify that diagnostic points directly to it.

Author: xedin

test/Constraints/bridging.swift

@@ -261,12 +261,12 @@ func rdar19831919() {
 
 // <rdar://problem/19831698> Incorrect 'as' fixits offered for invalid literal expressions
 func rdar19831698() {
-  var v70 = true + 1 // expected-error{{cannot convert value of type 'Bool' to expected argument type 'Int'}}
+  var v70 = true + 1 // expected-error@:13 {{cannot convert value of type 'Bool' to expected argument type 'Int'}}
   var v71 = true + 1.0 // expected-error{{binary operator '+' cannot be applied to operands of type 'Bool' and 'Double'}}
 // expected-note@-1{{overloads for '+'}}
   var v72 = true + true // expected-error{{binary operator '+' cannot be applied to two 'Bool' operands}}
-  var v73 = true + [] // expected-error{{cannot convert value of type 'Bool' to expected argument type 'Array<Bool>'}}
-  var v75 = true + "str" // expected-error {{cannot convert value of type 'Bool' to expected argument type 'String'}}
+  var v73 = true + [] // expected-error@:13 {{cannot convert value of type 'Bool' to expected argument type 'Array<Bool>'}}
+  var v75 = true + "str" // expected-error@:13 {{cannot convert value of type 'Bool' to expected argument type 'String'}}
 }
 
 // <rdar://problem/19836341> Incorrect fixit for NSString? to String? conversions

test/Constraints/diagnostics.swift

@@ -182,7 +182,7 @@ func recArea(_ h: Int, w : Int) {
 
 // <rdar://problem/17224804> QoI: Error In Ternary Condition is Wrong
 func r17224804(_ monthNumber : Int) {
-  // expected-error @+1 {{cannot convert value of type 'Int' to expected argument type 'String'}}
+  // expected-error@+1:49 {{cannot convert value of type 'Int' to expected argument type 'String'}}
   let monthString = (monthNumber <= 9) ? ("0" + monthNumber) : String(monthNumber)
 }
 
@@ -720,7 +720,7 @@ func r24251022() {
   _ = a + b // expected-error {{binary operator '+' cannot be applied to operands of type 'Int' and 'UInt32'}} expected-note {{overloads for '+' exist with these partially matching parameter lists: (Int, Int), (UInt32, UInt32)}}
   a += a +
     b // expected-error {{cannot convert value of type 'UInt32' to expected argument type 'Int'}}
-  a += b  // expected-error {{cannot convert value of type 'UInt32' to expected argument type 'Int'}}
+  a += b  // expected-error@:8 {{cannot convert value of type 'UInt32' to expected argument type 'Int'}}
 }
 
 func overloadSetResultType(_ a : Int, b : Int) -> Int {

test/Misc/misc_diagnostics.swift

@@ -14,7 +14,7 @@ if let realRoomName = roomName as! NSString { // expected-warning{{forced cast f
 
 var pi = 3.14159265358979
 var d: CGFloat = 2.0
-var dpi:CGFloat = d*pi // expected-error{{cannot convert value of type 'Double' to expected argument type 'CGFloat'}}
+var dpi:CGFloat = d*pi // expected-error@:21{{cannot convert value of type 'Double' to expected argument type 'CGFloat'}}
 
 let ff: CGFloat = floorf(20.0) // expected-error{{cannot convert value of type 'Float' to specified type 'CGFloat'}}
 

test/NameBinding/multi-file-with-main.swift

@@ -1,7 +1,7 @@
 // RUN: %target-swift-frontend -typecheck -enable-source-import -primary-file %s %S/Inputs/multi-file-with-main/main.swift -module-name=MultiFile -sdk "" -verify
 
 func testOperator() {
-  let x: Int = 1 +++ "abc" // expected-error {{cannot convert value of type 'String' to expected argument type 'Int'}}
+  let x: Int = 1 +++ "abc" // expected-error@:22 {{cannot convert value of type 'String' to expected argument type 'Int'}}
 
   _ = x
 }