update baselines of remaining tests

tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl

@@ -7,7 +7,11 @@ E_LessThanDotOpenParen001.fsx(18,27,18,30): typecheck error FS1198: The generic
 
 E_LessThanDotOpenParen001.fsx(18,19,18,67): typecheck error FS0670: This code is not sufficiently generic. The type variable  ^T when  ^T : (static member ( + ) :  ^T *  ^T ->  ^a) could not be generalized because it would escape its scope.
 
-E_LessThanDotOpenParen001.fsx(31,12,31,15): typecheck error FS0043: No overloads match for method 'op_PlusPlusPlus'.Available overloads:
+E_LessThanDotOpenParen001.fsx(31,12,31,15): typecheck error FS0043: No overloads match for method 'op_PlusPlusPlus'.
+
+
+
+Available overloads:
  - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T
 
  - static member TestType.( +++ ) : a:(int -> 'T) * b:TestType<'T,int> ->  ^a when  ^T1 : (static member ( + ) :  ^T1 *  ^T1 ->  ^a)

tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl

@@ -1,5 +1,9 @@
 
-E_Clashing_Values_in_AbstractClass01.fsx(22,11,22,16): typecheck error FS0041: A unique overload for method 'X' could not be determined based on type information prior to this program point. A type annotation may be needed.Candidates:
+E_Clashing_Values_in_AbstractClass01.fsx(22,11,22,16): typecheck error FS0041: A unique overload for method 'X' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Candidates:
  - member Q.X : unit -> decimal
 
  - member Q.X : unit -> float

tests/fsharp/typecheck/sigs/neg06.bsl

@@ -138,6 +138,17 @@ neg06.fs(350,13,350,21): typecheck error FS0039: The value or constructor 'BadTy
 
 neg06.fs(375,9,375,10): typecheck error FS1197: The parameter 'x' was inferred to have byref type. Parameters of byref type must be given an explicit type annotation, e.g. 'x1: byref<int>'. When used, a byref parameter is implicitly dereferenced.
 
-neg06.fs(382,13,382,19): typecheck error FS0041: A unique overload for method 'M1' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C.M1 : x:int -> int, static member C.M1 : x:string -> int
+neg06.fs(382,13,382,19): typecheck error FS0041: A unique overload for method 'M1' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: 'a
+
+
+
+Candidates:
+ - static member C.M1 : x:int -> int
+
+ - static member C.M1 : x:string -> int
 
 neg06.fs(398,13,398,14): typecheck error FS0025: Incomplete pattern matches on this expression. For example, the value '0' may indicate a case not covered by the pattern(s). Unmatched elements will be ignored.

tests/fsharp/typecheck/sigs/neg106.bsl

@@ -6,7 +6,6 @@ neg106.fs(13,18,13,72): typecheck error FS0041: No overloads match for method 'C
 
 
 Arguments given:
-
  - inref<int>
 
  - int
@@ -16,31 +15,27 @@ Arguments given:
 
 
 Available overloads:
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32
 
- - System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float
 
  - System.Threading.Interlocked.CompareExchange(location1: byref<int64>, value: int64, comparand: int64) : int64
 
- - System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int
 
- - System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float
+ - System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint
 
  - System.Threading.Interlocked.CompareExchange(location1: byref<obj>, value: obj, comparand: obj) : obj
 
- - System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint
-
  - System.Threading.Interlocked.CompareExchange<'T when 'T : not struct>(location1: byref<'T>, value: 'T, comparand: 'T) : 'T
 
-
-
 neg106.fs(17,59,17,61): typecheck error FS3236: Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
 
 neg106.fs(17,14,17,68): typecheck error FS0041: No overloads match for method 'CompareExchange'.
 
 
 
 Arguments given:
-
  - inref<int>
 
  - int
@@ -50,23 +45,20 @@ Arguments given:
 
 
 Available overloads:
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32
 
- - System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float
 
  - System.Threading.Interlocked.CompareExchange(location1: byref<int64>, value: int64, comparand: int64) : int64
 
- - System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int
 
- - System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float
+ - System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint
 
  - System.Threading.Interlocked.CompareExchange(location1: byref<obj>, value: obj, comparand: obj) : obj
 
- - System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint
-
  - System.Threading.Interlocked.CompareExchange<'T when 'T : not struct>(location1: byref<'T>, value: 'T, comparand: 'T) : 'T
 
-
-
 neg106.fs(23,35,23,39): typecheck error FS0001: Type mismatch. Expecting a
     'byref<int>'    
 but given a
@@ -84,40 +76,32 @@ neg106.fs(40,18,40,32): typecheck error FS0041: No overloads match for method 'M
 
 
 Arguments given:
-
  - string
 
  - inref<int>
 
 
 
 Available overloads:
-
- - static member C.M : a:string * x:byref<int> -> unit
-
  - static member C.M : a:int * x:byref<int> -> unit
 
-
+ - static member C.M : a:string * x:byref<int> -> unit
 
 neg106.fs(41,19,41,31): typecheck error FS0041: No overloads match for method 'M'.
 
 
 
 Arguments given:
-
  - int
 
  - inref<int>
 
 
 
 Available overloads:
-
- - static member C.M : a:string * x:byref<int> -> unit
-
  - static member C.M : a:int * x:byref<int> -> unit
 
-
+ - static member C.M : a:string * x:byref<int> -> unit
 
 neg106.fs(49,22,49,26): typecheck error FS0001: Type mismatch. Expecting a
     'byref<int>'    

tests/fsharp/typecheck/sigs/neg106.vsbsl

@@ -1,81 +1,63 @@
 
 neg106.fs(8,59,8,61): typecheck error FS3230: A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...'
 
-neg106.fs(13,18,13,72): typecheck error FS0041: No overloads match for method 'CompareExchange'. The available overloads are shown below.
-neg106.fs(13,18,13,72): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<int>'    
-.
-neg106.fs(13,18,13,72): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<int64>, value: int64, comparand: int64) : int64'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<int64>'    
-.
-neg106.fs(13,18,13,72): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<float32>'    
-.
-neg106.fs(13,18,13,72): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<float>'    
-.
-neg106.fs(13,18,13,72): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<obj>, value: obj, comparand: obj) : obj'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<obj>'    
-.
-neg106.fs(13,18,13,72): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<nativeint>'    
-.
-neg106.fs(13,18,13,72): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange<'T when 'T : not struct>(location1: byref<'T>, value: 'T, comparand: 'T) : 'T'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<'a>'    
-.
+neg106.fs(13,18,13,72): typecheck error FS0041: No overloads match for method 'CompareExchange'.
+
+
+
+Arguments given:
+ - inref<int>
+
+ - int
+
+ - int
+
+
+
+Available overloads:
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32
+
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float
+
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int64>, value: int64, comparand: int64) : int64
+
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int
+
+ - System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint
+
+ - System.Threading.Interlocked.CompareExchange(location1: byref<obj>, value: obj, comparand: obj) : obj
+
+ - System.Threading.Interlocked.CompareExchange<'T when 'T : not struct>(location1: byref<'T>, value: 'T, comparand: 'T) : 'T
 
 neg106.fs(17,59,17,61): typecheck error FS3236: Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
 
-neg106.fs(17,14,17,68): typecheck error FS0041: No overloads match for method 'CompareExchange'. The available overloads are shown below.
-neg106.fs(17,14,17,68): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<int>'    
-.
-neg106.fs(17,14,17,68): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<int64>, value: int64, comparand: int64) : int64'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<int64>'    
-.
-neg106.fs(17,14,17,68): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<float32>'    
-.
-neg106.fs(17,14,17,68): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<float>'    
-.
-neg106.fs(17,14,17,68): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<obj>, value: obj, comparand: obj) : obj'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<obj>'    
-.
-neg106.fs(17,14,17,68): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<nativeint>'    
-.
-neg106.fs(17,14,17,68): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange<'T when 'T : not struct>(location1: byref<'T>, value: 'T, comparand: 'T) : 'T'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<'a>'    
-.
+neg106.fs(17,14,17,68): typecheck error FS0041: No overloads match for method 'CompareExchange'.
+
+
+
+Arguments given:
+ - inref<int>
+
+ - int
+
+ - int
+
+
+
+Available overloads:
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32
+
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float
+
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int64>, value: int64, comparand: int64) : int64
+
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int
+
+ - System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint
+
+ - System.Threading.Interlocked.CompareExchange(location1: byref<obj>, value: obj, comparand: obj) : obj
+
+ - System.Threading.Interlocked.CompareExchange<'T when 'T : not struct>(location1: byref<'T>, value: 'T, comparand: 'T) : 'T
 
 neg106.fs(23,35,23,39): typecheck error FS0001: Type mismatch. Expecting a
     'byref<int>'    
@@ -89,29 +71,37 @@ but given a
     'inref<int>'    
 The type 'ByRefKinds.InOut' does not match the type 'ByRefKinds.In'
 
-neg106.fs(40,18,40,32): typecheck error FS0041: No overloads match for method 'M'. The available overloads are shown below.
-neg106.fs(40,18,40,32): typecheck error FS0041: Possible overload: 'static member C.M : a:string * x:byref<int> -> unit'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<int>'    
-.
-neg106.fs(40,18,40,32): typecheck error FS0041: Possible overload: 'static member C.M : a:int * x:byref<int> -> unit'. Type constraint mismatch. The type 
-    'string'    
-is not compatible with type
-    'int'    
-.
-
-neg106.fs(41,19,41,31): typecheck error FS0041: No overloads match for method 'M'. The available overloads are shown below.
-neg106.fs(41,19,41,31): typecheck error FS0041: Possible overload: 'static member C.M : a:string * x:byref<int> -> unit'. Type constraint mismatch. The type 
-    'int'    
-is not compatible with type
-    'string'    
-.
-neg106.fs(41,19,41,31): typecheck error FS0041: Possible overload: 'static member C.M : a:int * x:byref<int> -> unit'. Type constraint mismatch. The type 
-    'inref<int>'    
-is not compatible with type
-    'byref<int>'    
-.
+neg106.fs(40,18,40,32): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Arguments given:
+ - string
+
+ - inref<int>
+
+
+
+Available overloads:
+ - static member C.M : a:int * x:byref<int> -> unit
+
+ - static member C.M : a:string * x:byref<int> -> unit
+
+neg106.fs(41,19,41,31): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Arguments given:
+ - int
+
+ - inref<int>
+
+
+
+Available overloads:
+ - static member C.M : a:int * x:byref<int> -> unit
+
+ - static member C.M : a:string * x:byref<int> -> unit
 
 neg106.fs(49,22,49,26): typecheck error FS0001: Type mismatch. Expecting a
     'byref<int>'