From 1f68b1775f040de54d185d298309683eb774274d Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Mon, 29 Apr 2019 23:05:41 -0700
Subject: [PATCH 01/96] migrate (as a separate copy) fsharpqa tests that are
 going to be impacted by #6596

the baseline files are empty on purpose, expecting CI failure reporting those tests, I intend to update the baseline and clean up the comments / xml tags from fsharpqa syntax in later commit, and then remove those specific tests altogether from fsharpqa if this is OK with the maintainers.
---
 .../E_LeftToRightOverloadResolution01.fsx     |  2 ++
 .../inference/E_OneTypeVariable03.fsx         |  3 +++
 .../inference/E_OneTypeVariable03rec.fsx      |  3 +++
 .../E_TwoDifferentTypeVariables01.fsx         |  4 ++++
 .../E_TwoDifferentTypeVariables01rec.fsx      |  5 +++++
 .../E_TwoDifferentTypeVariablesGen00rec.fsx   | 20 +++++++++++++++++++
 .../inference/E_TwoEqualTypeVariables02.fsx   |  8 ++++++++
 .../E_TwoEqualYypeVariables02rec.fsx          |  8 ++++++++
 .../E_Clashing_Values_in_AbstractClass03.fsx  |  2 ++
 .../E_Clashing_Values_in_AbstractClass04.fsx  |  4 ++++
 tests/fsharp/tests.fs                         |  3 +--
 11 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.fsx b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.fsx
index 9a067fb5d7..49f17817d1 100644
--- a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.fsx
+++ b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.fsx
@@ -10,3 +10,5 @@ Array.iter (fun it -> System.Console.WriteLine(it)) array
 
 array |> Array.iter (fun it -> System.Console.WriteLine(it))
 
+//<Expects status="error" span="(7,23-7,51)" id="FS0041">A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: System\.Console\.WriteLine\(buffer: char \[\]\) : unit, System\.Console\.WriteLine\(format: string, \[<System\.ParamArray>\] arg: obj \[\]\) : unit, System\.Console\.WriteLine\(value: bool\) : unit, System\.Console\.WriteLine\(value: char\) : unit, System\.Console\.WriteLine\(value: decimal\) : unit, System\.Console\.WriteLine\(value: float\) : unit, System\.Console\.WriteLine\(value: float32\) : unit, System\.Console\.WriteLine\(value: int\) : unit, System\.Console\.WriteLine\(value: int64\) : unit, System\.Console\.WriteLine\(value: obj\) : unit, System\.Console\.WriteLine\(value: string\) : unit, System\.Console\.WriteLine\(value: uint32\) : unit, System\.Console\.WriteLine\(value: uint64\) : unit$</Expects>
+//<Expects status="error" span="(9,23-9,51)" id="FS0041">A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: System\.Console\.WriteLine\(buffer: char \[\]\) : unit, System\.Console\.WriteLine\(format: string, \[<System\.ParamArray>\] arg: obj \[\]\) : unit, System\.Console\.WriteLine\(value: bool\) : unit, System\.Console\.WriteLine\(value: char\) : unit, System\.Console\.WriteLine\(value: decimal\) : unit, System\.Console\.WriteLine\(value: float\) : unit, System\.Console\.WriteLine\(value: float32\) : unit, System\.Console\.WriteLine\(value: int\) : unit, System\.Console\.WriteLine\(value: int64\) : unit, System\.Console\.WriteLine\(value: obj\) : unit, System\.Console\.WriteLine\(value: string\) : unit, System\.Console\.WriteLine\(value: uint32\) : unit, System\.Console\.WriteLine\(value: uint64\) : unit$</Expects>
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03.fsx b/tests/fsharp/conformance/inference/E_OneTypeVariable03.fsx
index 727d3db533..7234b21580 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03.fsx
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03.fsx
@@ -60,3 +60,6 @@ module M3 =
     let gB23    (x:'a) (y:int) = C23.M(x,y)           // expect: ambiguity error
     let gB123   (x:'a) (y:int) = C123.M(x,y)          // expect: ambiguous on 2,3
 
+//<Expects status="error" span="(60,34-60,44)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C23\.M : x:'a \* y:'b -> Two, static member C23\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects status="error" span="(61,34-61,45)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C123\.M : x:'a \* y:'a -> One, static member C123\.M : x:'a \* y:'b -> Two, static member C123\.M : x:'a \* y:int -> Three$</Expects>
+
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.fsx b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.fsx
index 011743fa44..8d69e6141c 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.fsx
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.fsx
@@ -59,3 +59,6 @@ type C1234 =
 module M3Rec =
     let rec gB23    (x:'a) (y:int) = C23.M(x,y)           // expect: ambiguity error
     let rec gB123   (x:'a) (y:int) = C123.M(x,y)          // expect: ambiguous on 2,3
+
+//<Expects status="error" span="(60,38-60,48)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C23\.M : x:'a \* y:'b -> Two, static member C23\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects status="error" span="(61,38-61,49)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C123\.M : x:'a \* y:'a -> One, static member C123\.M : x:'a \* y:'b -> Two, static member C123\.M : x:'a \* y:int -> Three$</Expects>
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.fsx b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.fsx
index d9504aabec..1e64b44650 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.fsx
@@ -2,6 +2,10 @@
 // Regression test for FSHARP1.0:4758
 // Type Inference
 // Check Method Disambiguation When User Generic Variable Get Instantiated By Overload Resolution
+//<Expects status="error" span="(65,33-65,43)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects status="error" span="(66,33-66,43)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C24\.M : x:'a \* y:'b -> Two, static member C24\.M : x:'a \* y:C -> Four$</Expects>
+//<Expects status="error" span="(67,33-67,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects status="error" span="(68,33-68,46)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
 
 // These different return types are used to determine which overload got chosen
 type One = | One
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.fsx b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.fsx
index 744d839aaf..0aa04bd669 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.fsx
@@ -61,3 +61,8 @@ module M1Rec =
     let rec gB24    (x:'a) (y:'b) = C24.M(x,y) = Four    // expect: ambiguity error 
     let rec gC13    (x:'a) (y:'b) = C13.M<'a>(x,y)           // expect: ambiguity error (and note: both would instantiate 'a or 'b)
     let rec gD13    (x:'a) (y:'b) = C13.M<_>(x,y)            // expect: ambiguity error (and note: both would instantiate 'a or 'b)
+
+//<Expects status="error" span="(60,37-60,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects status="error" span="(61,37-61,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C24\.M : x:'a \* y:'b -> Two, static member C24\.M : x:'a \* y:C -> Four$</Expects>
+//<Expects status="error" span="(62,37-62,51)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects status="error" span="(63,37-63,50)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.fsx b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.fsx
index 304f668142..b4c54e0eaa 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.fsx
@@ -67,3 +67,23 @@ module M0Rec =
     let rec      gD1<'a,'b> (x:'a) (y:'b) = C1.M<_>(x,y) = One       // expect: type error
     let rec     gD13<'a,'b> (x:'a) (y:'b) = C13.M<_>(x,y)            // expect: ambiguity error (and note: both would instantiate 'a or 'b)
     let rec      gD3<'a,'b> (x:'a) (y:'b) = C3.M<_>(x,y)  = Three    // expect: error
+
+//<Expects spans="(60,52-60,53)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
+//<Expects spans="(60,18-60,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
+//<Expects spans="(60,18-60,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
+//<Expects spans="(61,52-61,53)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type 'int'\.</Expects>
+//<Expects spans="(61,18-61,42)" status="error" id="FS0043">The type ''b' does not match the type 'int'</Expects>
+//<Expects status="error" span="(63,45-63,55)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects spans="(63,56-63,57)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
+//<Expects spans="(63,18-63,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
+//<Expects spans="(63,18-63,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
+//<Expects spans="(64,54-64,55)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
+//<Expects spans="(64,56-64,57)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type 'int'\.</Expects>
+//<Expects spans="(64,18-64,42)" status="error" id="FS0043">The type ''a' does not match the type 'int'</Expects>
+//<Expects status="error" span="(66,45-66,59)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects spans="(66,55-66,56)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
+//<Expects spans="(66,18-66,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
+//<Expects spans="(66,18-66,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
+//<Expects status="error" span="(68,45-68,58)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects spans="(68,55-68,56)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type 'int'\.</Expects>
+//<Expects spans="(68,18-68,42)" status="error" id="FS0043">The type ''b' does not match the type 'int'</Expects>
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.fsx b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.fsx
index e389b65c9b..3eaf2c2e52 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.fsx
@@ -64,3 +64,11 @@ module M2 =
     let gB123   (x:'a) (y:'a) = C123.M(x,y)          // expect: ambiguity error
     let gB1234  (x:'a) (y:'a) = C1234.M(x,y)         // expect: ambiguity error
     let gD14    (x:'a) (y:'a) = C14.M<_>(x,y) = One      // expect: ambiguity error
+
+//<Expects status="error" span="(61,33-61,43)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C12\.M : x:'a \* y:'a -> One, static member C12\.M : x:'a \* y:'b -> Two$</Expects>
+//<Expects status="error" span="(62,33-62,43)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C14\.M : x:'a \* y:'a -> One, static member C14\.M : x:'a \* y:C -> Four$</Expects>
+//<Expects status="error" span="(63,33-63,43)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C24\.M : x:'a \* y:'b -> Two, static member C24\.M : x:'a \* y:C -> Four$</Expects>
+//<Expects status="error" span="(64,33-64,44)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C123\.M : x:'a \* y:'a -> One, static member C123\.M : x:'a \* y:'b -> Two, static member C123\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects status="error" span="(65,33-65,45)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C1234\.M : x:'a \* y:'a -> One, static member C1234\.M : x:'a \* y:'b -> Two, static member C1234\.M : x:'a \* y:C -> Four, static member C1234\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects status="error" span="(66,33-66,46)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C14\.M : x:'a \* y:'a -> One, static member C14\.M : x:'a \* y:C -> Four$</Expects>
+
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.fsx b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.fsx
index 7cdad8df3f..4aec28a348 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.fsx
@@ -63,3 +63,11 @@ module M2Rec =
     let rec gB123   (x:'a) (y:'a) = C123.M(x,y)          // expect: ambiguity error
     let rec gB1234  (x:'a) (y:'a) = C1234.M(x,y)         // expect: ambiguity error
     let rec gD14    (x:'a) (y:'a) = C14.M<_>(x,y) = One      // expect: ambiguity error
+
+//<Expects status="error" span="(60,37-60,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C12\.M : x:'a \* y:'a -> One, static member C12\.M : x:'a \* y:'b -> Two$</Expects>
+//<Expects status="error" span="(61,37-61,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C14\.M : x:'a \* y:'a -> One, static member C14\.M : x:'a \* y:C -> Four$</Expects>
+//<Expects status="error" span="(62,37-62,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C24\.M : x:'a \* y:'b -> Two, static member C24\.M : x:'a \* y:C -> Four$</Expects>
+//<Expects status="error" span="(63,37-63,48)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C123\.M : x:'a \* y:'a -> One, static member C123\.M : x:'a \* y:'b -> Two, static member C123\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects status="error" span="(64,37-64,49)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C1234\.M : x:'a \* y:'a -> One, static member C1234\.M : x:'a \* y:'b -> Two, static member C1234\.M : x:'a \* y:C -> Four, static member C1234\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects status="error" span="(65,37-65,50)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C14\.M : x:'a \* y:'a -> One, static member C14\.M : x:'a \* y:C -> Four$</Expects>
+
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.fsx b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.fsx
index dffcb92a09..a796a461d9 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.fsx
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.fsx
@@ -1,6 +1,8 @@
 // #Regression #Conformance #TypeInference 
 // Regression test for FSHARP1.0:5939
 // With generics
+//<Expects status="error" span="(18,18-18,25)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: abstract member D\.M : 'T -> int, abstract member D\.M : 'U -> string$</Expects>
+//<Expects status="error" span="(19,18-19,25)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: abstract member D\.M : 'T -> int, abstract member D\.M : 'U -> string$</Expects>
 [<AbstractClass>]
 type D<'T,'U>() = 
     abstract M : 'T  -> int
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.fsx b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.fsx
index 9688c3b9b4..9c2e3ee866 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.fsx
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.fsx
@@ -1,6 +1,10 @@
 // #Regression #Conformance #TypeInference 
 // Regression test for FSHARP1.0:5939
 // With generics
+//<Expects status="error" span="(20,18-20,25)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: abstract member D\.M : 'T -> int, abstract member D\.M : 'U -> string$</Expects>
+//<Expects status="error" span="(21,18-21,25)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: abstract member D\.M : 'T -> int, abstract member D\.M : 'U -> string$</Expects>
+//<Expects status="notin" span="(21,5-21,6)" id="FS0037">Duplicate definition of value 'x'$</Expects>
+
 [<AbstractClass>]
 type D<'T,'U>() = 
     abstract M : 'T  -> int
diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index f382963b76..7d6bac8987 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -2948,7 +2948,6 @@ module GeneratedSignatureTests =
     let ``measures-GENERATED_SIGNATURE`` () = singleTestBuildAndRun "core/measures" GENERATED_SIGNATURE
 #endif
 
-#if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
 module OverloadResolution =
     module FSharpQAMigrated = 
         let [<Test>] ``Conformance\Expressions\SyntacticSugar (E_Slices01.fs)`` () = singleNegTest (testConfig "conformance/expressions/syntacticsugar") "E_Slices01"
@@ -2963,4 +2962,4 @@ module OverloadResolution =
         let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass01.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass01"
         let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass03.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass03"
         let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass04.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass04"
-#endif
+            
\ No newline at end of file

From d0630a36de71597075454e1989bada1028a7bfa6 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Mon, 29 Apr 2019 23:31:37 -0700
Subject: [PATCH 02/96] update the .bsl files

---
 .../inference/E_TwoDifferentTypeVariables01.bsl           | 8 ++++----
 .../E_Clashing_Values_in_AbstractClass01.bsl              | 2 +-
 .../E_Clashing_Values_in_AbstractClass03.bsl              | 4 ++--
 .../E_Clashing_Values_in_AbstractClass04.bsl              | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
index ad9bf2298f..2019f802c7 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
@@ -1,8 +1,8 @@
 
-E_TwoDifferentTypeVariables01.fsx(61,33,61,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariables01.fsx(65,33,65,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
 
-E_TwoDifferentTypeVariables01.fsx(62,33,62,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C24.M : x:'a * y:'b -> Two, static member C24.M : x:'a * y:C -> Four
+E_TwoDifferentTypeVariables01.fsx(66,33,66,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C24.M : x:'a * y:'b -> Two, static member C24.M : x:'a * y:C -> Four
 
-E_TwoDifferentTypeVariables01.fsx(63,33,63,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariables01.fsx(67,33,67,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
 
-E_TwoDifferentTypeVariables01.fsx(64,33,64,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariables01.fsx(68,33,68,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
index 89cb5ac771..1ec8b172f2 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
@@ -1,2 +1,2 @@
 
-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
+E_Clashing_Values_in_AbstractClass01.fsx(27,11,27,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
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
index 76328f6557..2770e1b360 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
@@ -1,4 +1,4 @@
 
-E_Clashing_Values_in_AbstractClass03.fsx(16,18,16,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
+E_Clashing_Values_in_AbstractClass03.fsx(18,18,18,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
 
-E_Clashing_Values_in_AbstractClass03.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
+E_Clashing_Values_in_AbstractClass03.fsx(19,18,19,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
index af3ee273c4..f2ae6c652d 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
@@ -1,4 +1,4 @@
 
-E_Clashing_Values_in_AbstractClass04.fsx(16,18,16,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
+E_Clashing_Values_in_AbstractClass04.fsx(20,18,20,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
 
-E_Clashing_Values_in_AbstractClass04.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
+E_Clashing_Values_in_AbstractClass04.fsx(21,18,21,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string

From c01329f58a00aee3994a205b1336fa3d666ed6b8 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 30 Apr 2019 00:03:22 -0700
Subject: [PATCH 03/96] remove comments that are handled by baseline files,
 update baseline files

---
 .../E_LeftToRightOverloadResolution01.fsx     |  2 --
 .../inference/E_OneTypeVariable03.fsx         |  3 ---
 .../inference/E_OneTypeVariable03rec.fsx      |  3 ---
 .../E_TwoDifferentTypeVariables01.bsl         |  8 ++++----
 .../E_TwoDifferentTypeVariables01.fsx         |  4 ----
 .../E_TwoDifferentTypeVariables01rec.fsx      |  5 -----
 .../E_TwoDifferentTypeVariablesGen00rec.fsx   | 20 -------------------
 .../inference/E_TwoEqualTypeVariables02.fsx   |  8 --------
 .../E_TwoEqualYypeVariables02rec.fsx          |  8 --------
 .../E_Clashing_Values_in_AbstractClass01.bsl  |  2 +-
 .../E_Clashing_Values_in_AbstractClass03.bsl  |  4 ++--
 .../E_Clashing_Values_in_AbstractClass03.fsx  |  2 --
 .../E_Clashing_Values_in_AbstractClass04.bsl  |  4 ++--
 .../E_Clashing_Values_in_AbstractClass04.fsx  |  4 ----
 14 files changed, 9 insertions(+), 68 deletions(-)

diff --git a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.fsx b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.fsx
index 49f17817d1..9a067fb5d7 100644
--- a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.fsx
+++ b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.fsx
@@ -10,5 +10,3 @@ Array.iter (fun it -> System.Console.WriteLine(it)) array
 
 array |> Array.iter (fun it -> System.Console.WriteLine(it))
 
-//<Expects status="error" span="(7,23-7,51)" id="FS0041">A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: System\.Console\.WriteLine\(buffer: char \[\]\) : unit, System\.Console\.WriteLine\(format: string, \[<System\.ParamArray>\] arg: obj \[\]\) : unit, System\.Console\.WriteLine\(value: bool\) : unit, System\.Console\.WriteLine\(value: char\) : unit, System\.Console\.WriteLine\(value: decimal\) : unit, System\.Console\.WriteLine\(value: float\) : unit, System\.Console\.WriteLine\(value: float32\) : unit, System\.Console\.WriteLine\(value: int\) : unit, System\.Console\.WriteLine\(value: int64\) : unit, System\.Console\.WriteLine\(value: obj\) : unit, System\.Console\.WriteLine\(value: string\) : unit, System\.Console\.WriteLine\(value: uint32\) : unit, System\.Console\.WriteLine\(value: uint64\) : unit$</Expects>
-//<Expects status="error" span="(9,23-9,51)" id="FS0041">A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: System\.Console\.WriteLine\(buffer: char \[\]\) : unit, System\.Console\.WriteLine\(format: string, \[<System\.ParamArray>\] arg: obj \[\]\) : unit, System\.Console\.WriteLine\(value: bool\) : unit, System\.Console\.WriteLine\(value: char\) : unit, System\.Console\.WriteLine\(value: decimal\) : unit, System\.Console\.WriteLine\(value: float\) : unit, System\.Console\.WriteLine\(value: float32\) : unit, System\.Console\.WriteLine\(value: int\) : unit, System\.Console\.WriteLine\(value: int64\) : unit, System\.Console\.WriteLine\(value: obj\) : unit, System\.Console\.WriteLine\(value: string\) : unit, System\.Console\.WriteLine\(value: uint32\) : unit, System\.Console\.WriteLine\(value: uint64\) : unit$</Expects>
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03.fsx b/tests/fsharp/conformance/inference/E_OneTypeVariable03.fsx
index 7234b21580..727d3db533 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03.fsx
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03.fsx
@@ -60,6 +60,3 @@ module M3 =
     let gB23    (x:'a) (y:int) = C23.M(x,y)           // expect: ambiguity error
     let gB123   (x:'a) (y:int) = C123.M(x,y)          // expect: ambiguous on 2,3
 
-//<Expects status="error" span="(60,34-60,44)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C23\.M : x:'a \* y:'b -> Two, static member C23\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects status="error" span="(61,34-61,45)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C123\.M : x:'a \* y:'a -> One, static member C123\.M : x:'a \* y:'b -> Two, static member C123\.M : x:'a \* y:int -> Three$</Expects>
-
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.fsx b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.fsx
index 8d69e6141c..011743fa44 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.fsx
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.fsx
@@ -59,6 +59,3 @@ type C1234 =
 module M3Rec =
     let rec gB23    (x:'a) (y:int) = C23.M(x,y)           // expect: ambiguity error
     let rec gB123   (x:'a) (y:int) = C123.M(x,y)          // expect: ambiguous on 2,3
-
-//<Expects status="error" span="(60,38-60,48)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C23\.M : x:'a \* y:'b -> Two, static member C23\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects status="error" span="(61,38-61,49)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C123\.M : x:'a \* y:'a -> One, static member C123\.M : x:'a \* y:'b -> Two, static member C123\.M : x:'a \* y:int -> Three$</Expects>
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
index 2019f802c7..ad9bf2298f 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
@@ -1,8 +1,8 @@
 
-E_TwoDifferentTypeVariables01.fsx(65,33,65,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariables01.fsx(61,33,61,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
 
-E_TwoDifferentTypeVariables01.fsx(66,33,66,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C24.M : x:'a * y:'b -> Two, static member C24.M : x:'a * y:C -> Four
+E_TwoDifferentTypeVariables01.fsx(62,33,62,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C24.M : x:'a * y:'b -> Two, static member C24.M : x:'a * y:C -> Four
 
-E_TwoDifferentTypeVariables01.fsx(67,33,67,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariables01.fsx(63,33,63,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
 
-E_TwoDifferentTypeVariables01.fsx(68,33,68,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariables01.fsx(64,33,64,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.fsx b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.fsx
index 1e64b44650..d9504aabec 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.fsx
@@ -2,10 +2,6 @@
 // Regression test for FSHARP1.0:4758
 // Type Inference
 // Check Method Disambiguation When User Generic Variable Get Instantiated By Overload Resolution
-//<Expects status="error" span="(65,33-65,43)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects status="error" span="(66,33-66,43)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C24\.M : x:'a \* y:'b -> Two, static member C24\.M : x:'a \* y:C -> Four$</Expects>
-//<Expects status="error" span="(67,33-67,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects status="error" span="(68,33-68,46)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
 
 // These different return types are used to determine which overload got chosen
 type One = | One
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.fsx b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.fsx
index 0aa04bd669..744d839aaf 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.fsx
@@ -61,8 +61,3 @@ module M1Rec =
     let rec gB24    (x:'a) (y:'b) = C24.M(x,y) = Four    // expect: ambiguity error 
     let rec gC13    (x:'a) (y:'b) = C13.M<'a>(x,y)           // expect: ambiguity error (and note: both would instantiate 'a or 'b)
     let rec gD13    (x:'a) (y:'b) = C13.M<_>(x,y)            // expect: ambiguity error (and note: both would instantiate 'a or 'b)
-
-//<Expects status="error" span="(60,37-60,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects status="error" span="(61,37-61,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C24\.M : x:'a \* y:'b -> Two, static member C24\.M : x:'a \* y:C -> Four$</Expects>
-//<Expects status="error" span="(62,37-62,51)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects status="error" span="(63,37-63,50)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.fsx b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.fsx
index b4c54e0eaa..304f668142 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.fsx
@@ -67,23 +67,3 @@ module M0Rec =
     let rec      gD1<'a,'b> (x:'a) (y:'b) = C1.M<_>(x,y) = One       // expect: type error
     let rec     gD13<'a,'b> (x:'a) (y:'b) = C13.M<_>(x,y)            // expect: ambiguity error (and note: both would instantiate 'a or 'b)
     let rec      gD3<'a,'b> (x:'a) (y:'b) = C3.M<_>(x,y)  = Three    // expect: error
-
-//<Expects spans="(60,52-60,53)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
-//<Expects spans="(60,18-60,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
-//<Expects spans="(60,18-60,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
-//<Expects spans="(61,52-61,53)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type 'int'\.</Expects>
-//<Expects spans="(61,18-61,42)" status="error" id="FS0043">The type ''b' does not match the type 'int'</Expects>
-//<Expects status="error" span="(63,45-63,55)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects spans="(63,56-63,57)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
-//<Expects spans="(63,18-63,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
-//<Expects spans="(63,18-63,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
-//<Expects spans="(64,54-64,55)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
-//<Expects spans="(64,56-64,57)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type 'int'\.</Expects>
-//<Expects spans="(64,18-64,42)" status="error" id="FS0043">The type ''a' does not match the type 'int'</Expects>
-//<Expects status="error" span="(66,45-66,59)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects spans="(66,55-66,56)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
-//<Expects spans="(66,18-66,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
-//<Expects spans="(66,18-66,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
-//<Expects status="error" span="(68,45-68,58)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects spans="(68,55-68,56)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type 'int'\.</Expects>
-//<Expects spans="(68,18-68,42)" status="error" id="FS0043">The type ''b' does not match the type 'int'</Expects>
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.fsx b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.fsx
index 3eaf2c2e52..e389b65c9b 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.fsx
@@ -64,11 +64,3 @@ module M2 =
     let gB123   (x:'a) (y:'a) = C123.M(x,y)          // expect: ambiguity error
     let gB1234  (x:'a) (y:'a) = C1234.M(x,y)         // expect: ambiguity error
     let gD14    (x:'a) (y:'a) = C14.M<_>(x,y) = One      // expect: ambiguity error
-
-//<Expects status="error" span="(61,33-61,43)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C12\.M : x:'a \* y:'a -> One, static member C12\.M : x:'a \* y:'b -> Two$</Expects>
-//<Expects status="error" span="(62,33-62,43)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C14\.M : x:'a \* y:'a -> One, static member C14\.M : x:'a \* y:C -> Four$</Expects>
-//<Expects status="error" span="(63,33-63,43)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C24\.M : x:'a \* y:'b -> Two, static member C24\.M : x:'a \* y:C -> Four$</Expects>
-//<Expects status="error" span="(64,33-64,44)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C123\.M : x:'a \* y:'a -> One, static member C123\.M : x:'a \* y:'b -> Two, static member C123\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects status="error" span="(65,33-65,45)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C1234\.M : x:'a \* y:'a -> One, static member C1234\.M : x:'a \* y:'b -> Two, static member C1234\.M : x:'a \* y:C -> Four, static member C1234\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects status="error" span="(66,33-66,46)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C14\.M : x:'a \* y:'a -> One, static member C14\.M : x:'a \* y:C -> Four$</Expects>
-
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.fsx b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.fsx
index 4aec28a348..7cdad8df3f 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.fsx
@@ -63,11 +63,3 @@ module M2Rec =
     let rec gB123   (x:'a) (y:'a) = C123.M(x,y)          // expect: ambiguity error
     let rec gB1234  (x:'a) (y:'a) = C1234.M(x,y)         // expect: ambiguity error
     let rec gD14    (x:'a) (y:'a) = C14.M<_>(x,y) = One      // expect: ambiguity error
-
-//<Expects status="error" span="(60,37-60,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C12\.M : x:'a \* y:'a -> One, static member C12\.M : x:'a \* y:'b -> Two$</Expects>
-//<Expects status="error" span="(61,37-61,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C14\.M : x:'a \* y:'a -> One, static member C14\.M : x:'a \* y:C -> Four$</Expects>
-//<Expects status="error" span="(62,37-62,47)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C24\.M : x:'a \* y:'b -> Two, static member C24\.M : x:'a \* y:C -> Four$</Expects>
-//<Expects status="error" span="(63,37-63,48)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C123\.M : x:'a \* y:'a -> One, static member C123\.M : x:'a \* y:'b -> Two, static member C123\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects status="error" span="(64,37-64,49)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C1234\.M : x:'a \* y:'a -> One, static member C1234\.M : x:'a \* y:'b -> Two, static member C1234\.M : x:'a \* y:C -> Four, static member C1234\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects status="error" span="(65,37-65,50)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C14\.M : x:'a \* y:'a -> One, static member C14\.M : x:'a \* y:C -> Four$</Expects>
-
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
index 1ec8b172f2..89cb5ac771 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
@@ -1,2 +1,2 @@
 
-E_Clashing_Values_in_AbstractClass01.fsx(27,11,27,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
+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
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
index 2770e1b360..76328f6557 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
@@ -1,4 +1,4 @@
 
-E_Clashing_Values_in_AbstractClass03.fsx(18,18,18,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
+E_Clashing_Values_in_AbstractClass03.fsx(16,18,16,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
 
-E_Clashing_Values_in_AbstractClass03.fsx(19,18,19,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
+E_Clashing_Values_in_AbstractClass03.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.fsx b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.fsx
index a796a461d9..dffcb92a09 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.fsx
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.fsx
@@ -1,8 +1,6 @@
 // #Regression #Conformance #TypeInference 
 // Regression test for FSHARP1.0:5939
 // With generics
-//<Expects status="error" span="(18,18-18,25)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: abstract member D\.M : 'T -> int, abstract member D\.M : 'U -> string$</Expects>
-//<Expects status="error" span="(19,18-19,25)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: abstract member D\.M : 'T -> int, abstract member D\.M : 'U -> string$</Expects>
 [<AbstractClass>]
 type D<'T,'U>() = 
     abstract M : 'T  -> int
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
index f2ae6c652d..af3ee273c4 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
@@ -1,4 +1,4 @@
 
-E_Clashing_Values_in_AbstractClass04.fsx(20,18,20,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
+E_Clashing_Values_in_AbstractClass04.fsx(16,18,16,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
 
-E_Clashing_Values_in_AbstractClass04.fsx(21,18,21,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
+E_Clashing_Values_in_AbstractClass04.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.fsx b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.fsx
index 9c2e3ee866..9688c3b9b4 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.fsx
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.fsx
@@ -1,10 +1,6 @@
 // #Regression #Conformance #TypeInference 
 // Regression test for FSHARP1.0:5939
 // With generics
-//<Expects status="error" span="(20,18-20,25)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: abstract member D\.M : 'T -> int, abstract member D\.M : 'U -> string$</Expects>
-//<Expects status="error" span="(21,18-21,25)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: abstract member D\.M : 'T -> int, abstract member D\.M : 'U -> string$</Expects>
-//<Expects status="notin" span="(21,5-21,6)" id="FS0037">Duplicate definition of value 'x'$</Expects>
-
 [<AbstractClass>]
 type D<'T,'U>() = 
     abstract M : 'T  -> int

From 56fbe7a812cdae97f0b0fb6f608d505d41a91fc0 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 30 Apr 2019 00:14:03 -0700
Subject: [PATCH 04/96] remove the migrated tests from fsharpqa tests

---
 .../Source/Conformance/Expressions/SyntacticSugar/env.lst        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/fsharpqa/Source/Conformance/Expressions/SyntacticSugar/env.lst b/tests/fsharpqa/Source/Conformance/Expressions/SyntacticSugar/env.lst
index 306d1afce9..857cdbb152 100644
--- a/tests/fsharpqa/Source/Conformance/Expressions/SyntacticSugar/env.lst
+++ b/tests/fsharpqa/Source/Conformance/Expressions/SyntacticSugar/env.lst
@@ -1,5 +1,4 @@
 	SOURCE=infix_op01.fs	# Sample negative test for infix operators
-	SOURCE=Slices01.fs	# Slices01.fs
 	SOURCE=Slices02.fs	# Slices02.fs
 
 # This one is a bit odd because peverify will fail

From 632f8ee971bbbea36c3e82e2f6c0ccfee2b55cd5 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 30 Apr 2019 02:31:24 -0700
Subject: [PATCH 05/96] need to be more careful when migrating those

---
 .../Source/Conformance/Expressions/SyntacticSugar/env.lst        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/fsharpqa/Source/Conformance/Expressions/SyntacticSugar/env.lst b/tests/fsharpqa/Source/Conformance/Expressions/SyntacticSugar/env.lst
index 857cdbb152..306d1afce9 100644
--- a/tests/fsharpqa/Source/Conformance/Expressions/SyntacticSugar/env.lst
+++ b/tests/fsharpqa/Source/Conformance/Expressions/SyntacticSugar/env.lst
@@ -1,4 +1,5 @@
 	SOURCE=infix_op01.fs	# Sample negative test for infix operators
+	SOURCE=Slices01.fs	# Slices01.fs
 	SOURCE=Slices02.fs	# Slices02.fs
 
 # This one is a bit odd because peverify will fail

From bcd4068bb5dc9d656e2c2c30ca2d7b17a73409b4 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 30 Apr 2019 08:03:50 -0700
Subject: [PATCH 06/96] testing if running the test with .fs instead of .fsx
 makes them work on .netcore

---
 .../expressions/syntacticsugar/{E_Slices01.fsx => E_Slices01.fs}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/fsharp/conformance/expressions/syntacticsugar/{E_Slices01.fsx => E_Slices01.fs} (100%)

diff --git a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fsx b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fs
similarity index 100%
rename from tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fsx
rename to tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fs

From 55bc72941131a6c3ec1904944bfd68a2c1bbc85e Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 30 Apr 2019 08:26:04 -0700
Subject: [PATCH 07/96] exclude migrated fsharpqa from dotnet core run

---
 .../syntacticsugar/{E_Slices01.fs => E_Slices01.fsx}           | 0
 tests/fsharp/tests.fs                                          | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename tests/fsharp/conformance/expressions/syntacticsugar/{E_Slices01.fs => E_Slices01.fsx} (100%)

diff --git a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fs b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fsx
similarity index 100%
rename from tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fs
rename to tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fsx
diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index 7d6bac8987..f382963b76 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -2948,6 +2948,7 @@ module GeneratedSignatureTests =
     let ``measures-GENERATED_SIGNATURE`` () = singleTestBuildAndRun "core/measures" GENERATED_SIGNATURE
 #endif
 
+#if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
 module OverloadResolution =
     module FSharpQAMigrated = 
         let [<Test>] ``Conformance\Expressions\SyntacticSugar (E_Slices01.fs)`` () = singleNegTest (testConfig "conformance/expressions/syntacticsugar") "E_Slices01"
@@ -2962,4 +2963,4 @@ module OverloadResolution =
         let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass01.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass01"
         let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass03.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass03"
         let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass04.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass04"
-            
\ No newline at end of file
+#endif

From 823c53accb4dfcfa7196fe2afc8e1114134de7b7 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Sat, 20 Apr 2019 14:12:18 -0700
Subject: [PATCH 08/96] sample test in fsharpqa (can't run locally for now)

---
 .../E_System.Convert.ToString.OverloadList.fs                 | 4 ++++
 .../fsharpqa/Source/ErrorMessages/OverloadResolution/env.lst  | 1 +
 tests/fsharpqa/Source/test.lst                                | 1 +
 3 files changed, 6 insertions(+)
 create mode 100644 tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
 create mode 100644 tests/fsharpqa/Source/ErrorMessages/OverloadResolution/env.lst

diff --git a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
new file mode 100644
index 0000000000..10ed613097
--- /dev/null
+++ b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
@@ -0,0 +1,4 @@
+System.Convert.ToString('a',0) |> ignore
+
+//<Expects id="FS0039" status="error" span="(1,1-1,1)">is not compatible with type</Expects>
+//<Expects id="FS0039" status="error" span="(1,1-1,1)">testfailfirst</Expects>
diff --git a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/env.lst b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/env.lst
new file mode 100644
index 0000000000..dfed111174
--- /dev/null
+++ b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/env.lst
@@ -0,0 +1 @@
+	SOURCE=E_System.Convert.ToString.OverloadList.fs		# E_System.Convert.ToString.OverloadList
diff --git a/tests/fsharpqa/Source/test.lst b/tests/fsharpqa/Source/test.lst
index 8a3aeac76b..69f27c7e86 100644
--- a/tests/fsharpqa/Source/test.lst
+++ b/tests/fsharpqa/Source/test.lst
@@ -266,6 +266,7 @@ Misc01			Libraries\Core\Operators
 Misc01			Libraries\Core\Reflection
 Misc01			Libraries\Core\Unchecked
 Misc01			Warnings
+Misc01			ErrorMessages\OverloadResolution
 Misc01			ErrorMessages\UnitGenericAbstractType
 Misc01			ErrorMessages\ConfusingTypeName
 

From 9671f338ec24056771c10a420792888f56f8d775 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Sat, 20 Apr 2019 21:18:43 -0700
Subject: [PATCH 09/96] trying to make it green now.

---
 .../OverloadResolution/E_System.Convert.ToString.OverloadList.fs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
index 10ed613097..0f3686a317 100644
--- a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
+++ b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
@@ -1,4 +1,3 @@
 System.Convert.ToString('a',0) |> ignore
 
 //<Expects id="FS0039" status="error" span="(1,1-1,1)">is not compatible with type</Expects>
-//<Expects id="FS0039" status="error" span="(1,1-1,1)">testfailfirst</Expects>

From 2eb3b563d50f6a24529939abdd87e6a0cf063e42 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Sun, 21 Apr 2019 05:51:54 -0700
Subject: [PATCH 10/96] checking if this path is covered by a test, trying to
 identify how to trigger this other overload related error message

---
 src/fsharp/ConstraintSolver.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 00460eab9e..849d54eafb 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2745,7 +2745,7 @@ and ResolveOverloading
                     let msg = 
                         match methodNames with
                         | [] -> msg
-                        | names -> sprintf "%s %s" msg (FSComp.SR.csCandidates (String.concat ", " names))
+                        | names -> sprintf "%s %s" msg (sprintf "fooo %s" (String.concat ", " names)) //   FSComp.SR.csCandidates (String.concat ", " names))
                     None, ErrorD (failOverloading msg []), NoTrace
 
     // If we've got a candidate solution: make the final checks - no undo here! 

From 77815725debf5031ead06d0f14191beab898df23 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Mon, 22 Apr 2019 02:08:30 -0700
Subject: [PATCH 11/96] * [MethodCalls.fs] Defining CallerArgs<'T> in, this
 replaces passing of callerArgsCount, uncurriedCallerArgs and other variants
 in the overload resolution logic happening in ConstraintSolver & TypeChecker
 * [TypeChecker.fs] pass CallerArgs instace at call sites for overload
 resolution + some commented code as we'll be building a list of given
 argument types (probably moving as a CallerArgs method or property) *
 [ConstraintSolver.fs/fsi] pipe the overload resolution traced callback to
 `trace.CollectThenUndoOrCommit` as that expression is long and more important
 in that context

---
 src/fsharp/ConstraintSolver.fs  | 36 +++++++++++++++++----------------
 src/fsharp/ConstraintSolver.fsi |  6 +++---
 src/fsharp/MethodCalls.fs       | 35 +++++++++++++++++++++-----------
 src/fsharp/TypeChecker.fs       | 14 +++++++------
 4 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 849d54eafb..2ae813336c 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -187,7 +187,7 @@ exception ConstraintSolverInfiniteTypes of displayEnv: DisplayEnv * contextInfo:
 
 exception ConstraintSolverTypesNotInEqualityRelation of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
 
-exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * TType * TType * range  * range 
+exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argT: TType * paramT: TType * range * range
 
 exception ConstraintSolverMissingConstraint of displayEnv: DisplayEnv * Tast.Typar * Tast.TyparConstraint * range  * range 
 
@@ -1520,15 +1520,17 @@ and SolveMemberConstraint (csenv: ConstraintSolverEnv) ignoreUnresolvedOverload
                     // curried members may not be used to satisfy constraints
                     |> List.choose (fun minfo ->
                           if minfo.IsCurried then None else
-                          let callerArgs = argtys |> List.map (fun argty -> CallerArg(argty, m, false, dummyExpr))
+                          let callerArgs = 
+                            { Unnamed = List.singleton (argtys |> List.map (fun argty -> CallerArg(argty, m, false, dummyExpr)))
+                              Named = List.singleton List.empty }
                           let minst = FreshenMethInfo m minfo
                           let objtys = minfo.GetObjArgTypes(amap, m, minst)
-                          Some(CalledMeth<Expr>(csenv.InfoReader, None, false, FreshenMethInfo, m, AccessibleFromEverywhere, minfo, minst, minst, None, objtys, [(callerArgs, [])], false, false, None)))
+                          Some(CalledMeth<Expr>(csenv.InfoReader, None, false, FreshenMethInfo, m, AccessibleFromEverywhere, minfo, minst, minst, None, objtys, callerArgs, false, false, None)))
               
               let methOverloadResult, errors = 
                   trace.CollectThenUndoOrCommit
                       (fun (a, _) -> Option.isSome a)
-                      (fun trace -> ResolveOverloading csenv (WithTrace trace) nm ndeep (Some traitInfo) (0, 0) AccessibleFromEverywhere calledMethGroup false (Some rty))
+                      (fun trace -> ResolveOverloading csenv (WithTrace trace) nm ndeep (Some traitInfo) CallerArgs.Empty AccessibleFromEverywhere calledMethGroup false (Some rty))
 
               match anonRecdPropSearch, recdPropSearch, methOverloadResult with 
               | Some (anonInfo, tinst, i), None, None -> 
@@ -2444,15 +2446,15 @@ and ReportNoCandidatesErrorSynExpr csenv callerArgCounts methodName ad calledMet
 // This is used after analyzing the types of arguments 
 and ResolveOverloading 
          (csenv: ConstraintSolverEnv) 
-         trace           // The undo trace, if any
-         methodName      // The name of the method being called, for error reporting
-         ndeep           // Depth of inference
-         cx              // We're doing overload resolution as part of constraint solving, where special rules apply for op_Explicit and op_Implicit constraints.
-         callerArgCounts // How many named/unnamed args id the caller provide? 
-         ad              // The access domain of the caller, e.g. a module, type etc. 
-         calledMethGroup // The set of methods being called 
-         permitOptArgs   // Can we supply optional arguments?
-         reqdRetTyOpt    // The expected return type, if known 
+         trace            // The undo trace, if any
+         methodName       // The name of the method being called, for error reporting
+         ndeep            // Depth of inference
+         cx               // We're doing overload resolution as part of constraint solving, where special rules apply for op_Explicit and op_Implicit constraints.
+         (callerArgs: CallerArgs<Expr>)
+         ad               // The access domain of the caller, e.g. a module, type etc. 
+         calledMethGroup  // The set of methods being called 
+         permitOptArgs    // Can we supply optional arguments?
+         reqdRetTyOpt     // The expected return type, if known 
      =
     let g = csenv.g
     let amap = csenv.amap
@@ -2471,7 +2473,7 @@ and ResolveOverloading
             None, ErrorD (Error (FSComp.SR.csMethodNotFound(methodName), m)), NoTrace
 
         | _, [] when not isOpConversion -> 
-            None, ReportNoCandidatesErrorExpr csenv callerArgCounts methodName ad calledMethGroup, NoTrace
+            None, ReportNoCandidatesErrorExpr csenv callerArgs.CallerArgCounts methodName ad calledMethGroup, NoTrace
             
         | _, _ -> 
 
@@ -2745,7 +2747,7 @@ and ResolveOverloading
                     let msg = 
                         match methodNames with
                         | [] -> msg
-                        | names -> sprintf "%s %s" msg (sprintf "fooo %s" (String.concat ", " names)) //   FSComp.SR.csCandidates (String.concat ", " names))
+                        | names -> sprintf "%s %s" msg (FSComp.SR.csCandidates (String.concat System.Environment.NewLine names)) //   FSComp.SR.csCandidates (String.concat ", " names))
                     None, ErrorD (failOverloading msg []), NoTrace
 
     // If we've got a candidate solution: make the final checks - no undo here! 
@@ -2790,9 +2792,9 @@ and ResolveOverloading
     | None -> 
         None, errors        
 
-let ResolveOverloadingForCall denv css m  methodName ndeep cx callerArgCounts ad calledMethGroup permitOptArgs reqdRetTyOpt =
+let ResolveOverloadingForCall denv css m  methodName ndeep cx callerArgs ad calledMethGroup permitOptArgs reqdRetTyOpt =
     let csenv = MakeConstraintSolverEnv ContextInfo.NoContext css m denv
-    ResolveOverloading csenv NoTrace methodName ndeep cx callerArgCounts ad calledMethGroup permitOptArgs reqdRetTyOpt
+    ResolveOverloading csenv NoTrace methodName ndeep cx callerArgs ad calledMethGroup permitOptArgs reqdRetTyOpt
 
 /// This is used before analyzing the types of arguments in a single overload resolution
 let UnifyUniqueOverloading 
diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 8fdaabf82c..61a828b49a 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -93,7 +93,7 @@ type ContextInfo =
 exception ConstraintSolverTupleDiffLengths              of displayEnv: DisplayEnv * TType list * TType list * range * range
 exception ConstraintSolverInfiniteTypes                 of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
 exception ConstraintSolverTypesNotInEqualityRelation    of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
-exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * TType * TType * range * range
+exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argT: TType * paramT: TType * range * range
 exception ConstraintSolverMissingConstraint             of displayEnv: DisplayEnv * Typar * TyparConstraint * range * range
 exception ConstraintSolverError                         of string * range * range
 exception ConstraintSolverRelatedInformation            of string option * range * exn
@@ -125,7 +125,7 @@ type OptionalTrace =
 
 val SimplifyMeasuresInTypeScheme: TcGlobals -> bool -> Typars -> TType -> TyparConstraint list -> Typars
 
-val ResolveOverloadingForCall: DisplayEnv -> ConstraintSolverState -> range -> string -> ndeep: int -> TraitConstraintInfo option -> int * int -> AccessorDomain -> CalledMeth<Expr> list ->  bool -> TType option -> CalledMeth<Expr> option * OperationResult<unit>
+val ResolveOverloadingForCall: DisplayEnv -> ConstraintSolverState -> range -> methodName: string -> ndeep: int -> cx: TraitConstraintInfo option -> callerArgs: CallerArgs<Expr> -> AccessorDomain -> calledMethGroup: CalledMeth<Expr> list -> permitOptArgs: bool -> reqdRetTyOpt: TType option -> CalledMeth<Expr> option * OperationResult<unit>
 
 val UnifyUniqueOverloading: DisplayEnv -> ConstraintSolverState -> range -> int * int -> string -> AccessorDomain -> CalledMeth<SynExpr> list -> TType -> OperationResult<bool> 
 
@@ -180,4 +180,4 @@ val ChooseTyparSolutionAndSolve: ConstraintSolverState -> DisplayEnv -> Typar ->
 
 val IsApplicableMethApprox: TcGlobals -> ImportMap -> range -> MethInfo -> TType -> bool
 
-val CanonicalizePartialInferenceProblem:  ConstraintSolverState -> DisplayEnv -> range -> Typars -> unit
\ No newline at end of file
+val CanonicalizePartialInferenceProblem:  ConstraintSolverState -> DisplayEnv -> range -> Typars -> unit
diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 09441aa6e6..38a51bc3cd 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -113,6 +113,16 @@ type CallerNamedArg<'T> =
 
     member x.CallerArg = (let (CallerNamedArg(_, a)) = x in a)
 
+/// Represents the list of unnamed / named arguments at method call site
+// todo: figure out / document why we are using list²
+[<Struct>]
+type CallerArgs<'T> = 
+    { Unnamed: CallerArg<'T> list list
+      Named: CallerNamedArg<'T> list list }
+with
+    static member Empty : CallerArgs<'T> = { Unnamed = List.empty; Named = List.empty }
+    member x.CallerArgCounts = (List.length x.Unnamed, List.length x.Named)
+    member x.CurriedCallerArgs = List.zip x.Unnamed x.Named
 //-------------------------------------------------------------------------
 // Callsite conversions
 //------------------------------------------------------------------------- 
@@ -303,17 +313,17 @@ type CalledMeth<'T>
       (infoReader: InfoReader,
        nameEnv: NameResolutionEnv option,
        isCheckingAttributeCall,
-       freshenMethInfo, // a function to help generate fresh type variables the property setters methods in generic classes 
-       m,
-       ad,                // the access domain of the place where the call is taking place
-       minfo: MethInfo,    // the method we're attempting to call 
-       calledTyArgs,      // the 'called type arguments', i.e. the fresh generic instantiation of the method we're attempting to call 
-       callerTyArgs: TType list, // the 'caller type arguments', i.e. user-given generic instantiation of the method we're attempting to call 
+       freshenMethInfo,             // a function to help generate fresh type variables the property setters methods in generic classes 
+       m,                           // range                           
+       ad,                          // the access domain of the place where the call is taking place
+       minfo: MethInfo,             // the method we're attempting to call 
+       calledTyArgs,                // the 'called type arguments', i.e. the fresh generic instantiation of the method we're attempting to call 
+       callerTyArgs: TType list,    // the 'caller type arguments', i.e. user-given generic instantiation of the method we're attempting to call 
        pinfoOpt: PropInfo option,   // the property related to the method we're attempting to call, if any  
-       callerObjArgTys: TType list,   // the types of the actual object argument, if any 
-       curriedCallerArgs: (CallerArg<'T> list * CallerNamedArg<'T> list) list,     // the data about any arguments supplied by the caller 
-       allowParamArgs: bool,       // do we allow the use of a param args method in its "expanded" form?
-       allowOutAndOptArgs: bool,  // do we allow the use of the transformation that converts out arguments as tuple returns?
+       callerObjArgTys: TType list, // the types of the actual object argument, if any 
+       callerArgs: CallerArgs<'T>, // the data about any arguments supplied by the caller 
+       allowParamArgs: bool,     // do we allow the use of a param args method in its "expanded" form?
+       allowOutAndOptArgs: bool, // do we allow the use of the transformation that converts out arguments as tuple returns?
        tyargsOpt : TType option) // method parameters
     =
     let g = infoReader.g
@@ -321,9 +331,10 @@ type CalledMeth<'T>
 
     let fullCurriedCalledArgs = MakeCalledArgs infoReader.amap m minfo calledTyArgs
     do assert (fullCurriedCalledArgs.Length = fullCurriedCalledArgs.Length)
- 
+    
     let argSetInfos = 
-        (curriedCallerArgs, fullCurriedCalledArgs) ||> List.map2 (fun (unnamedCallerArgs, namedCallerArgs) fullCalledArgs -> 
+        (callerArgs.CurriedCallerArgs, fullCurriedCalledArgs) 
+        ||> List.map2 (fun (unnamedCallerArgs, namedCallerArgs) fullCalledArgs -> 
             // Find the arguments not given by name 
             let unnamedCalledArgs = 
                 fullCalledArgs |> List.filter (fun calledArg -> 
diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
index 07e3e3a578..29823ffb2c 100755
--- a/src/fsharp/TypeChecker.fs
+++ b/src/fsharp/TypeChecker.fs
@@ -10283,7 +10283,7 @@ and TcMethodApplication
 
         let callerArgCounts = (List.sumBy List.length unnamedCurriedCallerArgs, List.sumBy List.length namedCurriedCallerArgs)
 
-        let callerArgs = List.zip unnamedCurriedCallerArgs namedCurriedCallerArgs
+        let callerArgs = { Unnamed = unnamedCurriedCallerArgs; Named = namedCurriedCallerArgs }
 
         let makeOneCalledMeth (minfo, pinfoOpt, usesParamArrayConversion) = 
             let minst = FreshenMethInfo mItem minfo
@@ -10382,8 +10382,12 @@ and TcMethodApplication
     /// Select the called method that's the result of overload resolution
     let finalCalledMeth = 
 
-        let callerArgs = List.zip unnamedCurriedCallerArgs namedCurriedCallerArgs
-
+        let callerArgs = { Unnamed = unnamedCurriedCallerArgs ; Named = namedCurriedCallerArgs }
+        //let argumentTypesWithNames = [
+        //  yield! (unnamedCurriedCallerArgs |> List.map (List.map (fun i -> None, i.Type)))
+        //  yield! (namedCurriedCallerArgs   |> List.map (List.map (fun i -> Some i.Name, i.CallerArg.Type)))
+        //]
+        //printfn "%A" argumentTypesWithNames
         let postArgumentTypeCheckingCalledMethGroup = 
             preArgumentTypeCheckingCalledMethGroup |> List.map (fun (minfo: MethInfo, minst, pinfoOpt, usesParamArrayConversion) ->
                 let callerTyArgs = 
@@ -10392,8 +10396,6 @@ and TcMethodApplication
                     | None -> minst
                 CalledMeth<Expr>(cenv.infoReader, Some(env.NameEnv), isCheckingAttributeCall, FreshenMethInfo, mMethExpr, ad, minfo, minst, callerTyArgs, pinfoOpt, callerObjArgTys, callerArgs, usesParamArrayConversion, true, objTyOpt))
           
-        let callerArgCounts = (unnamedCurriedCallerArgs.Length, namedCurriedCallerArgs.Length)
-        
         // Commit unassociated constraints prior to member overload resolution where there is ambiguity 
         // about the possible target of the call. 
         if not uniquelyResolved then 
@@ -10401,7 +10403,7 @@ and TcMethodApplication
                  (//freeInTypeLeftToRight cenv.g false returnTy @
                   (unnamedCurriedCallerArgs |> List.collectSquared (fun callerArg -> freeInTypeLeftToRight cenv.g false callerArg.CallerArgumentType)))
 
-        let result, errors = ResolveOverloadingForCall denv cenv.css mMethExpr methodName 0 None callerArgCounts ad postArgumentTypeCheckingCalledMethGroup true (Some returnTy) 
+        let result, errors = ResolveOverloadingForCall denv cenv.css mMethExpr methodName 0 None callerArgs ad postArgumentTypeCheckingCalledMethGroup true (Some returnTy) 
 
         match afterResolution, result with
         | AfterResolution.DoNothing, _ -> ()

From 81ef5f20520360276480e991bb6da0f8130333a2 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 23 Apr 2019 07:23:11 -0700
Subject: [PATCH 12/96] bit of refactoring of error message building logic
 during failed overload resolution

[ConstraintSolver.fsi]

* define OverloadInformation and OverloadResolutionFailure, those replace workflow where `string * ((CalledMeth<_> * exn) list)` values were created at call site mixed with message building and matched later in non obvious fashion in `failOverloading` closure
* adjust UnresolvedOverloading and PossibleOverload exceptions

[ConstraintSolver.fs]

* get rid of `GetPossibleOverloads`, this was used only in `failOverloading` closure, and just being passed the same parameters at call site
* give `failOverloading` a more meaningful signature and consolidate the prefix message building logic there
* fix `failOverloading` call sites

[CompilerOps.fs] adjust pattern matching

Expecting behaviour of this code to be identical as before PR

`
---
 src/fsharp/CompileOps.fs        | 14 +++---
 src/fsharp/ConstraintSolver.fs  | 76 ++++++++++++++++++++-------------
 src/fsharp/ConstraintSolver.fsi | 19 ++++++++-
 3 files changed, 70 insertions(+), 39 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index b949a475cb..f0b27909b2 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -188,7 +188,7 @@ let GetRangeOfDiagnostic(err: PhasedDiagnostic) =
       | NameClash(_, _, _, m, _, _, _) 
       | UnresolvedOverloading(_, _, _, m) 
       | UnresolvedConversionOperator (_, _, _, m)
-      | PossibleOverload(_, _, _, m) 
+      | PossibleOverload(_, _, m) 
       | VirtualAugmentationOnNullValuedType m
       | NonVirtualAugmentationOnNullValuedType m
       | NonRigidTypar(_, _, _, _, _, m)
@@ -406,9 +406,9 @@ let warningOn err level specificWarnOn =
 let SplitRelatedDiagnostics(err: PhasedDiagnostic) = 
     let ToPhased e = {Exception=e; Phase = err.Phase}
     let rec SplitRelatedException = function
-      | UnresolvedOverloading(a, overloads, b, c) -> 
+      | UnresolvedOverloading(displayEnv, msg, overloads, m) -> 
            let related = overloads |> List.map ToPhased
-           UnresolvedOverloading(a, [], b, c)|>ToPhased, related
+           UnresolvedOverloading(displayEnv, msg, [], m) |> ToPhased, related
       | ConstraintSolverRelatedInformation(fopt, m2, e) -> 
           let e, related = SplitRelatedException e
           ConstraintSolverRelatedInformation(fopt, m2, e.Exception)|>ToPhased, related
@@ -770,18 +770,18 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
           os.Append(e.ContextualErrorMessage) |> ignore
 #endif
 
-      | UnresolvedOverloading(_, _, mtext, _) -> 
+      | UnresolvedOverloading(_, mtext, _, _) ->
           os.Append mtext |> ignore
 
       | UnresolvedConversionOperator(denv, fromTy, toTy, _) -> 
           let t1, t2, _tpcs = NicePrint.minimalStringsOfTwoTypes denv fromTy toTy
           os.Append(FSComp.SR.csTypeDoesNotSupportConversion(t1, t2)) |> ignore
 
-      | PossibleOverload(_, minfo, originalError, _) -> 
+      | PossibleOverload(denv, minfo, m) ->
           // print original error that describes reason why this overload was rejected
           let buf = new StringBuilder()
-          OutputExceptionR buf originalError
-
+          OutputExceptionR buf minfo.error
+          let minfo = minfo.OverloadMethodInfo denv m
           os.Append(PossibleOverloadE().Format minfo (buf.ToString())) |> ignore
 
       | FunctionExpected _ ->
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 2ae813336c..c970496f80 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -52,6 +52,7 @@ open FSharp.Compiler.ErrorLogger
 open FSharp.Compiler.Infos
 open FSharp.Compiler.AccessibilityLogic
 open FSharp.Compiler.AttributeChecking
+open FSharp.Compiler.Import
 open FSharp.Compiler.Lib
 open FSharp.Compiler.MethodCalls
 open FSharp.Compiler.PrettyNaming
@@ -181,12 +182,24 @@ type ContextInfo =
     /// The type equation comes from a sequence expression.
     | SequenceExpression of TType
 
-exception ConstraintSolverTupleDiffLengths of displayEnv: DisplayEnv * TType list * TType list * range  * range
-
-exception ConstraintSolverInfiniteTypes of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
-
-exception ConstraintSolverTypesNotInEqualityRelation of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
-
+/// Captures relevant information for a particular failed overload resolution.
+[<Struct>]
+type OverloadInformation = {
+  methodSlot: CalledMeth<Expr>
+  amap : ImportMap
+  error: exn
+}
+with
+    member OverloadMethodInfo : displayEnv: DisplayEnv -> m: range -> string
+
+/// Cases for overload resolution failure that exists in the implementation of the compiler.
+type OverloadResolutionFailure =
+    | NoOverloadsFound   of methodName: string * candidates: OverloadInformation list
+    | PossibleCandidates of methodName: string * methodNames: string list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
+
+exception ConstraintSolverTupleDiffLengths              of displayEnv: DisplayEnv * TType list * TType list * range * range
+exception ConstraintSolverInfiniteTypes                 of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
+exception ConstraintSolverTypesNotInEqualityRelation    of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
 exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argT: TType * paramT: TType * range * range
 
 exception ConstraintSolverMissingConstraint of displayEnv: DisplayEnv * Tast.Typar * Tast.TyparConstraint * range  * range 
@@ -200,18 +213,10 @@ exception ErrorFromApplyingDefault of tcGlobals: TcGlobals * displayEnv: Display
 exception ErrorFromAddingTypeEquation of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * range
 
 exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * ContextInfo * range
-
-exception ErrorFromAddingConstraint of displayEnv: DisplayEnv * exn * range
-
-exception PossibleOverload of displayEnv: DisplayEnv * string * exn * range
-
-exception UnresolvedOverloading of displayEnv: DisplayEnv * exn list * string * range
-
-exception UnresolvedConversionOperator of displayEnv: DisplayEnv * TType * TType * range
-
-let GetPossibleOverloads  amap m denv (calledMethGroup: (CalledMeth<_> * exn) list) = 
-    calledMethGroup |> List.map (fun (cmeth, e) ->
-        PossibleOverload(denv, NicePrint.stringOfMethInfo amap m denv cmeth.Method, e, m))
+exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn * range
+exception PossibleOverload                      of displayEnv: DisplayEnv * overload: OverloadInformation * range
+exception UnresolvedOverloading                 of displayEnv: DisplayEnv * prefixMessage: string * overloads: PossibleOverload list * range
+exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
 
 type TcValF = (ValRef -> ValUseFlag -> TType list -> range -> Expr * TType)
 
@@ -2515,7 +2520,7 @@ and ResolveOverloading
                                    reqdRetTyOpt 
                                    candidate)
 
-            let failOverloading (msg: string) errors = 
+            let failOverloading overloadResolutionFailure = 
                 // Try to extract information to give better error for ambiguous op_Explicit and op_Implicit 
                 let convOpData = 
                     if isOpConversion then 
@@ -2530,11 +2535,26 @@ and ResolveOverloading
                 | Some (fromTy, toTy) -> 
                     UnresolvedConversionOperator (denv, fromTy, toTy, m)
                 | None -> 
-                    // Otherwise collect a list of possible overloads
-                    let overloads = GetPossibleOverloads amap m denv errors
+                    let msg = 
+                        match overloadResolutionFailure with
+                        | NoOverloadsFound (methodName, _) -> FSComp.SR.csNoOverloadsFound methodName
+                        | PossibleCandidates (methodName, methodNames) ->
+                            let msg = FSComp.SR.csMethodIsOverloaded methodName
+                            match methodNames with
+                            | [] -> msg
+                            | names -> sprintf "%s %s" msg (FSComp.SR.csCandidates (String.concat ", " names))                        
+
+                    let overloads =
+                        overloadResolutionFailure
+                        |> function | NoOverloadsFound (_, candidates) -> candidates
+                                    | PossibleCandidates _ -> []
+                        |> List.map (fun overload -> 
+                            PossibleOverload(denv, overload, m)  :?> _ // F# Spec: 8.11 Exception Definitions: The identifier identcan be used to generate values of type exn
+                        )
+                    
                     // if list of overloads is not empty - append line with "The available overloads are shown below..."
                     let msg = if isNil overloads then msg else sprintf "%s %s" msg (FSComp.SR.csSeeAvailableOverloads ())
-                    UnresolvedOverloading (denv, overloads, msg, m)
+                    UnresolvedOverloading (denv, msg, overloads, m)
 
             match applicable with 
             | [] ->
@@ -2554,9 +2574,9 @@ and ResolveOverloading
                                              reqdRetTyOpt 
                                              calledMeth) with 
                             | OkResult _ -> None
-                            | ErrorResult(_, exn) -> Some (calledMeth, exn))
+                            | ErrorResult(_, exn) -> Some {methodSlot = calledMeth; amap = amap; error = exn })
 
-                None, ErrorD (failOverloading (FSComp.SR.csNoOverloadsFound methodName) errors), NoTrace
+                None, ErrorD (failOverloading (NoOverloadsFound (methodName, errors))), NoTrace
 
             | [(calledMeth, warns, t)] ->
                 Some calledMeth, OkResult (warns, ()), WithTrace t
@@ -2743,12 +2763,8 @@ and ResolveOverloading
                         methods
                         |> List.map (fun cmeth -> NicePrint.stringOfMethInfo amap m denv cmeth.Method)
                         |> List.sort
-                    let msg = FSComp.SR.csMethodIsOverloaded methodName
-                    let msg = 
-                        match methodNames with
-                        | [] -> msg
-                        | names -> sprintf "%s %s" msg (FSComp.SR.csCandidates (String.concat System.Environment.NewLine names)) //   FSComp.SR.csCandidates (String.concat ", " names))
-                    None, ErrorD (failOverloading msg []), NoTrace
+                    
+                    None, ErrorD (failOverloading (PossibleCandidates(methodName, methodNames))), NoTrace
 
     // If we've got a candidate solution: make the final checks - no undo here! 
     // Allow subsumption on arguments. Include the return type.
diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 61a828b49a..4c3451e5cd 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -90,6 +90,21 @@ type ContextInfo =
     /// The type equation comes from a sequence expression.
     | SequenceExpression of TType
 
+/// Captures relevant information for a particular failed overload resolution.
+[<Struct>]
+type OverloadInformation = {
+  methodSlot: CalledMeth<Expr>
+  amap : ImportMap
+  error: exn
+}
+with
+    member OverloadMethodInfo : displayEnv: DisplayEnv -> m: range -> string
+
+/// Cases for overload resolution failure that exists in the implementation of the compiler.
+type OverloadResolutionFailure =
+    | NoOverloadsFound   of methodName: string * candidates: OverloadInformation list
+    | PossibleCandidates of methodName: string * methodNames: string list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
+
 exception ConstraintSolverTupleDiffLengths              of displayEnv: DisplayEnv * TType list * TType list * range * range
 exception ConstraintSolverInfiniteTypes                 of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
 exception ConstraintSolverTypesNotInEqualityRelation    of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
@@ -103,8 +118,8 @@ exception ErrorFromAddingTypeEquation           of tcGlobals: TcGlobals * displa
 exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * ContextInfo * range
 exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn * range
 exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
-exception PossibleOverload                      of displayEnv: DisplayEnv * string * exn * range
-exception UnresolvedOverloading                 of displayEnv: DisplayEnv * exn list * string * range
+exception PossibleOverload                      of displayEnv: DisplayEnv * overload: OverloadInformation * range
+exception UnresolvedOverloading                 of displayEnv: DisplayEnv * prefixMessage: string * overloads: PossibleOverload list * range
 exception NonRigidTypar                         of displayEnv: DisplayEnv * string option * range * TType * TType * range
 
 /// A function that denotes captured tcVal, Used in constraint solver and elsewhere to get appropriate expressions for a ValRef.

From 69cbc0531b5dfb7445800b2f198970e0c6e0e3b9 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 23 Apr 2019 08:20:03 -0700
Subject: [PATCH 13/96] (buildfix) harmonizing .fsi/.fs right before commit
 doesn't always work with simple copy paste.

---
 src/fsharp/ConstraintSolver.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index c970496f80..92f5bef2e1 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -190,7 +190,7 @@ type OverloadInformation = {
   error: exn
 }
 with
-    member OverloadMethodInfo : displayEnv: DisplayEnv -> m: range -> string
+    member x.OverloadMethodInfo displayEnv m = NicePrint.stringOfMethInfo x.amap m displayEnv x.methodSlot.Method
 
 /// Cases for overload resolution failure that exists in the implementation of the compiler.
 type OverloadResolutionFailure =

From 9f47fee98562443d683db135c93fc316037f4d21 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Wed, 24 Apr 2019 01:55:33 -0700
Subject: [PATCH 14/96] trying to check what kind of things break loose when I
 change this

I'm trying to identify why we get `(CalledMeth<Expr> * exn list)`, I'm making a cartesian product through getMethodSlotsAndErrors for now, trying to figure out if we can get other than 0 or 1 exception in the list for a given method slot.

I may revert that one if it doesn't make sense make from a reviewer standpoint and/or breaks fsharpqa tests surounding overload resolution error messages.
---
 src/fsharp/ConstraintSolver.fs  | 53 +++++++++++++++++++++------------
 src/fsharp/ConstraintSolver.fsi |  2 +-
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 92f5bef2e1..be7faea8b1 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -195,7 +195,7 @@ with
 /// Cases for overload resolution failure that exists in the implementation of the compiler.
 type OverloadResolutionFailure =
     | NoOverloadsFound   of methodName: string * candidates: OverloadInformation list
-    | PossibleCandidates of methodName: string * methodNames: string list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
+    | PossibleCandidates of methodName: string * candidates: OverloadInformation list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
 
 exception ConstraintSolverTupleDiffLengths              of displayEnv: DisplayEnv * TType list * TType list * range * range
 exception ConstraintSolverInfiniteTypes                 of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
@@ -2542,7 +2542,13 @@ and ResolveOverloading
                             let msg = FSComp.SR.csMethodIsOverloaded methodName
                             match methodNames with
                             | [] -> msg
-                            | names -> sprintf "%s %s" msg (FSComp.SR.csCandidates (String.concat ", " names))                        
+                            | names -> 
+                              names 
+                              |> List.map (fun overload -> NicePrint.stringOfMethInfo amap m denv overload.methodSlot.Method)
+                              |> List.sort
+                              |> String.concat ", "
+                              |> FSComp.SR.csCandidates
+                              |> sprintf "%s %s" msg
 
                     let overloads =
                         overloadResolutionFailure
@@ -2574,7 +2580,7 @@ and ResolveOverloading
                                              reqdRetTyOpt 
                                              calledMeth) with 
                             | OkResult _ -> None
-                            | ErrorResult(_, exn) -> Some {methodSlot = calledMeth; amap = amap; error = exn })
+                            | ErrorResult(_exns, exn) -> Some {methodSlot = calledMeth; amap = amap; error = exn })
 
                 None, ErrorD (failOverloading (NoOverloadsFound (methodName, errors))), NoTrace
 
@@ -2748,23 +2754,32 @@ and ResolveOverloading
                 match bestMethods with 
                 | [(calledMeth, warns, t)] -> Some calledMeth, OkResult (warns, ()), WithTrace t
                 | bestMethods -> 
-                    let methodNames =
-                        let methods = 
-                            // use the most precise set
-                            // - if after filtering bestMethods still contains something - use it
-                            // - otherwise use applicableMeths or initial set of candidate methods
-                            match bestMethods with
-                            | [] -> 
-                                match applicableMeths with
-                                | [] -> candidates
-                                | m -> m |> List.map (fun (x, _, _) -> x)
-                            | m -> m |> List.map (fun (x, _, _) -> x)
-
-                        methods
-                        |> List.map (fun cmeth -> NicePrint.stringOfMethInfo amap m denv cmeth.Method)
-                        |> List.sort
                     
-                    None, ErrorD (failOverloading (PossibleCandidates(methodName, methodNames))), NoTrace
+                    //let methodNames =
+                    let methods = 
+                        // use the most precise set
+                        // - if after filtering bestMethods still contains something - use it
+                        // - otherwise use applicableMeths or initial set of candidate methods
+
+                        let getMethodSlotsAndErrors =
+                          function | methodSlot, []      -> List.singleton {methodSlot = methodSlot; error = Unchecked.defaultof<exn>; amap = amap}
+                                   | methodSlot, [error] -> List.singleton {methodSlot = methodSlot; error = error; amap = amap}
+                                   | methodSlot, errors  -> errors |> List.map (fun error -> {methodSlot = methodSlot; error = error; amap = amap})
+                                   // not totally sure about what's going on with last case, so making cartesian product in case we have several exceptions
+
+                        match bestMethods with
+                        | [] -> 
+                            match applicableMeths with
+                            | [] -> candidates |> List.map (fun methodSlot -> getMethodSlotsAndErrors (methodSlot, []))
+                            | m -> m |> List.map (fun (methodSlot, errors, _) -> getMethodSlotsAndErrors (methodSlot,errors))
+                        | m -> m |> List.map (fun (methodSlot, errors, _) -> getMethodSlotsAndErrors (methodSlot,errors))
+
+
+                    let methods = List.concat methods
+                    //|> List.map (fun cmeth -> NicePrint.stringOfMethInfo amap m denv cmeth.Method)
+                    //|> List.sort
+                    
+                    None, ErrorD (failOverloading (PossibleCandidates(methodName, methods))), NoTrace
 
     // If we've got a candidate solution: make the final checks - no undo here! 
     // Allow subsumption on arguments. Include the return type.
diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 4c3451e5cd..44e3bb7f57 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -103,7 +103,7 @@ with
 /// Cases for overload resolution failure that exists in the implementation of the compiler.
 type OverloadResolutionFailure =
     | NoOverloadsFound   of methodName: string * candidates: OverloadInformation list
-    | PossibleCandidates of methodName: string * methodNames: string list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
+    | PossibleCandidates of methodName: string * candidates: OverloadInformation list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
 
 exception ConstraintSolverTupleDiffLengths              of displayEnv: DisplayEnv * TType list * TType list * range * range
 exception ConstraintSolverInfiniteTypes                 of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range

From 41b219ce94b046d3851d098178a5028e171e129c Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Wed, 24 Apr 2019 15:43:19 -0700
Subject: [PATCH 15/96] (minor) [ConstraintSolver.fs] revert space mishapps to
 reduce diff, put back comments where they were

---
 src/fsharp/ConstraintSolver.fs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index be7faea8b1..de2daea980 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2451,15 +2451,15 @@ and ReportNoCandidatesErrorSynExpr csenv callerArgCounts methodName ad calledMet
 // This is used after analyzing the types of arguments 
 and ResolveOverloading 
          (csenv: ConstraintSolverEnv) 
-         trace            // The undo trace, if any
-         methodName       // The name of the method being called, for error reporting
-         ndeep            // Depth of inference
-         cx               // We're doing overload resolution as part of constraint solving, where special rules apply for op_Explicit and op_Implicit constraints.
+         trace           // The undo trace, if any
+         methodName      // The name of the method being called, for error reporting
+         ndeep           // Depth of inference
+         cx              // We're doing overload resolution as part of constraint solving, where special rules apply for op_Explicit and op_Implicit constraints.
          (callerArgs: CallerArgs<Expr>)
-         ad               // The access domain of the caller, e.g. a module, type etc. 
-         calledMethGroup  // The set of methods being called 
-         permitOptArgs    // Can we supply optional arguments?
-         reqdRetTyOpt     // The expected return type, if known 
+         ad              // The access domain of the caller, e.g. a module, type etc. 
+         calledMethGroup // The set of methods being called 
+         permitOptArgs   // Can we supply optional arguments?
+         reqdRetTyOpt    // The expected return type, if known 
      =
     let g = csenv.g
     let amap = csenv.amap
@@ -2757,16 +2757,15 @@ and ResolveOverloading
                     
                     //let methodNames =
                     let methods = 
-                        // use the most precise set
-                        // - if after filtering bestMethods still contains something - use it
-                        // - otherwise use applicableMeths or initial set of candidate methods
-
                         let getMethodSlotsAndErrors =
                           function | methodSlot, []      -> List.singleton {methodSlot = methodSlot; error = Unchecked.defaultof<exn>; amap = amap}
                                    | methodSlot, [error] -> List.singleton {methodSlot = methodSlot; error = error; amap = amap}
                                    | methodSlot, errors  -> errors |> List.map (fun error -> {methodSlot = methodSlot; error = error; amap = amap})
                                    // not totally sure about what's going on with last case, so making cartesian product in case we have several exceptions
 
+                        // use the most precise set
+                        // - if after filtering bestMethods still contains something - use it
+                        // - otherwise use applicableMeths or initial set of candidate methods
                         match bestMethods with
                         | [] -> 
                             match applicableMeths with

From 7f73826c1abdb9257681197fdb648627440bde0a Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Wed, 24 Apr 2019 15:44:04 -0700
Subject: [PATCH 16/96] toward displaying the argument names properly (may fail
 some fsharpqa tests for now)

---
 src/fsharp/FSComp.txt     |  9 ++++++---
 src/fsharp/MethodCalls.fs |  5 +++++
 src/fsharp/TypeChecker.fs | 25 +++++++++++++++++++------
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index 7428aefce4..ad627dfecd 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -1,6 +1,6 @@
-# -----------------------------------------------------------------------------
-# use a completely new error number and add new messages at the end of the file
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
+# use a completely new error number and keep messages in their surounding groups
+# ------------------------------------------------------------------------------
 undefinedNameNamespace,"The namespace '%s' is not defined."
 undefinedNameNamespaceOrModule,"The namespace or module '%s' is not defined."
 undefinedNameFieldConstructorOrMember,"The field, constructor or member '%s' is not defined."
@@ -362,6 +362,9 @@ csCtorHasNoArgumentOrReturnProperty,"The object constructor '%s' has no argument
 508,csNoMemberTakesTheseArguments3,"No %s member or object constructor named '%s' takes %d arguments. The named argument '%s' doesn't correspond to any argument or settable return property for any overload."
 509,csMethodNotFound,"Method or object constructor '%s' not found"
 csNoOverloadsFound,"No overloads match for method '%s'."
+csNoOverloadsFoundArgumentsPrefixSingular,"Argument given: %s"
+csNoOverloadsFoundArgumentsPrefixPlural,"Arguments given:"
+csNoOverloadsFoundArgumentsSingleArgumentInstance," - %s"
 csMethodIsOverloaded,"A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed."
 csCandidates,"Candidates: %s"
 csSeeAvailableOverloads,"The available overloads are shown below."
diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 38a51bc3cd..e843a04cc6 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -123,6 +123,11 @@ with
     static member Empty : CallerArgs<'T> = { Unnamed = List.empty; Named = List.empty }
     member x.CallerArgCounts = (List.length x.Unnamed, List.length x.Named)
     member x.CurriedCallerArgs = List.zip x.Unnamed x.Named
+    member x.LayoutArgumentTypes denv =
+      [ (x.Unnamed |> List.map (List.map (fun i -> None, NicePrint.layoutType denv i.Type))) |> List.concat // not sure why we end up with a nested list
+        (x.Named |> List.map (List.map (fun i -> Some i.Name, NicePrint.layoutType denv i.CallerArg.Type))) |> List.concat ]
+      |> List.concat
+    
 //-------------------------------------------------------------------------
 // Callsite conversions
 //------------------------------------------------------------------------- 
diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
index 29823ffb2c..dffcc8eb76 100755
--- a/src/fsharp/TypeChecker.fs
+++ b/src/fsharp/TypeChecker.fs
@@ -8,6 +8,7 @@ open System
 open System.Collections.Generic
 
 open Internal.Utilities
+open Internal.Utilities.StructuredFormat
 
 open FSharp.Compiler.AbstractIL 
 open FSharp.Compiler.AbstractIL.IL 
@@ -10380,14 +10381,26 @@ and TcMethodApplication
     
     // STEP 3. Resolve overloading 
     /// Select the called method that's the result of overload resolution
-    let finalCalledMeth = 
+    let finalCalledMeth =
+        let formatOptions = FormatOptions.Default
+        let getArgType =
+            function | (Some argName), typeLayout -> sprintf "(%s) : %s" argName (Display.layout_to_string formatOptions typeLayout)
+                     | _, typeLayout -> (Display.layout_to_string typeLayout)
 
         let callerArgs = { Unnamed = unnamedCurriedCallerArgs ; Named = namedCurriedCallerArgs }
-        //let argumentTypesWithNames = [
-        //  yield! (unnamedCurriedCallerArgs |> List.map (List.map (fun i -> None, i.Type)))
-        //  yield! (namedCurriedCallerArgs   |> List.map (List.map (fun i -> Some i.Name, i.CallerArg.Type)))
-        //]
-        //printfn "%A" argumentTypesWithNames
+        let argsMessage =
+            match callerArgs.LayoutArgumentTypes denv with
+            | [] -> String.Empty
+            | [item] -> item |> getArgType |> FSComp.SR.csNoOverloadsFoundArgumentsPrefixSingular
+            | items -> 
+                let args = 
+                    items 
+                    |> List.map (getArgType >> FSComp.SR.csNoOverloadsFoundArgumentsSingleArgumentInstance)
+                    |> List.toArray
+                    |> String.concat Environment.NewLine
+                (FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural()) + args
+          
+        printfn "%A" argsMessage
         let postArgumentTypeCheckingCalledMethGroup = 
             preArgumentTypeCheckingCalledMethGroup |> List.map (fun (minfo: MethInfo, minst, pinfoOpt, usesParamArrayConversion) ->
                 let callerTyArgs = 

From 0904de643e43741599a2fa5f3c0c7d0d2801c9f9 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Wed, 24 Apr 2019 15:48:11 -0700
Subject: [PATCH 17/96] missing Resharper's Ctrl+Alt+V "introduce variable"
 refactoring @auduchinok :)

---
 src/fsharp/TypeChecker.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
index dffcc8eb76..48d45d7115 100755
--- a/src/fsharp/TypeChecker.fs
+++ b/src/fsharp/TypeChecker.fs
@@ -10385,7 +10385,7 @@ and TcMethodApplication
         let formatOptions = FormatOptions.Default
         let getArgType =
             function | (Some argName), typeLayout -> sprintf "(%s) : %s" argName (Display.layout_to_string formatOptions typeLayout)
-                     | _, typeLayout -> (Display.layout_to_string typeLayout)
+                     | _, typeLayout -> (Display.layout_to_string formatOptions typeLayout)
 
         let callerArgs = { Unnamed = unnamedCurriedCallerArgs ; Named = namedCurriedCallerArgs }
         let argsMessage =

From f1eadef7538d1201323837624db5e0dec14f504b Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 25 Apr 2019 00:44:46 -0700
Subject: [PATCH 18/96] pretty print unresolved overloads without all the type
 submsumption per overload verbose messages

---
 src/fsharp/CompileOps.fs                      | 22 ++++++++-----
 src/fsharp/ConstraintSolver.fs                | 31 +++++++++++++++++--
 src/fsharp/FSComp.txt                         |  2 +-
 src/fsharp/FSStrings.resx                     |  3 --
 src/fsharp/TypeChecker.fs                     | 21 ++-----------
 .../E_System.Convert.ToString.OverloadList.fs | 12 ++++++-
 6 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index f0b27909b2..54250d6620 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -770,19 +770,27 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
           os.Append(e.ContextualErrorMessage) |> ignore
 #endif
 
-      | UnresolvedOverloading(_, mtext, _, _) ->
-          os.Append mtext |> ignore
+      | UnresolvedOverloading(denv, mtext, overloads, m) ->
+          os.AppendLine mtext |> ignore
+          overloads
+          |> List.map (fun e -> e.overload.OverloadMethodInfo denv m |> FSComp.SR.formatDashItem)
+          |> List.iter (os.AppendLine >> ignore)
 
       | UnresolvedConversionOperator(denv, fromTy, toTy, _) -> 
           let t1, t2, _tpcs = NicePrint.minimalStringsOfTwoTypes denv fromTy toTy
           os.Append(FSComp.SR.csTypeDoesNotSupportConversion(t1, t2)) |> ignore
 
       | PossibleOverload(denv, minfo, m) ->
-          // print original error that describes reason why this overload was rejected
-          let buf = new StringBuilder()
-          OutputExceptionR buf minfo.error
-          let minfo = minfo.OverloadMethodInfo denv m
-          os.Append(PossibleOverloadE().Format minfo (buf.ToString())) |> ignore
+          minfo.OverloadMethodInfo denv m
+          |> FSComp.SR.formatDashItem
+          |> os.Append
+          |> ignore
+          
+          //// print original error that describes reason why this overload was rejected
+          //let minfo = minfo.OverloadMethodInfo denv m
+          //let buf = new StringBuilder()
+          //OutputExceptionR buf minfo.error
+          //os.Append(PossibleOverloadE().Format minfo (buf.ToString())) |> ignore
 
       | FunctionExpected _ ->
           os.Append(FunctionExpectedE().Format) |> ignore
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index de2daea980..166608383d 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -43,6 +43,7 @@
 module internal FSharp.Compiler.ConstraintSolver
 
 open Internal.Utilities.Collections
+open Internal.Utilities.StructuredFormat
 
 open FSharp.Compiler 
 open FSharp.Compiler.AbstractIL 
@@ -2536,8 +2537,34 @@ and ResolveOverloading
                     UnresolvedConversionOperator (denv, fromTy, toTy, m)
                 | None -> 
                     let msg = 
+                        let formatOptions = FormatOptions.Default
+                        let getArgType =
+                            function | (Some argName), typeLayout -> sprintf "(%s) : %s" argName (Display.layout_to_string formatOptions typeLayout)
+                                     | _, typeLayout -> (Display.layout_to_string formatOptions typeLayout)
+
+                        let argsMessage =
+                            match callerArgs.LayoutArgumentTypes denv with
+                            | [] -> System.String.Empty
+                            | [item] -> Environment.NewLine + (item |> getArgType |> FSComp.SR.csNoOverloadsFoundArgumentsPrefixSingular)
+                            | items -> 
+                                let args = 
+                                    items 
+                                    |> List.map (getArgType >> FSComp.SR.formatDashItem)
+                                    |> List.toArray
+                                    |> String.concat Environment.NewLine
+
+                                Environment.NewLine 
+                                + Environment.NewLine 
+                                + (FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural()) 
+                                + Environment.NewLine 
+                                + args
+                                + Environment.NewLine 
+                                + Environment.NewLine 
+
+  
+                        //printfn "%A" argsMessage
                         match overloadResolutionFailure with
-                        | NoOverloadsFound (methodName, _) -> FSComp.SR.csNoOverloadsFound methodName
+                        | NoOverloadsFound (methodName, _) -> FSComp.SR.csNoOverloadsFound methodName + argsMessage
                         | PossibleCandidates (methodName, methodNames) ->
                             let msg = FSComp.SR.csMethodIsOverloaded methodName
                             match methodNames with
@@ -2548,7 +2575,7 @@ and ResolveOverloading
                               |> List.sort
                               |> String.concat ", "
                               |> FSComp.SR.csCandidates
-                              |> sprintf "%s %s" msg
+                              |> sprintf "%s %s %s" argsMessage msg
 
                     let overloads =
                         overloadResolutionFailure
diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index ad627dfecd..a2a0df1dd1 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -364,7 +364,6 @@ csCtorHasNoArgumentOrReturnProperty,"The object constructor '%s' has no argument
 csNoOverloadsFound,"No overloads match for method '%s'."
 csNoOverloadsFoundArgumentsPrefixSingular,"Argument given: %s"
 csNoOverloadsFoundArgumentsPrefixPlural,"Arguments given:"
-csNoOverloadsFoundArgumentsSingleArgumentInstance," - %s"
 csMethodIsOverloaded,"A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed."
 csCandidates,"Candidates: %s"
 csSeeAvailableOverloads,"The available overloads are shown below."
@@ -1488,3 +1487,4 @@ optsLangVersion,"Display the allowed values for language version, specify langua
 optsSupportedLangVersions,"Supported language versions:"
 nativeResourceFormatError,"Stream does not begin with a null resource and is not in '.RES' format."
 nativeResourceHeaderMalformed,"Resource header beginning at offset %s is malformed."
+formatDashItem," - %s"
diff --git a/src/fsharp/FSStrings.resx b/src/fsharp/FSStrings.resx
index a56e6f1421..e755b590b4 100644
--- a/src/fsharp/FSStrings.resx
+++ b/src/fsharp/FSStrings.resx
@@ -159,9 +159,6 @@
   <data name="NotUpperCaseConstructor" xml:space="preserve">
     <value>Discriminated union cases and exception labels must be uppercase identifiers</value>
   </data>
-  <data name="PossibleOverload" xml:space="preserve">
-    <value>Possible overload: '{0}'. {1}.</value>
-  </data>
   <data name="FunctionExpected" xml:space="preserve">
     <value>This function takes too many arguments, or is used in a context where a function is not expected</value>
   </data>
diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
index 48d45d7115..c129b51244 100755
--- a/src/fsharp/TypeChecker.fs
+++ b/src/fsharp/TypeChecker.fs
@@ -8,7 +8,6 @@ open System
 open System.Collections.Generic
 
 open Internal.Utilities
-open Internal.Utilities.StructuredFormat
 
 open FSharp.Compiler.AbstractIL 
 open FSharp.Compiler.AbstractIL.IL 
@@ -10382,25 +10381,9 @@ and TcMethodApplication
     // STEP 3. Resolve overloading 
     /// Select the called method that's the result of overload resolution
     let finalCalledMeth =
-        let formatOptions = FormatOptions.Default
-        let getArgType =
-            function | (Some argName), typeLayout -> sprintf "(%s) : %s" argName (Display.layout_to_string formatOptions typeLayout)
-                     | _, typeLayout -> (Display.layout_to_string formatOptions typeLayout)
-
+      
         let callerArgs = { Unnamed = unnamedCurriedCallerArgs ; Named = namedCurriedCallerArgs }
-        let argsMessage =
-            match callerArgs.LayoutArgumentTypes denv with
-            | [] -> String.Empty
-            | [item] -> item |> getArgType |> FSComp.SR.csNoOverloadsFoundArgumentsPrefixSingular
-            | items -> 
-                let args = 
-                    items 
-                    |> List.map (getArgType >> FSComp.SR.csNoOverloadsFoundArgumentsSingleArgumentInstance)
-                    |> List.toArray
-                    |> String.concat Environment.NewLine
-                (FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural()) + args
-          
-        printfn "%A" argsMessage
+
         let postArgumentTypeCheckingCalledMethGroup = 
             preArgumentTypeCheckingCalledMethGroup |> List.map (fun (minfo: MethInfo, minst, pinfoOpt, usesParamArrayConversion) ->
                 let callerTyArgs = 
diff --git a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
index 0f3686a317..287ff062e6 100644
--- a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
+++ b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
@@ -1,3 +1,13 @@
+module Overloads
 System.Convert.ToString('a',0) |> ignore
+System.Convert.ToString(provider='a', value=0) |> ignore
+System.Convert.ToString(provider=null, value=0) |> ignore
 
-//<Expects id="FS0039" status="error" span="(1,1-1,1)">is not compatible with type</Expects>
+//<Expects id="FS0039" status="error" span="(2,1-2,31)">Arguments given:</Expects>
+//<Expects id="FS0039" status="error" span="(2,1-2,31)"> - char</Expects>
+//<Expects id="FS0039" status="error" span="(2,1-2,31)"> - int</Expects>
+//<Expects id="FS0039" status="error" span="(3,1-3,47)">Arguments given:</Expects>
+//<Expects id="FS0039" status="error" span="(3,1-3,47)"> - (provider) : char</Expects>
+//<Expects id="FS0039" status="error" span="(3,1-3,47)"> - (value) : int</Expects>
+//<Expects id="FS0039" status="error" span="(4,1-4,48)"> - (provider) : obj</Expects>
+//<Expects id="FS0039" status="error" span="(4,1-4,48)"> - (value) : int</Expects>

From 9eb633a570677a3ebdc9bf53b50b69454a1714fa Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 25 Apr 2019 09:52:56 -0700
Subject: [PATCH 19/96] Overload resolution error messages: things display like
 I want in fsi, almost like I want in VS2019, this is for the simple non
 generic method overload case.

I want to check if user experience changes wrt https://github.com/Microsoft/visualfsharp/issues/2503 and put some time to add tests.
---
 src/fsharp/CompileOps.fs       |  4 ++--
 src/fsharp/ConstraintSolver.fs | 13 ++++++-------
 src/fsharp/FSComp.txt          |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 54250d6620..9f698492a3 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -771,10 +771,10 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
 #endif
 
       | UnresolvedOverloading(denv, mtext, overloads, m) ->
-          os.AppendLine mtext |> ignore
+          os.Append mtext |> ignore
           overloads
           |> List.map (fun e -> e.overload.OverloadMethodInfo denv m |> FSComp.SR.formatDashItem)
-          |> List.iter (os.AppendLine >> ignore)
+          |> List.iter (os.Append >> ignore)
 
       | UnresolvedConversionOperator(denv, fromTy, toTy, _) -> 
           let t1, t2, _tpcs = NicePrint.minimalStringsOfTwoTypes denv fromTy toTy
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 166608383d..91d9a1a2c4 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2542,24 +2542,23 @@ and ResolveOverloading
                             function | (Some argName), typeLayout -> sprintf "(%s) : %s" argName (Display.layout_to_string formatOptions typeLayout)
                                      | _, typeLayout -> (Display.layout_to_string formatOptions typeLayout)
 
+                        let nl = System.Environment.NewLine
                         let argsMessage =
                             match callerArgs.LayoutArgumentTypes denv with
                             | [] -> System.String.Empty
-                            | [item] -> Environment.NewLine + (item |> getArgType |> FSComp.SR.csNoOverloadsFoundArgumentsPrefixSingular)
+                            | [item] -> nl + (item |> getArgType |> FSComp.SR.csNoOverloadsFoundArgumentsPrefixSingular)
                             | items -> 
                                 let args = 
                                     items 
                                     |> List.map (getArgType >> FSComp.SR.formatDashItem)
                                     |> List.toArray
-                                    |> String.concat Environment.NewLine
+                                    |> String.concat nl
 
-                                Environment.NewLine 
-                                + Environment.NewLine 
+                                nl + nl
                                 + (FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural()) 
-                                + Environment.NewLine 
+                                + nl
                                 + args
-                                + Environment.NewLine 
-                                + Environment.NewLine 
+                                + nl + nl
 
   
                         //printfn "%A" argsMessage
diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index a2a0df1dd1..77658e731a 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -366,7 +366,7 @@ csNoOverloadsFoundArgumentsPrefixSingular,"Argument given: %s"
 csNoOverloadsFoundArgumentsPrefixPlural,"Arguments given:"
 csMethodIsOverloaded,"A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed."
 csCandidates,"Candidates: %s"
-csSeeAvailableOverloads,"The available overloads are shown below."
+csSeeAvailableOverloads,"Available overloads:"
 512,parsDoCannotHaveVisibilityDeclarations,"Accessibility modifiers are not permitted on 'do' bindings, but '%s' was given."
 513,parsEofInHashIf,"End of file in #if section begun at or after here"
 514,parsEofInString,"End of file in string begun at or before here"

From b49d2850bdc45faaca51a475abfcfe554c3aeb84 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 25 Apr 2019 23:10:08 -0700
Subject: [PATCH 20/96] adjust message for candidates overload

---
 src/fsharp/ConstraintSolver.fs                | 25 ++++++++++++++-----
 src/fsharp/FSComp.txt                         |  2 +-
 .../E_System.Threading.Tasks.Task.Run.fs      | 20 +++++++++++++++
 3 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Threading.Tasks.Task.Run.fs

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 91d9a1a2c4..8a29d1ef84 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2569,12 +2569,25 @@ and ResolveOverloading
                             match methodNames with
                             | [] -> msg
                             | names -> 
-                              names 
-                              |> List.map (fun overload -> NicePrint.stringOfMethInfo amap m denv overload.methodSlot.Method)
-                              |> List.sort
-                              |> String.concat ", "
-                              |> FSComp.SR.csCandidates
-                              |> sprintf "%s %s %s" argsMessage msg
+                                let overloads =
+
+                                    FSComp.SR.csCandidates ()
+                                    + nl +
+                                    (
+                                    names 
+                                    |> List.map (fun overload -> NicePrint.stringOfMethInfo amap m denv overload.methodSlot.Method)
+                                    |> List.sort
+                                    |> List.map FSComp.SR.formatDashItem
+                                    |> String.concat nl)
+                                    
+
+                                msg 
+                                + nl
+                                + argsMessage  
+                                + nl
+                                + nl
+                                + overloads
+                                
 
                     let overloads =
                         overloadResolutionFailure
diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index 77658e731a..226bf6cb1d 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -365,7 +365,7 @@ csNoOverloadsFound,"No overloads match for method '%s'."
 csNoOverloadsFoundArgumentsPrefixSingular,"Argument given: %s"
 csNoOverloadsFoundArgumentsPrefixPlural,"Arguments given:"
 csMethodIsOverloaded,"A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed."
-csCandidates,"Candidates: %s"
+csCandidates,"Candidates:"
 csSeeAvailableOverloads,"Available overloads:"
 512,parsDoCannotHaveVisibilityDeclarations,"Accessibility modifiers are not permitted on 'do' bindings, but '%s' was given."
 513,parsEofInHashIf,"End of file in #if section begun at or after here"
diff --git a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Threading.Tasks.Task.Run.fs b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Threading.Tasks.Task.Run.fs
new file mode 100644
index 0000000000..a0d7fa1c71
--- /dev/null
+++ b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Threading.Tasks.Task.Run.fs
@@ -0,0 +1,20 @@
+open System
+open System.Threading.Tasks
+let makeTask () = new Task<_>(fun () -> 1)
+let task = makeTask()
+let rt1 = Task.Run(fun () -> task)
+let rt2 = Task.Run(Func<_>(fun () -> task))
+let rt3 = Task.Run<_>(Func<_>(fun () -> task))
+let rt4 : Task<_> = Task.Run<_>(Func<_>(fun () -> task))
+let rt5 = Task.Run(Func<Task<_>>(fun () -> task))
+let rt6 = Task.Run(Func<Task<int>>(fun () -> task))
+let rt7 = Task.Run<int>(Func<Task<int>>(fun () -> task))
+let rt8 = Task.Run<int>(Func<Task<_>>(fun () -> task))
+let rt9 = Task.Run<int>(Func<_>(fun () -> task))
+let rt10 = Task.Run<int>(fun () -> task)
+
+//<Expects id="FS0039" status="error" span="(5,11-5,35)">A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.</Expects>
+//<Expects id="FS0039" status="error" span="(5,11-5,35)">Argument given: unit -> Task<int></Expects>
+//<Expects id="FS0039" status="error" span="(5,11-5,35)">Candidates:</Expects>
+//<Expects id="FS0039" status="error" span="(5,11-5,35)"> - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult></Expects>
+//<Expects id="FS0039" status="error" span="(5,11-5,35)"> - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult></Expects>
\ No newline at end of file

From 6aaf2dde1fa2edafb8c45efaca6e0b0e23c36619 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Mon, 29 Apr 2019 13:33:18 -0700
Subject: [PATCH 21/96] Hijack the split phase for UnresolvedOverloading,
 remove the match on PossibleOverload.

It consolidates some more of the string building logic, and it now shows as a single compact and exhaustive error message in VS

Thinking I'll change PossibleOverload to not be an exception if going this way is OK
---
 src/fsharp/CompileOps.fs | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 9f698492a3..09b484b332 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -403,12 +403,9 @@ let warningOn err level specificWarnOn =
     | 3180 -> false // abImplicitHeapAllocation - off by default
     | _ -> level >= GetWarningLevel err 
 
-let SplitRelatedDiagnostics(err: PhasedDiagnostic) = 
+let SplitRelatedDiagnostics(err: PhasedDiagnostic) : PhasedDiagnostic * PhasedDiagnostic list = 
     let ToPhased e = {Exception=e; Phase = err.Phase}
     let rec SplitRelatedException = function
-      | UnresolvedOverloading(displayEnv, msg, overloads, m) -> 
-           let related = overloads |> List.map ToPhased
-           UnresolvedOverloading(displayEnv, msg, [], m) |> ToPhased, related
       | ConstraintSolverRelatedInformation(fopt, m2, e) -> 
           let e, related = SplitRelatedException e
           ConstraintSolverRelatedInformation(fopt, m2, e.Exception)|>ToPhased, related
@@ -771,27 +768,15 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
 #endif
 
       | UnresolvedOverloading(denv, mtext, overloads, m) ->
-          os.Append mtext |> ignore
+          os.AppendLine mtext |> ignore
           overloads
           |> List.map (fun e -> e.overload.OverloadMethodInfo denv m |> FSComp.SR.formatDashItem)
-          |> List.iter (os.Append >> ignore)
+          |> List.iter (os.AppendLine >> ignore)
 
       | UnresolvedConversionOperator(denv, fromTy, toTy, _) -> 
           let t1, t2, _tpcs = NicePrint.minimalStringsOfTwoTypes denv fromTy toTy
           os.Append(FSComp.SR.csTypeDoesNotSupportConversion(t1, t2)) |> ignore
 
-      | PossibleOverload(denv, minfo, m) ->
-          minfo.OverloadMethodInfo denv m
-          |> FSComp.SR.formatDashItem
-          |> os.Append
-          |> ignore
-          
-          //// print original error that describes reason why this overload was rejected
-          //let minfo = minfo.OverloadMethodInfo denv m
-          //let buf = new StringBuilder()
-          //OutputExceptionR buf minfo.error
-          //os.Append(PossibleOverloadE().Format minfo (buf.ToString())) |> ignore
-
       | FunctionExpected _ ->
           os.Append(FunctionExpectedE().Format) |> ignore
 

From f66e082e326b58c9d67783838e1138cc0fe485d7 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Mon, 29 Apr 2019 15:25:24 -0700
Subject: [PATCH 22/96] updating existing failing baseline files that looks
 correct to me

---
 tests/fsharp/typecheck/sigs/neg106.bsl | 196 +++++++++++++------------
 tests/fsharp/typecheck/sigs/neg20.bsl  | 124 +++++++++++-----
 tests/fsharp/typecheck/sigs/neg45.bsl  |  48 +++++-
 3 files changed, 235 insertions(+), 133 deletions(-)

diff --git a/tests/fsharp/typecheck/sigs/neg106.bsl b/tests/fsharp/typecheck/sigs/neg106.bsl
index e07dd731fb..c8cdb088bb 100644
--- a/tests/fsharp/typecheck/sigs/neg106.bsl
+++ b/tests/fsharp/typecheck/sigs/neg106.bsl
@@ -1,81 +1,71 @@
 
 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<int>, value: int, comparand: int) : int
+
+ - 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<float>, value: float, comparand: float) : float
+
+ - 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'. 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<int>, value: int, comparand: int) : int
+
+ - 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<float>, value: float, comparand: float) : float
+
+ - 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>'    
@@ -89,29 +79,45 @@ 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:string * x:byref<int> -> unit
+
+ - static member C.M : a:int * 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
+
+
 
 neg106.fs(49,22,49,26): typecheck error FS0001: Type mismatch. Expecting a
     'byref<int>'    
diff --git a/tests/fsharp/typecheck/sigs/neg20.bsl b/tests/fsharp/typecheck/sigs/neg20.bsl
index 7e95a4e098..a5368a91f7 100644
--- a/tests/fsharp/typecheck/sigs/neg20.bsl
+++ b/tests/fsharp/typecheck/sigs/neg20.bsl
@@ -159,17 +159,25 @@ neg20.fs(129,19,129,22): typecheck error FS0001: This expression was expected to
 but here has type
     'string'    
 
-neg20.fs(131,5,131,24): typecheck error FS0041: No overloads match for method 'OM3'. The available overloads are shown below.
-neg20.fs(131,5,131,24): typecheck error FS0041: Possible overload: 'static member C.OM3 : x:'b * y:int -> int'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'int'    
-.
-neg20.fs(131,5,131,24): typecheck error FS0041: Possible overload: 'static member C.OM3 : x:'b * y:'b -> int'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    ''a'    
-.
+neg20.fs(131,5,131,24): typecheck error FS0041: No overloads match for method 'OM3'.
+
+
+
+Arguments given:
+
+ - string
+
+ - obj
+
+
+
+Available overloads:
+
+ - static member C.OM3 : x:'b * y:int -> int
+
+ - static member C.OM3 : x:'b * y:'b -> int
+
+
 
 neg20.fs(152,13,152,23): typecheck error FS0033: The type 'Test.BadNumberOfGenericParameters.C<_>' expects 1 type argument(s) but is given 2
 
@@ -199,17 +207,25 @@ neg20.fs(166,13,166,35): typecheck error FS0502: The member or object constructo
 
 neg20.fs(167,13,167,31): typecheck error FS0502: The member or object constructor 'M5' takes 2 type argument(s) but is here given 1. The required signature is 'member C.M5 : y:'a * z:'b -> int'.
 
-neg20.fs(182,14,182,31): typecheck error FS0041: No overloads match for method 'M'. The available overloads are shown below.
-neg20.fs(182,14,182,31): typecheck error FS0041: Possible overload: 'static member C2.M : fmt:string * [<System.ParamArray>] args:int [] -> string'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'int'    
-.
-neg20.fs(182,14,182,31): typecheck error FS0041: Possible overload: 'static member C2.M : fmt:string * [<System.ParamArray>] args:int [] -> string'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'int []'    
-.
+neg20.fs(182,14,182,31): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Arguments given:
+
+ - string
+
+ - obj
+
+
+
+Available overloads:
+
+ - static member C2.M : fmt:string * [<System.ParamArray>] args:int [] -> string
+
+ - static member C2.M : fmt:string * [<System.ParamArray>] args:int [] -> string
+
+
 
 neg20.fs(183,29,183,34): typecheck error FS0001: This expression was expected to have type
     'int'    
@@ -256,17 +272,25 @@ neg20.fs(184,34,184,39): typecheck error FS0001: This expression was expected to
 but here has type
     'obj'    
 
-neg20.fs(188,14,188,31): typecheck error FS0041: No overloads match for method 'M'. The available overloads are shown below.
-neg20.fs(188,14,188,31): typecheck error FS0041: Possible overload: 'static member C3.M : fmt:string * [<System.ParamArray>] args:string [] -> string'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'string'    
-.
-neg20.fs(188,14,188,31): typecheck error FS0041: Possible overload: 'static member C3.M : fmt:string * [<System.ParamArray>] args:string [] -> string'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'string []'    
-.
+neg20.fs(188,14,188,31): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Arguments given:
+
+ - string
+
+ - obj
+
+
+
+Available overloads:
+
+ - static member C3.M : fmt:string * [<System.ParamArray>] args:string [] -> string
+
+ - static member C3.M : fmt:string * [<System.ParamArray>] args:string [] -> string
+
+
 
 neg20.fs(189,29,189,34): typecheck error FS0001: This expression was expected to have type
     'string'    
@@ -389,9 +413,39 @@ neg20.fs(319,8,319,17): typecheck error FS3132: This type definition may not hav
 
 neg20.fs(322,8,322,18): typecheck error FS3132: This type definition may not have the 'CLIMutable' attribute. Only record types may have this attribute.
 
-neg20.fs(335,11,335,24): typecheck error FS0041: A unique overload for method 'String' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: System.String(value: char []) : System.String, System.String(value: nativeptr<char>) : System.String, System.String(value: nativeptr<sbyte>) : System.String
+neg20.fs(335,11,335,24): typecheck error FS0041: A unique overload for method 'String' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: 'a
+
+
+
+Candidates:
+
+ - System.String(value: char []) : System.String
+
+ - System.String(value: nativeptr<char>) : System.String
+
+ - System.String(value: nativeptr<sbyte>) : System.String
+
+
+
+neg20.fs(336,11,336,22): typecheck error FS0041: A unique overload for method 'Guid' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: 'a
+
+
+
+Candidates:
+
+ - System.Guid(b: byte []) : System.Guid
+
+ - System.Guid(g: string) : System.Guid
+
 
-neg20.fs(336,11,336,22): typecheck error FS0041: A unique overload for method 'Guid' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: System.Guid(b: byte []) : System.Guid, System.Guid(g: string) : System.Guid
 
 neg20.fs(355,19,355,38): typecheck error FS1124: Multiple types exist called 'OverloadedClassName', taking different numbers of generic parameters. Provide a type instantiation to disambiguate the type resolution, e.g. 'OverloadedClassName<_>'.
 
diff --git a/tests/fsharp/typecheck/sigs/neg45.bsl b/tests/fsharp/typecheck/sigs/neg45.bsl
index 272cca13a0..d74a99b19a 100644
--- a/tests/fsharp/typecheck/sigs/neg45.bsl
+++ b/tests/fsharp/typecheck/sigs/neg45.bsl
@@ -53,11 +53,53 @@ neg45.fs(80,20,80,22): typecheck error FS0340: The signature and implementation
 
 neg45.fs(81,35,81,40): typecheck error FS0001: A type parameter is missing a constraint 'when 'T :> System.IComparable'
 
-neg45.fs(89,26,89,40): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: member D.M : 'a -> 'b, member D.M : 'a -> 'b
+neg45.fs(89,26,89,40): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: R1
+
+
+
+Candidates:
+
+ - member D.M : 'a -> 'b
+
+ - member D.M : 'a -> 'b
+
+
+
+neg45.fs(97,26,97,55): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: (R1 * R1)
+
+
+
+Candidates:
+
+ - member D.M : 'a -> 'b
+
+ - member D.M : 'a -> 'b
+
+
+
+neg45.fs(104,26,104,31): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: int
+
+
+
+Candidates:
+
+ - member D.M : 'a -> 'b
+
+ - member D.M : 'a -> 'b
 
-neg45.fs(97,26,97,55): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: member D.M : 'a -> 'b, member D.M : 'a -> 'b
 
-neg45.fs(104,26,104,31): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: member D.M : 'a -> 'b, member D.M : 'a -> 'b
 
 neg45.fs(105,24,105,25): typecheck error FS0025: Incomplete pattern matches on this expression. For example, the value '0' may indicate a case not covered by the pattern(s).
 

From 3f0371773888c9917ec41b293aab81762fb27fc5 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Mon, 29 Apr 2019 15:26:40 -0700
Subject: [PATCH 23/96] quickfix for update.base.line.with.actuals.fsx so that
 it skips missing base line files in the loop

---
 tests/fsharp/update.base.line.with.actuals.fsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/fsharp/update.base.line.with.actuals.fsx b/tests/fsharp/update.base.line.with.actuals.fsx
index 8b391a2f45..20724ddb69 100644
--- a/tests/fsharp/update.base.line.with.actuals.fsx
+++ b/tests/fsharp/update.base.line.with.actuals.fsx
@@ -7,6 +7,7 @@ open System.IO
 let directories =
     [
       "typecheck/sigs"
+      "typecheck/overloads"
       "typeProviders/negTests"
     ]
     |> List.map (fun d -> Path.Combine(__SOURCE_DIRECTORY__, d) |> DirectoryInfo)
@@ -17,7 +18,7 @@ for d in directories do
         for errFile in d.GetFiles p do
             let baseLineFile = FileInfo(Path.ChangeExtension(errFile.FullName, "bsl"))
             let baseLineFilePreProcess = FileInfo(Path.ChangeExtension(errFile.FullName, "bslpp"))
-
+            if not baseLineFile.Exists then () else
             if File.ReadAllText(errFile.FullName) <> File.ReadAllText(baseLineFile.FullName) then
                 let expectedFile =
                     if baseLineFilePreProcess.Exists then baseLineFilePreProcess

From 389a804d2c929dce3adf8fa866a7dc99f513ceb3 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Mon, 29 Apr 2019 18:54:29 -0700
Subject: [PATCH 24/96] (minor) minimize diff, typos, comments

---
 src/fsharp/ConstraintSolver.fs | 23 ++++++++++-------------
 src/fsharp/FSComp.txt          |  6 +++---
 src/fsharp/MethodCalls.fs      |  8 ++++----
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 8a29d1ef84..52887216d9 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2536,12 +2536,14 @@ and ResolveOverloading
                 | Some (fromTy, toTy) -> 
                     UnresolvedConversionOperator (denv, fromTy, toTy, m)
                 | None -> 
-                    let msg = 
-                        let formatOptions = FormatOptions.Default
-                        let getArgType =
-                            function | (Some argName), typeLayout -> sprintf "(%s) : %s" argName (Display.layout_to_string formatOptions typeLayout)
-                                     | _, typeLayout -> (Display.layout_to_string formatOptions typeLayout)
-
+                    // Otherwise collect a list of possible overloads
+                    let nl = System.Environment.NewLine
+                    let msg =
+                        let displayArgType (name , ttype) =
+                            let typeDisplay = NicePrint.prettyStringOfTy denv ttype
+                            match name with
+                            | Some name -> sprintf "(%s) : %s" name typeDisplay
+                            | None -> sprintf "%s" typeDisplay
                         let nl = System.Environment.NewLine
                         let argsMessage =
                             match callerArgs.LayoutArgumentTypes denv with
@@ -2619,7 +2621,7 @@ and ResolveOverloading
                                              reqdRetTyOpt 
                                              calledMeth) with 
                             | OkResult _ -> None
-                            | ErrorResult(_exns, exn) -> Some {methodSlot = calledMeth; amap = amap; error = exn })
+                            | ErrorResult(_, exn) -> Some {methodSlot = calledMeth; amap = amap; error = exn })
 
                 None, ErrorD (failOverloading (NoOverloadsFound (methodName, errors))), NoTrace
 
@@ -2793,8 +2795,6 @@ and ResolveOverloading
                 match bestMethods with 
                 | [(calledMeth, warns, t)] -> Some calledMeth, OkResult (warns, ()), WithTrace t
                 | bestMethods -> 
-                    
-                    //let methodNames =
                     let methods = 
                         let getMethodSlotsAndErrors =
                           function | methodSlot, []      -> List.singleton {methodSlot = methodSlot; error = Unchecked.defaultof<exn>; amap = amap}
@@ -2812,11 +2812,8 @@ and ResolveOverloading
                             | m -> m |> List.map (fun (methodSlot, errors, _) -> getMethodSlotsAndErrors (methodSlot,errors))
                         | m -> m |> List.map (fun (methodSlot, errors, _) -> getMethodSlotsAndErrors (methodSlot,errors))
 
-
                     let methods = List.concat methods
-                    //|> List.map (fun cmeth -> NicePrint.stringOfMethInfo amap m denv cmeth.Method)
-                    //|> List.sort
-                    
+
                     None, ErrorD (failOverloading (PossibleCandidates(methodName, methods))), NoTrace
 
     // If we've got a candidate solution: make the final checks - no undo here! 
diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index 226bf6cb1d..7c7d8924c2 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -1,6 +1,6 @@
-# ------------------------------------------------------------------------------
-# use a completely new error number and keep messages in their surounding groups
-# ------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
+# use a completely new error number and keep messages in their surrounding groups
+# -------------------------------------------------------------------------------
 undefinedNameNamespace,"The namespace '%s' is not defined."
 undefinedNameNamespaceOrModule,"The namespace or module '%s' is not defined."
 undefinedNameFieldConstructorOrMember,"The field, constructor or member '%s' is not defined."
diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index e843a04cc6..0917092287 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -326,10 +326,10 @@ type CalledMeth<'T>
        callerTyArgs: TType list,    // the 'caller type arguments', i.e. user-given generic instantiation of the method we're attempting to call 
        pinfoOpt: PropInfo option,   // the property related to the method we're attempting to call, if any  
        callerObjArgTys: TType list, // the types of the actual object argument, if any 
-       callerArgs: CallerArgs<'T>, // the data about any arguments supplied by the caller 
-       allowParamArgs: bool,     // do we allow the use of a param args method in its "expanded" form?
-       allowOutAndOptArgs: bool, // do we allow the use of the transformation that converts out arguments as tuple returns?
-       tyargsOpt : TType option) // method parameters
+       callerArgs: CallerArgs<'T>,  // the data about any arguments supplied by the caller 
+       allowParamArgs: bool,        // do we allow the use of a param args method in its "expanded" form?
+       allowOutAndOptArgs: bool,    // do we allow the use of the transformation that converts out arguments as tuple returns?
+       tyargsOpt : TType option)    // method parameters
     =
     let g = infoReader.g
     let methodRetTy = minfo.GetFSharpReturnTy(infoReader.amap, m, calledTyArgs)

From dbe7a376b89ab0912ac95596654dbf11568b9a33 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Mon, 29 Apr 2019 19:05:52 -0700
Subject: [PATCH 25/96] fix vsintegration tests affected by overload error
 message changes

---
 .../Tests.LanguageService.ErrorList.fs        | 72 ++++++++++++++-----
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
index be8401a613..93112a0e1e 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
@@ -57,6 +57,23 @@ type UsingMSBuild() as this =
         let ok = errors |> List.exists (fun err -> err.Message = text)
         Assert.IsTrue(ok, sprintf "Error list should contain '%s' message" text)
 
+    let assertExpectedErrorMessages expected (actual: list<Error>) =
+        let normalizeCR input = System.Text.RegularExpressions.Regex.Replace(input, @"\r\n|\n\r|\n|\r", "\r\n")
+        let actual = 
+            actual 
+            |> Seq.map (fun e -> e.Message)
+            |> String.concat Environment.NewLine
+            |> normalizeCR
+        let expected = expected |> String.concat Environment.NewLine |> normalizeCR
+        
+        let message = 
+            sprintf """
+=[ expected ]============
+%s
+=[ actual ]==============
+%s
+=========================""" expected actual
+        Assert.AreEqual(expected, actual, message)
 
     //verify the error list Count
     member private this.VerifyErrorListCountAtOpenProject(fileContents : string, num : int) =
@@ -191,17 +208,18 @@ let g (t : T) = t.Count()
         """
 
         let expectedMessages =
-            [ "Possible overload: 'new : bool -> X'."
-              "Possible overload: 'new : int -> X'." ]
+            [ """No overloads match for method 'X'.
 
-        CheckErrorList content <|
-            fun errors ->
-                Assert.AreEqual(3, List.length errors)
-                assertContains errors "No overloads match for method 'X'. The available overloads are shown below."
-                for expected in expectedMessages do
-                   errors
-                   |> List.exists (fun e -> e.Message.StartsWith expected)
-                   |> Assert.IsTrue
+Argument given: float
+
+Available overloads:
+ - new : bool -> X
+ - new : int -> X
+""" 
+            ]
+
+        CheckErrorList content (assertExpectedErrorMessages expectedMessages)
+            
 
     [<Test>]
     member public this.``Query.InvalidJoinRelation.GroupJoin``() = 
@@ -277,10 +295,19 @@ let x =
         let content = """
         System.Console.WriteLine(null)
         """
-        CheckErrorList content <|
-            fun errors ->
-                Assert.AreEqual(1, List.length errors)
-                assertContains errors "A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: System.Console.WriteLine(buffer: char []) : unit, System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit, System.Console.WriteLine(value: obj) : unit, System.Console.WriteLine(value: string) : unit"
+        let expectedMessages = [
+"""A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Argument given: 'a when 'a : null
+
+Candidates:
+ - System.Console.WriteLine(buffer: char []) : unit
+ - System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit
+ - System.Console.WriteLine(value: obj) : unit
+ - System.Console.WriteLine(value: string) : unit
+"""
+        ]
+        CheckErrorList content (assertExpectedErrorMessages expectedMessages)
 
     [<Test>]
     member public this.``InvalidMethodOverload2``() = 
@@ -294,10 +321,19 @@ type B() =
 let b = B()
 b.Do(1, 1)
         """
-        CheckErrorList content <|
-            fun errors ->
-                Assert.AreEqual(1, List.length errors)
-                assertContains errors "A unique overload for method 'Do' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: member A.Do : a:int * b:'T -> unit, member A.Do : a:int * b:int -> unit"
+        let expectedMessages = [
+"""A unique overload for method 'Do' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Arguments given:
+ - int
+ - int
+
+Candidates:
+ - member A.Do : a:int * b:'T -> unit
+ - member A.Do : a:int * b:int -> unit
+"""        
+        ]
+        CheckErrorList content (assertExpectedErrorMessages expectedMessages)
 
     [<Test; Category("Expensive")>]
     member public this.``NoErrorInErrList``() = 

From f8e7428b1b283002a95a4c226614c7d5597ac68e Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 30 Apr 2019 10:44:08 -0700
Subject: [PATCH 26/96] merge issue unused variable warning

---
 src/fsharp/ConstraintSolver.fs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 52887216d9..19e639706d 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2537,7 +2537,6 @@ and ResolveOverloading
                     UnresolvedConversionOperator (denv, fromTy, toTy, m)
                 | None -> 
                     // Otherwise collect a list of possible overloads
-                    let nl = System.Environment.NewLine
                     let msg =
                         let displayArgType (name , ttype) =
                             let typeDisplay = NicePrint.prettyStringOfTy denv ttype

From c51e25ceefb2f1e70620c4de66b14e522572df8f Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 30 Apr 2019 10:46:14 -0700
Subject: [PATCH 27/96] update the 12 fsharpqa migrated baseline with new error
 messages

---
 .../expressions/syntacticsugar/E_Slices01.bsl | 104 +++++++++++-
 .../expressions/syntacticsugar/E_Slices01.fsx |   7 -
 .../E_LeftToRightOverloadResolution01.bsl     |  76 ++++++++-
 .../inference/E_OneTypeVariable03.bsl         |  50 +++++-
 .../inference/E_OneTypeVariable03rec.bsl      |  50 +++++-
 .../E_TwoDifferentTypeVariables01.bsl         |  96 ++++++++++-
 .../E_TwoDifferentTypeVariables01rec.bsl      |  96 ++++++++++-
 .../E_TwoDifferentTypeVariablesGen00rec.bsl   |  72 ++++++++-
 .../inference/E_TwoEqualTypeVariables02.bsl   | 150 +++++++++++++++++-
 .../E_TwoEqualYypeVariables02rec.bsl          | 150 +++++++++++++++++-
 .../E_Clashing_Values_in_AbstractClass01.bsl  |  12 +-
 .../E_Clashing_Values_in_AbstractClass03.bsl  |  32 +++-
 .../E_Clashing_Values_in_AbstractClass04.bsl  |  32 +++-
 13 files changed, 882 insertions(+), 45 deletions(-)

diff --git a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
index 5e9fee6f6c..35a2d0cb85 100644
--- a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
+++ b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
@@ -1,11 +1,107 @@
 
-E_Slices01.fsx(22,9,22,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: member Foo.GetSlice : x:int * y1:int option * y2:float option -> unit, member Foo.GetSlice : x:int * y1:int option * y2:int option -> unit
+E_Slices01.fsx(22,9,22,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-E_Slices01.fsx(23,9,23,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: member Foo.GetSlice : x:int * y1:int option * y2:float option -> unit, member Foo.GetSlice : x:int * y1:int option * y2:int option -> unit
 
-E_Slices01.fsx(24,9,24,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: member Foo.GetSlice : x1:float option * x2:int option * y:int -> unit, member Foo.GetSlice : x1:int option * x2:int option * y:int -> unit
 
-E_Slices01.fsx(25,9,25,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: member Foo.GetSlice : x1:float option * x2:int option * y:int -> unit, member Foo.GetSlice : x1:int option * x2:int option * y:int -> unit
+Arguments given:
+
+ - int
+
+ - int option
+
+ - 'a option
+
+
+
+
+
+
+
+Candidates:
+
+ - member Foo.GetSlice : x:int * y1:int option * y2:float option -> unit
+
+ - member Foo.GetSlice : x:int * y1:int option * y2:int option -> unit
+
+
+
+E_Slices01.fsx(23,9,23,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - int
+
+ - 'a option
+
+ - 'a option
+
+
+
+
+
+
+
+Candidates:
+
+ - member Foo.GetSlice : x:int * y1:int option * y2:float option -> unit
+
+ - member Foo.GetSlice : x:int * y1:int option * y2:int option -> unit
+
+
+
+E_Slices01.fsx(24,9,24,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a option
+
+ - int option
+
+ - int
+
+
+
+
+
+
+
+Candidates:
+
+ - member Foo.GetSlice : x1:float option * x2:int option * y:int -> unit
+
+ - member Foo.GetSlice : x1:int option * x2:int option * y:int -> unit
+
+
+
+E_Slices01.fsx(25,9,25,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a option
+
+ - 'a option
+
+ - int
+
+
+
+
+
+
+
+Candidates:
+
+ - member Foo.GetSlice : x1:float option * x2:int option * y:int -> unit
+
+ - member Foo.GetSlice : x1:int option * x2:int option * y:int -> unit
+
+
 
 E_Slices01.fsx(26,9,26,17): typecheck error FS0039: The type 'Foo<a>' does not define the field, constructor or member 'Item'.
 
diff --git a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fsx b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fsx
index 72e00c534e..3512f1ec0a 100644
--- a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fsx
+++ b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.fsx
@@ -2,13 +2,6 @@
 #light
 
 // Verify errors related to ambiguous slicing overloads
-//<Expects id="FS0041" status="error" span="(22,9)">A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: member Foo\.GetSlice : x:int \* y1:int option \* y2:float option -> unit, member Foo\.GetSlice : x:int \* y1:int option \* y2:int option -> unit</Expects>
-//<Expects id="FS0041" status="error" span="(23,9)">A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: member Foo\.GetSlice : x:int \* y1:int option \* y2:float option -> unit, member Foo\.GetSlice : x:int \* y1:int option \* y2:int option -> unit</Expects>
-//<Expects id="FS0041" status="error" span="(24,9)">A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: member Foo\.GetSlice : x1:float option \* x2:int option \* y:int -> unit, member Foo\.GetSlice : x1:int option \* x2:int option \* y:int -> unit</Expects>
-//<Expects id="FS0041" status="error" span="(25,9)">A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: member Foo\.GetSlice : x1:float option \* x2:int option \* y:int -> unit, member Foo\.GetSlice : x1:int option \* x2:int option \* y:int -> unit</Expects>
-//<Expects id="FS0039" status="error" span="(26,9)">The field, constructor or member 'Item' is not defined</Expects>
-//<Expects id="FS0503" status="error" span="(27,9)">A member or object constructor 'GetSlice' taking 4 arguments is not accessible from this code location\. All accessible versions of method 'GetSlice' take 3 arguments\.</Expects>
-//<Expects id="FS0503" status="error" span="(28,9)">A member or object constructor 'GetSlice' taking 5 arguments is not accessible from this code location\. All accessible versions of method 'GetSlice' take 3 arguments\.</Expects>
 
 type Foo<'a>() =
     member this.GetSlice(x : int, y1 : int option, y2 : int option) = ()
diff --git a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
index 640806d814..d5b7327501 100644
--- a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
+++ b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
@@ -1,4 +1,76 @@
 
-E_LeftToRightOverloadResolution01.fsx(7,23,7,51): typecheck error FS0041: A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: System.Console.WriteLine(buffer: char []) : unit, System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit, System.Console.WriteLine(value: bool) : unit, System.Console.WriteLine(value: char) : unit, System.Console.WriteLine(value: decimal) : unit, System.Console.WriteLine(value: float) : unit, System.Console.WriteLine(value: float32) : unit, System.Console.WriteLine(value: int) : unit, System.Console.WriteLine(value: int64) : unit, System.Console.WriteLine(value: obj) : unit, System.Console.WriteLine(value: string) : unit, System.Console.WriteLine(value: uint32) : unit, System.Console.WriteLine(value: uint64) : unit
+E_LeftToRightOverloadResolution01.fsx(7,23,7,51): typecheck error FS0041: A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: 'a
+
+
+
+Candidates:
+
+ - System.Console.WriteLine(buffer: char []) : unit
+
+ - System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit
+
+ - System.Console.WriteLine(value: bool) : unit
+
+ - System.Console.WriteLine(value: char) : unit
+
+ - System.Console.WriteLine(value: decimal) : unit
+
+ - System.Console.WriteLine(value: float) : unit
+
+ - System.Console.WriteLine(value: float32) : unit
+
+ - System.Console.WriteLine(value: int) : unit
+
+ - System.Console.WriteLine(value: int64) : unit
+
+ - System.Console.WriteLine(value: obj) : unit
+
+ - System.Console.WriteLine(value: string) : unit
+
+ - System.Console.WriteLine(value: uint32) : unit
+
+ - System.Console.WriteLine(value: uint64) : unit
+
+
+
+E_LeftToRightOverloadResolution01.fsx(9,23,9,51): typecheck error FS0041: A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: 'a
+
+
+
+Candidates:
+
+ - System.Console.WriteLine(buffer: char []) : unit
+
+ - System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit
+
+ - System.Console.WriteLine(value: bool) : unit
+
+ - System.Console.WriteLine(value: char) : unit
+
+ - System.Console.WriteLine(value: decimal) : unit
+
+ - System.Console.WriteLine(value: float) : unit
+
+ - System.Console.WriteLine(value: float32) : unit
+
+ - System.Console.WriteLine(value: int) : unit
+
+ - System.Console.WriteLine(value: int64) : unit
+
+ - System.Console.WriteLine(value: obj) : unit
+
+ - System.Console.WriteLine(value: string) : unit
+
+ - System.Console.WriteLine(value: uint32) : unit
+
+ - System.Console.WriteLine(value: uint64) : unit
+
 
-E_LeftToRightOverloadResolution01.fsx(9,23,9,51): typecheck error FS0041: A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: System.Console.WriteLine(buffer: char []) : unit, System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit, System.Console.WriteLine(value: bool) : unit, System.Console.WriteLine(value: char) : unit, System.Console.WriteLine(value: decimal) : unit, System.Console.WriteLine(value: float) : unit, System.Console.WriteLine(value: float32) : unit, System.Console.WriteLine(value: int) : unit, System.Console.WriteLine(value: int64) : unit, System.Console.WriteLine(value: obj) : unit, System.Console.WriteLine(value: string) : unit, System.Console.WriteLine(value: uint32) : unit, System.Console.WriteLine(value: uint64) : unit
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl b/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
index ca730fe7ad..53ca50cf46 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
@@ -1,4 +1,50 @@
 
-E_OneTypeVariable03.fsx(60,34,60,44): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C23.M : x:'a * y:'b -> Two, static member C23.M : x:'a * y:int -> Three
+E_OneTypeVariable03.fsx(60,34,60,44): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - int
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C23.M : x:'a * y:'b -> Two
+
+ - static member C23.M : x:'a * y:int -> Three
+
+
+
+E_OneTypeVariable03.fsx(61,34,61,45): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - int
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C123.M : x:'a * y:'a -> One
+
+ - static member C123.M : x:'a * y:'b -> Two
+
+ - static member C123.M : x:'a * y:int -> Three
+
 
-E_OneTypeVariable03.fsx(61,34,61,45): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C123.M : x:'a * y:'a -> One, static member C123.M : x:'a * y:'b -> Two, static member C123.M : x:'a * y:int -> Three
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
index c3d473b6f8..1f496d88e5 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
@@ -1,4 +1,50 @@
 
-E_OneTypeVariable03rec.fsx(60,38,60,48): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C23.M : x:'a * y:'b -> Two, static member C23.M : x:'a * y:int -> Three
+E_OneTypeVariable03rec.fsx(60,38,60,48): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - int
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C23.M : x:'a * y:'b -> Two
+
+ - static member C23.M : x:'a * y:int -> Three
+
+
+
+E_OneTypeVariable03rec.fsx(61,38,61,49): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - int
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C123.M : x:'a * y:'a -> One
+
+ - static member C123.M : x:'a * y:'b -> Two
+
+ - static member C123.M : x:'a * y:int -> Three
+
 
-E_OneTypeVariable03rec.fsx(61,38,61,49): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C123.M : x:'a * y:'a -> One, static member C123.M : x:'a * y:'b -> Two, static member C123.M : x:'a * y:int -> Three
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
index ad9bf2298f..46c1c8765e 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
@@ -1,8 +1,96 @@
 
-E_TwoDifferentTypeVariables01.fsx(61,33,61,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariables01.fsx(61,33,61,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-E_TwoDifferentTypeVariables01.fsx(62,33,62,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C24.M : x:'a * y:'b -> Two, static member C24.M : x:'a * y:C -> Four
 
-E_TwoDifferentTypeVariables01.fsx(63,33,63,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
 
-E_TwoDifferentTypeVariables01.fsx(64,33,64,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C13.M : x:'a * y:'a -> One
+
+ - static member C13.M : x:'a * y:int -> Three
+
+
+
+E_TwoDifferentTypeVariables01.fsx(62,33,62,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C24.M : x:'a * y:'b -> Two
+
+ - static member C24.M : x:'a * y:C -> Four
+
+
+
+E_TwoDifferentTypeVariables01.fsx(63,33,63,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C13.M : x:'a * y:'a -> One
+
+ - static member C13.M : x:'a * y:int -> Three
+
+
+
+E_TwoDifferentTypeVariables01.fsx(64,33,64,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C13.M : x:'a * y:'a -> One
+
+ - static member C13.M : x:'a * y:int -> Three
+
+
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
index 45b7dfd315..2ed81f80d2 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
@@ -1,8 +1,96 @@
 
-E_TwoDifferentTypeVariables01rec.fsx(60,37,60,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariables01rec.fsx(60,37,60,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-E_TwoDifferentTypeVariables01rec.fsx(61,37,61,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C24.M : x:'a * y:'b -> Two, static member C24.M : x:'a * y:C -> Four
 
-E_TwoDifferentTypeVariables01rec.fsx(62,37,62,51): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
 
-E_TwoDifferentTypeVariables01rec.fsx(63,37,63,50): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C13.M : x:'a * y:'a -> One
+
+ - static member C13.M : x:'a * y:int -> Three
+
+
+
+E_TwoDifferentTypeVariables01rec.fsx(61,37,61,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C24.M : x:'a * y:'b -> Two
+
+ - static member C24.M : x:'a * y:C -> Four
+
+
+
+E_TwoDifferentTypeVariables01rec.fsx(62,37,62,51): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C13.M : x:'a * y:'a -> One
+
+ - static member C13.M : x:'a * y:int -> Three
+
+
+
+E_TwoDifferentTypeVariables01rec.fsx(63,37,63,50): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C13.M : x:'a * y:'a -> One
+
+ - static member C13.M : x:'a * y:int -> Three
+
+
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
index 615200ca5b..8ae77411d0 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
@@ -9,7 +9,29 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(62,52,62,53): typecheck error FS0064: Th
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(62,18,62,42): typecheck error FS0043: The type ''b' does not match the type 'int'
 
-E_TwoDifferentTypeVariablesGen00rec.fsx(63,45,63,55): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariablesGen00rec.fsx(63,45,63,55): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C13.M : x:'a * y:'a -> One
+
+ - static member C13.M : x:'a * y:int -> Three
+
+
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(64,56,64,57): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
 
@@ -23,7 +45,29 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(65,56,65,57): typecheck error FS0064: Th
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(65,18,65,42): typecheck error FS0043: The type ''a' does not match the type 'int'
 
-E_TwoDifferentTypeVariablesGen00rec.fsx(66,45,66,59): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariablesGen00rec.fsx(66,45,66,59): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C13.M : x:'a * y:'a -> One
+
+ - static member C13.M : x:'a * y:int -> Three
+
+
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(67,55,67,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
 
@@ -31,7 +75,29 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(67,18,67,42): typecheck error FS0064: Th
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(67,18,67,42): typecheck error FS0043: The type ''b' does not match the type ''b0'
 
-E_TwoDifferentTypeVariablesGen00rec.fsx(68,45,68,58): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C13.M : x:'a * y:'a -> One, static member C13.M : x:'a * y:int -> Three
+E_TwoDifferentTypeVariablesGen00rec.fsx(68,45,68,58): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C13.M : x:'a * y:'a -> One
+
+ - static member C13.M : x:'a * y:int -> Three
+
+
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(69,55,69,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type 'int'.
 
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
index 0e2957d293..2e12a848ba 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
@@ -1,12 +1,150 @@
 
-E_TwoEqualTypeVariables02.fsx(61,33,61,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C12.M : x:'a * y:'a -> One, static member C12.M : x:'a * y:'b -> Two
+E_TwoEqualTypeVariables02.fsx(61,33,61,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-E_TwoEqualTypeVariables02.fsx(62,33,62,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C14.M : x:'a * y:'a -> One, static member C14.M : x:'a * y:C -> Four
 
-E_TwoEqualTypeVariables02.fsx(63,33,63,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C24.M : x:'a * y:'b -> Two, static member C24.M : x:'a * y:C -> Four
 
-E_TwoEqualTypeVariables02.fsx(64,33,64,44): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C123.M : x:'a * y:'a -> One, static member C123.M : x:'a * y:'b -> Two, static member C123.M : x:'a * y:int -> Three
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C12.M : x:'a * y:'a -> One
+
+ - static member C12.M : x:'a * y:'b -> Two
+
+
+
+E_TwoEqualTypeVariables02.fsx(62,33,62,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C14.M : x:'a * y:'a -> One
+
+ - static member C14.M : x:'a * y:C -> Four
+
+
+
+E_TwoEqualTypeVariables02.fsx(63,33,63,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C24.M : x:'a * y:'b -> Two
+
+ - static member C24.M : x:'a * y:C -> Four
+
+
+
+E_TwoEqualTypeVariables02.fsx(64,33,64,44): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C123.M : x:'a * y:'a -> One
+
+ - static member C123.M : x:'a * y:'b -> Two
+
+ - static member C123.M : x:'a * y:int -> Three
+
+
+
+E_TwoEqualTypeVariables02.fsx(65,33,65,45): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C1234.M : x:'a * y:'a -> One
+
+ - static member C1234.M : x:'a * y:'b -> Two
+
+ - static member C1234.M : x:'a * y:C -> Four
+
+ - static member C1234.M : x:'a * y:int -> Three
+
+
+
+E_TwoEqualTypeVariables02.fsx(66,33,66,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C14.M : x:'a * y:'a -> One
+
+ - static member C14.M : x:'a * y:C -> Four
 
-E_TwoEqualTypeVariables02.fsx(65,33,65,45): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C1234.M : x:'a * y:'a -> One, static member C1234.M : x:'a * y:'b -> Two, static member C1234.M : x:'a * y:C -> Four, static member C1234.M : x:'a * y:int -> Three
 
-E_TwoEqualTypeVariables02.fsx(66,33,66,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C14.M : x:'a * y:'a -> One, static member C14.M : x:'a * y:C -> Four
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
index d9974a98ab..4c855ca3fd 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
@@ -1,12 +1,150 @@
 
-E_TwoEqualYypeVariables02rec.fsx(60,37,60,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C12.M : x:'a * y:'a -> One, static member C12.M : x:'a * y:'b -> Two
+E_TwoEqualYypeVariables02rec.fsx(60,37,60,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-E_TwoEqualYypeVariables02rec.fsx(61,37,61,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C14.M : x:'a * y:'a -> One, static member C14.M : x:'a * y:C -> Four
 
-E_TwoEqualYypeVariables02rec.fsx(62,37,62,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C24.M : x:'a * y:'b -> Two, static member C24.M : x:'a * y:C -> Four
 
-E_TwoEqualYypeVariables02rec.fsx(63,37,63,48): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C123.M : x:'a * y:'a -> One, static member C123.M : x:'a * y:'b -> Two, static member C123.M : x:'a * y:int -> Three
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C12.M : x:'a * y:'a -> One
+
+ - static member C12.M : x:'a * y:'b -> Two
+
+
+
+E_TwoEqualYypeVariables02rec.fsx(61,37,61,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C14.M : x:'a * y:'a -> One
+
+ - static member C14.M : x:'a * y:C -> Four
+
+
+
+E_TwoEqualYypeVariables02rec.fsx(62,37,62,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C24.M : x:'a * y:'b -> Two
+
+ - static member C24.M : x:'a * y:C -> Four
+
+
+
+E_TwoEqualYypeVariables02rec.fsx(63,37,63,48): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C123.M : x:'a * y:'a -> One
+
+ - static member C123.M : x:'a * y:'b -> Two
+
+ - static member C123.M : x:'a * y:int -> Three
+
+
+
+E_TwoEqualYypeVariables02rec.fsx(64,37,64,49): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C1234.M : x:'a * y:'a -> One
+
+ - static member C1234.M : x:'a * y:'b -> Two
+
+ - static member C1234.M : x:'a * y:C -> Four
+
+ - static member C1234.M : x:'a * y:int -> Three
+
+
+
+E_TwoEqualYypeVariables02rec.fsx(65,37,65,50): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'a
+
+
+
+
+
+
+
+Candidates:
+
+ - static member C14.M : x:'a * y:'a -> One
+
+ - static member C14.M : x:'a * y:C -> Four
 
-E_TwoEqualYypeVariables02rec.fsx(64,37,64,49): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C1234.M : x:'a * y:'a -> One, static member C1234.M : x:'a * y:'b -> Two, static member C1234.M : x:'a * y:C -> Four, static member C1234.M : x:'a * y:int -> Three
 
-E_TwoEqualYypeVariables02rec.fsx(65,37,65,50): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member C14.M : x:'a * y:'a -> One, static member C14.M : x:'a * y:C -> Four
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
index 89cb5ac771..6b73305795 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
@@ -1,2 +1,12 @@
 
-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
+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
+
+
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
index 76328f6557..94c6d6e4df 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
@@ -1,4 +1,32 @@
 
-E_Clashing_Values_in_AbstractClass03.fsx(16,18,16,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
+E_Clashing_Values_in_AbstractClass03.fsx(16,18,16,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: int
+
+
+
+Candidates:
+
+ - abstract member D.M : 'T -> int
+
+ - abstract member D.M : 'U -> string
+
+
+
+E_Clashing_Values_in_AbstractClass03.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: int
+
+
+
+Candidates:
+
+ - abstract member D.M : 'T -> int
+
+ - abstract member D.M : 'U -> string
+
 
-E_Clashing_Values_in_AbstractClass03.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
index af3ee273c4..1d438fcb72 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
@@ -1,4 +1,32 @@
 
-E_Clashing_Values_in_AbstractClass04.fsx(16,18,16,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string
+E_Clashing_Values_in_AbstractClass04.fsx(16,18,16,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: int
+
+
+
+Candidates:
+
+ - abstract member D.M : 'T -> int
+
+ - abstract member D.M : 'U -> string
+
+
+
+E_Clashing_Values_in_AbstractClass04.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: int
+
+
+
+Candidates:
+
+ - abstract member D.M : 'T -> int
+
+ - abstract member D.M : 'U -> string
+
 
-E_Clashing_Values_in_AbstractClass04.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: abstract member D.M : 'T -> int, abstract member D.M : 'U -> string

From 41f57e1007cc6a5990349a57cd63dc8bcdc2a0b3 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 30 Apr 2019 10:47:50 -0700
Subject: [PATCH 28/96] (minor) baseline update script

[update.base.line.with.actuals.fsx]
* add few directories
* error handling (when tests are running, the .err files are locked
---
 .../expressions/syntacticsugar/E_Slices01.bsl   | 14 +++++++-------
 tests/fsharp/update.base.line.with.actuals.fsx  | 17 +++++++++++------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
index 35a2d0cb85..04e09af706 100644
--- a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
+++ b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
@@ -1,5 +1,5 @@
 
-E_Slices01.fsx(22,9,22,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
+E_Slices01.fsx(15,9,15,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
@@ -25,7 +25,7 @@ Candidates:
 
 
 
-E_Slices01.fsx(23,9,23,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
+E_Slices01.fsx(16,9,16,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
@@ -51,7 +51,7 @@ Candidates:
 
 
 
-E_Slices01.fsx(24,9,24,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
+E_Slices01.fsx(17,9,17,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
@@ -77,7 +77,7 @@ Candidates:
 
 
 
-E_Slices01.fsx(25,9,25,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
+E_Slices01.fsx(18,9,18,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
@@ -103,8 +103,8 @@ Candidates:
 
 
 
-E_Slices01.fsx(26,9,26,17): typecheck error FS0039: The type 'Foo<a>' does not define the field, constructor or member 'Item'.
+E_Slices01.fsx(19,9,19,17): typecheck error FS0039: The field, constructor or member 'Item' is not defined.
 
-E_Slices01.fsx(27,9,27,26): typecheck error FS0503: A member or object constructor 'GetSlice' taking 4 arguments is not accessible from this code location. All accessible versions of method 'GetSlice' take 3 arguments.
+E_Slices01.fsx(20,9,20,26): typecheck error FS0503: A member or object constructor 'GetSlice' taking 4 arguments is not accessible from this code location. All accessible versions of method 'GetSlice' take 3 arguments.
 
-E_Slices01.fsx(28,9,28,20): typecheck error FS0503: A member or object constructor 'GetSlice' taking 5 arguments is not accessible from this code location. All accessible versions of method 'GetSlice' take 3 arguments.
+E_Slices01.fsx(21,9,21,20): typecheck error FS0503: A member or object constructor 'GetSlice' taking 5 arguments is not accessible from this code location. All accessible versions of method 'GetSlice' take 3 arguments.
diff --git a/tests/fsharp/update.base.line.with.actuals.fsx b/tests/fsharp/update.base.line.with.actuals.fsx
index 20724ddb69..a60baebcbe 100644
--- a/tests/fsharp/update.base.line.with.actuals.fsx
+++ b/tests/fsharp/update.base.line.with.actuals.fsx
@@ -8,6 +8,9 @@ let directories =
     [
       "typecheck/sigs"
       "typecheck/overloads"
+      "conformance/expressions/syntacticsugar"
+      "conformance/inference"
+      "conformance/wellformedness"
       "typeProviders/negTests"
     ]
     |> List.map (fun d -> Path.Combine(__SOURCE_DIRECTORY__, d) |> DirectoryInfo)
@@ -19,10 +22,12 @@ for d in directories do
             let baseLineFile = FileInfo(Path.ChangeExtension(errFile.FullName, "bsl"))
             let baseLineFilePreProcess = FileInfo(Path.ChangeExtension(errFile.FullName, "bslpp"))
             if not baseLineFile.Exists then () else
-            if File.ReadAllText(errFile.FullName) <> File.ReadAllText(baseLineFile.FullName) then
-                let expectedFile =
-                    if baseLineFilePreProcess.Exists then baseLineFilePreProcess
-                    else baseLineFile
+            try
+                if File.ReadAllText(errFile.FullName) <> File.ReadAllText(baseLineFile.FullName) then
+                    let expectedFile =
+                        if baseLineFilePreProcess.Exists then baseLineFilePreProcess
+                        else baseLineFile
 
-                printfn "%s not matching, replacing with %s" expectedFile.FullName errFile.FullName
-                errFile.CopyTo(expectedFile.FullName, true) |> ignore
+                    printfn "%s not matching, replacing with %s" expectedFile.FullName errFile.FullName
+                    errFile.CopyTo(expectedFile.FullName, true) |> ignore
+            with e -> printfn "error, proceeding...\n%A" e
\ No newline at end of file

From 51e3a0ec87e8b749d64bf74deaec7ce8791095f3 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Tue, 30 Apr 2019 16:35:52 -0700
Subject: [PATCH 29/96] move System.Convert.ToString and
 System.Threading.Tasks.Task.Run tests from QA

---
 tests/fsharp/tests.fs                         |  8 +-
 ....Threading.Tasks.Task.Run.OverloadList.bsl | 96 +++++++++++++++++++
 ....Threading.Tasks.Task.Run.OverloadList.fsx | 14 +++
 .../E_System.Convert.ToString.OverloadList.fs | 13 ---
 .../E_System.Threading.Tasks.Task.Run.fs      | 20 ----
 .../ErrorMessages/OverloadResolution/env.lst  |  1 -
 tests/fsharpqa/Source/test.lst                |  1 -
 7 files changed, 116 insertions(+), 37 deletions(-)
 create mode 100644 tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
 create mode 100644 tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.fsx
 delete mode 100644 tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
 delete mode 100644 tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Threading.Tasks.Task.Run.fs
 delete mode 100644 tests/fsharpqa/Source/ErrorMessages/OverloadResolution/env.lst

diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index f382963b76..698b72afdf 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -2950,7 +2950,7 @@ module GeneratedSignatureTests =
 
 #if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
 module OverloadResolution =
-    module FSharpQAMigrated = 
+    module ``fsharpqa migrated tests`` = 
         let [<Test>] ``Conformance\Expressions\SyntacticSugar (E_Slices01.fs)`` () = singleNegTest (testConfig "conformance/expressions/syntacticsugar") "E_Slices01"
         let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_OneTypeVariable03.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_OneTypeVariable03"
         let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_OneTypeVariable03rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_OneTypeVariable03rec"
@@ -2963,4 +2963,8 @@ module OverloadResolution =
         let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass01.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass01"
         let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass03.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass03"
         let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass04.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass04"
-#endif
+    
+    module ``error messages using BCL``=
+        let [<Test>] ``neg_System.Convert.ToString.OverloadList``() = singleNegTest (testConfig "typecheck/overloads") "neg_System.Convert.ToString.OverloadList"
+        let [<Test>] ``neg_System.Threading.Tasks.Task.Run.OverloadList``() = singleNegTest (testConfig "typecheck/overloads") "neg_System.Threading.Tasks.Task.Run.OverloadList"
+#endif
\ No newline at end of file
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
new file mode 100644
index 0000000000..37b7668cb7
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
@@ -0,0 +1,96 @@
+
+neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(5,11,5,35): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: (unit -> Task<int>)
+
+
+
+Candidates:
+
+ - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
+
+ - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
+
+
+
+neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(6,11,6,44): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: Func<Task<int>>
+
+
+
+Candidates:
+
+ - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
+
+ - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
+
+
+
+neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(7,11,7,47): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: Func<Task<int>>
+
+
+
+Candidates:
+
+ - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
+
+ - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
+
+
+
+neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(8,21,8,57): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: Func<Task<int>>
+
+
+
+Candidates:
+
+ - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
+
+ - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
+
+
+
+neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(9,11,9,50): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: Func<Task<int>>
+
+
+
+Candidates:
+
+ - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
+
+ - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
+
+
+
+neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(10,11,10,52): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: Func<Task<int>>
+
+
+
+Candidates:
+
+ - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
+
+ - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
+
+
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.fsx b/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.fsx
new file mode 100644
index 0000000000..0d44ca44b8
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.fsx
@@ -0,0 +1,14 @@
+open System
+open System.Threading.Tasks
+let makeTask () = new Task<_>(fun () -> 1)
+let task = makeTask()
+let rt1 = Task.Run(fun () -> task)
+let rt2 = Task.Run(Func<_>(fun () -> task))
+let rt3 = Task.Run<_>(Func<_>(fun () -> task))
+let rt4 : Task<_> = Task.Run<_>(Func<_>(fun () -> task))
+let rt5 = Task.Run(Func<Task<_>>(fun () -> task))
+let rt6 = Task.Run(Func<Task<int>>(fun () -> task))
+let rt7 = Task.Run<int>(Func<Task<int>>(fun () -> task))
+let rt8 = Task.Run<int>(Func<Task<_>>(fun () -> task))
+let rt9 = Task.Run<int>(Func<_>(fun () -> task))
+let rt10 = Task.Run<int>(fun () -> task)
diff --git a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
deleted file mode 100644
index 287ff062e6..0000000000
--- a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Convert.ToString.OverloadList.fs
+++ /dev/null
@@ -1,13 +0,0 @@
-module Overloads
-System.Convert.ToString('a',0) |> ignore
-System.Convert.ToString(provider='a', value=0) |> ignore
-System.Convert.ToString(provider=null, value=0) |> ignore
-
-//<Expects id="FS0039" status="error" span="(2,1-2,31)">Arguments given:</Expects>
-//<Expects id="FS0039" status="error" span="(2,1-2,31)"> - char</Expects>
-//<Expects id="FS0039" status="error" span="(2,1-2,31)"> - int</Expects>
-//<Expects id="FS0039" status="error" span="(3,1-3,47)">Arguments given:</Expects>
-//<Expects id="FS0039" status="error" span="(3,1-3,47)"> - (provider) : char</Expects>
-//<Expects id="FS0039" status="error" span="(3,1-3,47)"> - (value) : int</Expects>
-//<Expects id="FS0039" status="error" span="(4,1-4,48)"> - (provider) : obj</Expects>
-//<Expects id="FS0039" status="error" span="(4,1-4,48)"> - (value) : int</Expects>
diff --git a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Threading.Tasks.Task.Run.fs b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Threading.Tasks.Task.Run.fs
deleted file mode 100644
index a0d7fa1c71..0000000000
--- a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/E_System.Threading.Tasks.Task.Run.fs
+++ /dev/null
@@ -1,20 +0,0 @@
-open System
-open System.Threading.Tasks
-let makeTask () = new Task<_>(fun () -> 1)
-let task = makeTask()
-let rt1 = Task.Run(fun () -> task)
-let rt2 = Task.Run(Func<_>(fun () -> task))
-let rt3 = Task.Run<_>(Func<_>(fun () -> task))
-let rt4 : Task<_> = Task.Run<_>(Func<_>(fun () -> task))
-let rt5 = Task.Run(Func<Task<_>>(fun () -> task))
-let rt6 = Task.Run(Func<Task<int>>(fun () -> task))
-let rt7 = Task.Run<int>(Func<Task<int>>(fun () -> task))
-let rt8 = Task.Run<int>(Func<Task<_>>(fun () -> task))
-let rt9 = Task.Run<int>(Func<_>(fun () -> task))
-let rt10 = Task.Run<int>(fun () -> task)
-
-//<Expects id="FS0039" status="error" span="(5,11-5,35)">A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.</Expects>
-//<Expects id="FS0039" status="error" span="(5,11-5,35)">Argument given: unit -> Task<int></Expects>
-//<Expects id="FS0039" status="error" span="(5,11-5,35)">Candidates:</Expects>
-//<Expects id="FS0039" status="error" span="(5,11-5,35)"> - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult></Expects>
-//<Expects id="FS0039" status="error" span="(5,11-5,35)"> - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult></Expects>
\ No newline at end of file
diff --git a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/env.lst b/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/env.lst
deleted file mode 100644
index dfed111174..0000000000
--- a/tests/fsharpqa/Source/ErrorMessages/OverloadResolution/env.lst
+++ /dev/null
@@ -1 +0,0 @@
-	SOURCE=E_System.Convert.ToString.OverloadList.fs		# E_System.Convert.ToString.OverloadList
diff --git a/tests/fsharpqa/Source/test.lst b/tests/fsharpqa/Source/test.lst
index 69f27c7e86..8a3aeac76b 100644
--- a/tests/fsharpqa/Source/test.lst
+++ b/tests/fsharpqa/Source/test.lst
@@ -266,7 +266,6 @@ Misc01			Libraries\Core\Operators
 Misc01			Libraries\Core\Reflection
 Misc01			Libraries\Core\Unchecked
 Misc01			Warnings
-Misc01			ErrorMessages\OverloadResolution
 Misc01			ErrorMessages\UnitGenericAbstractType
 Misc01			ErrorMessages\ConfusingTypeName
 

From 76c9c593374ce1af7988ef5b491994512af6169f Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Wed, 1 May 2019 19:47:06 -0700
Subject: [PATCH 30/96] * moving 3 fsharpqa tests to new test suite * bring
 back neg_System.Convert.ToString.OverloadList.fsx which I mistakenly removed
 during merge

---
 .../E_RigidTypeAnnotation03.bsl               |  98 +++++++
 .../E_RigidTypeAnnotation03.fsx               |   0
 .../E_TwoDifferentTypeVariablesGen00.bsl      | 251 ++++++++++++++++++
 .../E_TwoDifferentTypeVariablesGen00.fsx}     |   0
 .../E_LessThanDotOpenParen001.bsl             |  79 ++++++
 .../E_LessThanDotOpenParen001.fsx}            |   0
 tests/fsharp/tests.fs                         |   9 +-
 ...g_System.Convert.ToString.OverloadList.bsl | 128 +++++++++
 ...g_System.Convert.ToString.OverloadList.fsx |   4 +
 9 files changed, 566 insertions(+), 3 deletions(-)
 create mode 100644 tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
 rename tests/{fsharpqa/Source/Conformance/Expressions/Type-relatedExpressions => fsharp/conformance/expressions/type-relatedexpressions}/E_RigidTypeAnnotation03.fsx (100%)
 create mode 100644 tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
 rename tests/{fsharpqa/Source/Conformance/InferenceProcedures/TypeInference/E_TwoDifferentTypeVariablesGen00.fs => fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx} (100%)
 create mode 100644 tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
 rename tests/{fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/E_LessThanDotOpenParen001.fs => fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx} (100%)
 create mode 100644 tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
 create mode 100644 tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.fsx

diff --git a/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
new file mode 100644
index 0000000000..bf8682dcaa
--- /dev/null
+++ b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
@@ -0,0 +1,98 @@
+
+E_RigidTypeAnnotation03.fsx(17,13,17,16): typecheck error FS0001: This expression was expected to have type
+    'sbyte'    
+but here has type
+    'byte'    
+
+E_RigidTypeAnnotation03.fsx(17,9,17,25): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Argument given: sbyte Available overloads:
+
+ - static member T.M : a:string -> int
+
+ - static member T.M : a:decimal<Kg> -> int
+
+ - static member T.M : a:float32<Kg> -> int
+
+ - static member T.M : a:float -> int
+
+ - static member T.M : a:byte -> int
+
+
+
+E_RigidTypeAnnotation03.fsx(18,13,18,19): typecheck error FS0001: This expression was expected to have type
+    'float32'    
+but here has type
+    'float<'u>'    
+
+E_RigidTypeAnnotation03.fsx(18,9,18,30): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Argument given: float32 Available overloads:
+
+ - static member T.M : a:string -> int
+
+ - static member T.M : a:decimal<Kg> -> int
+
+ - static member T.M : a:float32<Kg> -> int
+
+ - static member T.M : a:float -> int
+
+ - static member T.M : a:byte -> int
+
+
+
+E_RigidTypeAnnotation03.fsx(19,13,19,20): typecheck error FS0001: This expression was expected to have type
+    'float32<'u>'    
+but here has type
+    'decimal<s>'    
+
+E_RigidTypeAnnotation03.fsx(20,13,20,21): typecheck error FS0001: Type mismatch. Expecting a
+    'decimal<N s ^ 2>'    
+but given a
+    'decimal<Kg>'    
+The unit of measure 'N s ^ 2' does not match the unit of measure 'Kg'
+
+E_RigidTypeAnnotation03.fsx(20,9,20,39): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Argument given: decimal<N s ^ 2> Available overloads:
+
+ - static member T.M : a:string -> int
+
+ - static member T.M : a:decimal<Kg> -> int
+
+ - static member T.M : a:float32<Kg> -> int
+
+ - static member T.M : a:float -> int
+
+ - static member T.M : a:byte -> int
+
+
+
+E_RigidTypeAnnotation03.fsx(21,14,21,18): typecheck error FS0001: This expression was expected to have type
+    'char'    
+but here has type
+    'string'    
+
+E_RigidTypeAnnotation03.fsx(21,9,21,27): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Argument given: char Available overloads:
+
+ - static member T.M : a:string -> int
+
+ - static member T.M : a:decimal<Kg> -> int
+
+ - static member T.M : a:float32<Kg> -> int
+
+ - static member T.M : a:float -> int
+
+ - static member T.M : a:byte -> int
+
+
diff --git a/tests/fsharpqa/Source/Conformance/Expressions/Type-relatedExpressions/E_RigidTypeAnnotation03.fsx b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.fsx
similarity index 100%
rename from tests/fsharpqa/Source/Conformance/Expressions/Type-relatedExpressions/E_RigidTypeAnnotation03.fsx
rename to tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.fsx
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
new file mode 100644
index 0000000000..bdb800a95c
--- /dev/null
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
@@ -0,0 +1,251 @@
+
+E_TwoDifferentTypeVariablesGen00.fsx(104,17,104,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(105,17,105,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(106,17,106,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(107,17,107,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(108,17,108,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(109,17,109,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(110,17,110,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(111,17,111,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(112,17,112,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(113,17,113,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(114,17,114,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(115,17,115,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(116,17,116,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(117,17,117,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(118,17,118,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(119,17,119,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(104,17,104,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(105,17,105,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(106,17,106,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(107,17,107,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(108,17,108,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(109,17,109,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(110,17,110,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(111,17,111,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(112,17,112,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(113,17,113,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(114,17,114,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(115,17,115,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(116,17,116,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(117,17,117,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(118,17,118,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(119,17,119,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+
+E_TwoDifferentTypeVariablesGen00.fsx(104,48,104,49): typecheck error FS0001: This expression was expected to have type
+    ''a'    
+but here has type
+    ''b'    
+
+E_TwoDifferentTypeVariablesGen00.fsx(105,48,105,49): typecheck error FS0001: This expression was expected to have type
+    'int'    
+but here has type
+    ''b'    
+
+E_TwoDifferentTypeVariablesGen00.fsx(106,48,106,49): typecheck error FS0001: A type parameter is missing a constraint 'when 'b :> C'
+
+E_TwoDifferentTypeVariablesGen00.fsx(106,48,106,49): typecheck error FS0193: Type constraint mismatch. The type 
+    ''b'    
+is not compatible with type
+    'C'    
+
+
+E_TwoDifferentTypeVariablesGen00.fsx(107,41,107,51): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+ Available overloads:
+
+ - static member C13.M : x:'a * y:int -> Three
+
+ - static member C13.M : x:'a * y:'a -> One
+
+
+
+E_TwoDifferentTypeVariablesGen00.fsx(108,41,108,51): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+ Available overloads:
+
+ - static member C14.M : x:'a * y:C -> Four
+
+ - static member C14.M : x:'a * y:'a -> One
+
+
+
+E_TwoDifferentTypeVariablesGen00.fsx(109,52,109,53): typecheck error FS0001: This expression was expected to have type
+    ''a'    
+but here has type
+    ''b'    
+
+E_TwoDifferentTypeVariablesGen00.fsx(110,50,110,51): typecheck error FS0001: This expression was expected to have type
+    ''b'    
+but here has type
+    ''a'    
+
+E_TwoDifferentTypeVariablesGen00.fsx(110,52,110,53): typecheck error FS0001: This expression was expected to have type
+    'int'    
+but here has type
+    ''b'    
+
+E_TwoDifferentTypeVariablesGen00.fsx(111,52,111,53): typecheck error FS0001: A type parameter is missing a constraint 'when 'b :> C'
+
+E_TwoDifferentTypeVariablesGen00.fsx(111,52,111,53): typecheck error FS0193: Type constraint mismatch. The type 
+    ''b'    
+is not compatible with type
+    'C'    
+
+
+E_TwoDifferentTypeVariablesGen00.fsx(112,41,112,55): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+ Available overloads:
+
+ - static member C13.M : x:'a * y:int -> Three
+
+ - static member C13.M : x:'a * y:'a -> One
+
+
+
+E_TwoDifferentTypeVariablesGen00.fsx(113,41,113,55): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+ Available overloads:
+
+ - static member C14.M : x:'a * y:C -> Four
+
+ - static member C14.M : x:'a * y:'a -> One
+
+
+
+E_TwoDifferentTypeVariablesGen00.fsx(114,51,114,52): typecheck error FS0001: This expression was expected to have type
+    ''a'    
+but here has type
+    ''b'    
+
+E_TwoDifferentTypeVariablesGen00.fsx(115,51,115,52): typecheck error FS0001: This expression was expected to have type
+    'int'    
+but here has type
+    ''b'    
+
+E_TwoDifferentTypeVariablesGen00.fsx(116,51,116,52): typecheck error FS0001: A type parameter is missing a constraint 'when 'b :> C'
+
+E_TwoDifferentTypeVariablesGen00.fsx(116,51,116,52): typecheck error FS0193: Type constraint mismatch. The type 
+    ''b'    
+is not compatible with type
+    'C'    
+
+
+E_TwoDifferentTypeVariablesGen00.fsx(117,41,117,54): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+ Available overloads:
+
+ - static member C13.M : x:'a * y:int -> Three
+
+ - static member C13.M : x:'a * y:'a -> One
+
+
+
+E_TwoDifferentTypeVariablesGen00.fsx(118,41,118,54): typecheck error FS0041: No overloads match for method 'M'.
+
+
+
+Arguments given:
+
+ - 'a
+
+ - 'b
+
+
+
+ Available overloads:
+
+ - static member C14.M : x:'a * y:C -> Four
+
+ - static member C14.M : x:'a * y:'a -> One
+
+
+
+E_TwoDifferentTypeVariablesGen00.fsx(119,52,119,53): typecheck error FS0001: A type parameter is missing a constraint 'when 'b :> C'
+
+E_TwoDifferentTypeVariablesGen00.fsx(119,52,119,53): typecheck error FS0193: Type constraint mismatch. The type 
+    ''b'    
+is not compatible with type
+    'C'    
+
diff --git a/tests/fsharpqa/Source/Conformance/InferenceProcedures/TypeInference/E_TwoDifferentTypeVariablesGen00.fs b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx
similarity index 100%
rename from tests/fsharpqa/Source/Conformance/InferenceProcedures/TypeInference/E_TwoDifferentTypeVariablesGen00.fs
rename to tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx
diff --git a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
new file mode 100644
index 0000000000..7909ec8f39
--- /dev/null
+++ b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
@@ -0,0 +1,79 @@
+
+E_LessThanDotOpenParen001.fsx(18,71,18,75): typecheck error FS0193: A type parameter is missing a constraint 'when ( ^T or  ^?8045) : (static member ( + ) :  ^T *  ^?8045 ->  ^?8046)'
+
+E_LessThanDotOpenParen001.fsx(18,73,18,75): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'S has been constrained to be type 'int'.
+
+E_LessThanDotOpenParen001.fsx(18,27,18,30): typecheck error FS1198: The generic member '( +++ )' has been used at a non-uniform instantiation prior to this program point. Consider reordering the members so this member occurs first. Alternatively, specify the full type of the member explicitly, including argument types, return type and any additional generic parameters and constraints.
+
+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:
+
+ - static member TestType.( +++ ) : a:(int -> 'T) * b:TestType<'T,int> ->  ^a when  ^T1 : (static member ( + ) :  ^T1 *  ^T1 ->  ^a)
+
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
+
+ - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T
+
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
+
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
+
+
+
+E_LessThanDotOpenParen001.fsx(33,10,33,45): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
+
+
+
+Arguments given:
+
+ - (string -> int)
+
+ - TestType<int,string>
+
+
+
+ Available overloads:
+
+ - static member TestType.( +++ ) : a:(int -> 'T) * b:TestType<'T,int> ->  ^a when  ^T1 : (static member ( + ) :  ^T1 *  ^T1 ->  ^a)
+
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
+
+ - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T
+
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
+
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
+
+
+
+E_LessThanDotOpenParen001.fsx(34,44,34,54): typecheck error FS0001: This expression was expected to have type
+    'int'    
+but here has type
+    'string'    
+
+E_LessThanDotOpenParen001.fsx(34,10,34,68): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
+
+
+
+Arguments given:
+
+ - (int -> 'a)
+
+ - TestType<int,string>
+
+
+
+ Available overloads:
+
+ - static member TestType.( +++ ) : a:(int -> 'T) * b:TestType<'T,int> ->  ^a when  ^T1 : (static member ( + ) :  ^T1 *  ^T1 ->  ^a)
+
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
+
+ - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T
+
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
+
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
+
+
diff --git a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/E_LessThanDotOpenParen001.fs b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx
similarity index 100%
rename from tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/E_LessThanDotOpenParen001.fs
rename to tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx
diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index 698b72afdf..965e80dd56 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -2952,17 +2952,20 @@ module GeneratedSignatureTests =
 module OverloadResolution =
     module ``fsharpqa migrated tests`` = 
         let [<Test>] ``Conformance\Expressions\SyntacticSugar (E_Slices01.fs)`` () = singleNegTest (testConfig "conformance/expressions/syntacticsugar") "E_Slices01"
+        let [<Test>] ``Conformance\Expressions\Type-relatedExpressions (E_RigidTypeAnnotation03.fsx)`` () = singleNegTest (testConfig "conformance/expressions/type-relatedexpressions") "E_RigidTypeAnnotation03"
         let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_OneTypeVariable03.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_OneTypeVariable03"
         let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_OneTypeVariable03rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_OneTypeVariable03rec"
+        let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoDifferentTypeVariablesGen00.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariablesGen00"
         let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoDifferentTypeVariables01.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariables01"
         let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoDifferentTypeVariables01rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariables01rec"
         let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoDifferentTypeVariablesGen00rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariablesGen00rec"
         let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoEqualTypeVariables02.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoEqualTypeVariables02"
         let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoEqualYypeVariables02rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoEqualYypeVariables02rec"
         let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_LeftToRightOverloadResolution01.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_LeftToRightOverloadResolution01"
-        let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass01.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass01"
-        let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass03.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass03"
-        let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass04.fs) `` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass04"
+        let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass01.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass01"
+        let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass03.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass03"
+        let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass04.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass04"
+        let [<Test>] ``Conformance\LexicalAnalysis\SymbolicOperators (E_LessThanDotOpenParen001.fs)`` () = singleNegTest (testConfig "conformance/lexicalanalysis") "E_LessThanDotOpenParen001"
     
     module ``error messages using BCL``=
         let [<Test>] ``neg_System.Convert.ToString.OverloadList``() = singleNegTest (testConfig "typecheck/overloads") "neg_System.Convert.ToString.OverloadList"
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
new file mode 100644
index 0000000000..3114003249
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
@@ -0,0 +1,128 @@
+
+neg_System.Convert.ToString.OverloadList.fsx(2,1,2,31): typecheck error FS0041: No overloads match for method 'ToString'.
+
+
+
+Arguments given:
+
+ - char
+
+ - int
+
+
+
+ Available overloads:
+
+ - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: bool, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: byte, toBase: int) : string
+
+ - System.Convert.ToString(value: int16, toBase: int) : string
+
+ - System.Convert.ToString(value: int, toBase: int) : string
+
+ - System.Convert.ToString(value: int64, toBase: int) : string
+
+
+
+neg_System.Convert.ToString.OverloadList.fsx(3,1,3,47): typecheck error FS0041: No overloads match for method 'ToString'.
+
+
+
+Arguments given:
+
+ - (provider) : char
+
+ - (value) : int
+
+
+
+ Available overloads:
+
+ - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: bool, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string
+
+
+
+neg_System.Convert.ToString.OverloadList.fsx(4,1,4,48): typecheck error FS0041: A unique overload for method 'ToString' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Arguments given:
+
+ - (provider) : 'a when 'a : null
+
+ - (value) : int
+
+
+
+
+
+
+
+Candidates:
+
+ - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
+
+ - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
+
+
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.fsx b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.fsx
new file mode 100644
index 0000000000..b982b38a9b
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.fsx
@@ -0,0 +1,4 @@
+module Overloads
+System.Convert.ToString('a',0) |> ignore
+System.Convert.ToString(provider='a', value=0) |> ignore
+System.Convert.ToString(provider=null, value=0) |> ignore

From b00175f294a117d0c001baa1efd78374db052acf Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 00:00:26 -0700
Subject: [PATCH 31/96] consolidate all string building logic in CompileOps.fs,
 fix remaining cases with missing \n (the end result code is less
 whack-a-mole-ish)

---
 src/fsharp/CompileOps.fs        | 46 +++++++++++++++++--
 src/fsharp/ConstraintSolver.fs  | 81 ++++-----------------------------
 src/fsharp/ConstraintSolver.fsi |  4 +-
 src/fsharp/FSComp.txt           |  6 +--
 4 files changed, 55 insertions(+), 82 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 09b484b332..373a47c318 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -767,11 +767,47 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
           os.Append(e.ContextualErrorMessage) |> ignore
 #endif
 
-      | UnresolvedOverloading(denv, mtext, overloads, m) ->
-          os.AppendLine mtext |> ignore
-          overloads
-          |> List.map (fun e -> e.overload.OverloadMethodInfo denv m |> FSComp.SR.formatDashItem)
-          |> List.iter (os.AppendLine >> ignore)
+      | UnresolvedOverloading(denv, callerArgs, failure, m) ->
+          let nl = System.Environment.NewLine
+          let displayArgType (name, ttype) =
+              let typeDisplay = NicePrint.prettyStringOfTy denv ttype
+              match name with
+              | Some name -> sprintf "(%s) : %s" name typeDisplay
+              | None -> sprintf "%s" typeDisplay
+          let argsMessage =
+              let prefix = nl + nl
+              let suffix = nl + nl
+              match callerArgs.ArgumentNamesAndTypes with
+              | [] -> nl + nl
+              | [item] -> prefix + (item |> displayArgType |> FSComp.SR.csNoOverloadsFoundArgumentsPrefixSingular) + suffix
+              | items -> 
+                  let args = 
+                      items 
+                      |> List.map (displayArgType >> FSComp.SR.formatDashItem) // consider if --flaterrors is on, we may like commas better in this case
+                      |> List.toArray
+                      |> String.concat nl
+          
+                  prefix + (FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural args) + suffix
+          let formatOverloads (overloads: OverloadInformation list) =
+              overloads
+              |> List.map (fun overload -> overload.OverloadMethodInfo denv m)
+              |> List.sort
+              |> List.map FSComp.SR.formatDashItem
+              |> String.concat nl
+          
+          let msg =
+              match failure with
+              | NoOverloadsFound (methodName, overloads) -> FSComp.SR.csNoOverloadsFound methodName + argsMessage + (FSComp.SR.csAvailableOverloads (formatOverloads overloads))
+              | PossibleCandidates (methodName, methodNames) ->
+                  let msg = FSComp.SR.csMethodIsOverloaded methodName
+                  match methodNames with
+                  | [] -> msg
+                  | names -> 
+                      let overloads = FSComp.SR.csCandidates (formatOverloads names)
+                      msg 
+                      + argsMessage
+                      + overloads
+          os.Append msg |> ignore
 
       | UnresolvedConversionOperator(denv, fromTy, toTy, _) -> 
           let t1, t2, _tpcs = NicePrint.minimalStringsOfTwoTypes denv fromTy toTy
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 19e639706d..46980eb858 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -216,7 +216,7 @@ exception ErrorFromAddingTypeEquation of tcGlobals: TcGlobals * displayEnv: Disp
 exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * ContextInfo * range
 exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn * range
 exception PossibleOverload                      of displayEnv: DisplayEnv * overload: OverloadInformation * range
-exception UnresolvedOverloading                 of displayEnv: DisplayEnv * prefixMessage: string * overloads: PossibleOverload list * range
+exception UnresolvedOverloading                 of displayEnv: DisplayEnv * callerArgs: CallerArgs<Expr> * failure: OverloadResolutionFailure * range
 exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
 
 type TcValF = (ValRef -> ValUseFlag -> TType list -> range -> Expr * TType)
@@ -2316,16 +2316,16 @@ and MustUnify csenv ndeep trace cxsln ty1 ty2 =
 and MustUnifyInsideUndo csenv ndeep trace cxsln ty1 ty2 = 
     SolveTypeEqualsTypeWithReport csenv ndeep csenv.m (WithTrace trace) cxsln ty1 ty2
 
-and ArgsMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln isConstraint calledArg (CallerArg(callerArgTy, m, _, _) as callerArg) = 
-    let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint true calledArg callerArg
-    SolveTypeSubsumesTypeWithReport csenv ndeep  m (WithTrace trace) cxsln calledArgTy callerArgTy 
+and ArgsMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln isConstraint calledArg callerArg = 
+    let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg
+    SolveTypeSubsumesTypeWithReport csenv ndeep callerArg.Range (WithTrace trace) cxsln calledArgTy callerArg.ArgumentType 
 
 and TypesMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln m calledArgTy callerArgTy = 
     SolveTypeSubsumesTypeWithReport csenv ndeep m trace cxsln calledArgTy callerArgTy 
 
-and ArgsEquivInsideUndo (csenv: ConstraintSolverEnv) isConstraint calledArg (CallerArg(callerArgTy, m, _, _) as callerArg) = 
-    let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint true calledArg callerArg
-    if typeEquiv csenv.g calledArgTy callerArgTy then CompleteD else ErrorD(Error(FSComp.SR.csArgumentTypesDoNotMatch(), m))
+and ArgsEquivInsideUndo (csenv: ConstraintSolverEnv) isConstraint calledArg callerArg = 
+    let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg
+    if typeEquiv csenv.g calledArgTy callerArg.ArgumentType then CompleteD else ErrorD(Error(FSComp.SR.csArgumentTypesDoNotMatch(), callerArg.Range))
 
 and ReportNoCandidatesError (csenv: ConstraintSolverEnv) (nUnnamedCallerArgs, nNamedCallerArgs) methodName ad (calledMethGroup: CalledMeth<_> list) isSequential =
 
@@ -2536,71 +2536,8 @@ and ResolveOverloading
                 | Some (fromTy, toTy) -> 
                     UnresolvedConversionOperator (denv, fromTy, toTy, m)
                 | None -> 
-                    // Otherwise collect a list of possible overloads
-                    let msg =
-                        let displayArgType (name , ttype) =
-                            let typeDisplay = NicePrint.prettyStringOfTy denv ttype
-                            match name with
-                            | Some name -> sprintf "(%s) : %s" name typeDisplay
-                            | None -> sprintf "%s" typeDisplay
-                        let nl = System.Environment.NewLine
-                        let argsMessage =
-                            match callerArgs.LayoutArgumentTypes denv with
-                            | [] -> System.String.Empty
-                            | [item] -> nl + (item |> getArgType |> FSComp.SR.csNoOverloadsFoundArgumentsPrefixSingular)
-                            | items -> 
-                                let args = 
-                                    items 
-                                    |> List.map (getArgType >> FSComp.SR.formatDashItem)
-                                    |> List.toArray
-                                    |> String.concat nl
-
-                                nl + nl
-                                + (FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural()) 
-                                + nl
-                                + args
-                                + nl + nl
-
-  
-                        //printfn "%A" argsMessage
-                        match overloadResolutionFailure with
-                        | NoOverloadsFound (methodName, _) -> FSComp.SR.csNoOverloadsFound methodName + argsMessage
-                        | PossibleCandidates (methodName, methodNames) ->
-                            let msg = FSComp.SR.csMethodIsOverloaded methodName
-                            match methodNames with
-                            | [] -> msg
-                            | names -> 
-                                let overloads =
-
-                                    FSComp.SR.csCandidates ()
-                                    + nl +
-                                    (
-                                    names 
-                                    |> List.map (fun overload -> NicePrint.stringOfMethInfo amap m denv overload.methodSlot.Method)
-                                    |> List.sort
-                                    |> List.map FSComp.SR.formatDashItem
-                                    |> String.concat nl)
-                                    
-
-                                msg 
-                                + nl
-                                + argsMessage  
-                                + nl
-                                + nl
-                                + overloads
-                                
-
-                    let overloads =
-                        overloadResolutionFailure
-                        |> function | NoOverloadsFound (_, candidates) -> candidates
-                                    | PossibleCandidates _ -> []
-                        |> List.map (fun overload -> 
-                            PossibleOverload(denv, overload, m)  :?> _ // F# Spec: 8.11 Exception Definitions: The identifier identcan be used to generate values of type exn
-                        )
-                    
-                    // if list of overloads is not empty - append line with "The available overloads are shown below..."
-                    let msg = if isNil overloads then msg else sprintf "%s %s" msg (FSComp.SR.csSeeAvailableOverloads ())
-                    UnresolvedOverloading (denv, msg, overloads, m)
+                    // Otherwise pass the overload resolution failure for error printing in CompileOps
+                    UnresolvedOverloading (denv, callerArgs, overloadResolutionFailure, m)
 
             match applicable with 
             | [] ->
diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 44e3bb7f57..55df7287a1 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -114,12 +114,12 @@ exception ConstraintSolverError                         of string * range * rang
 exception ConstraintSolverRelatedInformation            of string option * range * exn
 
 exception ErrorFromApplyingDefault              of tcGlobals: TcGlobals * displayEnv: DisplayEnv * Typar * TType * exn * range
-exception ErrorFromAddingTypeEquation           of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * range
+exception ErrorFromAddingTypeEquation           of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actual: TType * expected: TType * exn * range
 exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * ContextInfo * range
 exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn * range
 exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
 exception PossibleOverload                      of displayEnv: DisplayEnv * overload: OverloadInformation * range
-exception UnresolvedOverloading                 of displayEnv: DisplayEnv * prefixMessage: string * overloads: PossibleOverload list * range
+exception UnresolvedOverloading                 of displayEnv: DisplayEnv * callerArgs: CallerArgs<Expr> * failure: OverloadResolutionFailure * range
 exception NonRigidTypar                         of displayEnv: DisplayEnv * string option * range * TType * TType * range
 
 /// A function that denotes captured tcVal, Used in constraint solver and elsewhere to get appropriate expressions for a ValRef.
diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index 7c7d8924c2..1d8f456d04 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -363,10 +363,10 @@ csCtorHasNoArgumentOrReturnProperty,"The object constructor '%s' has no argument
 509,csMethodNotFound,"Method or object constructor '%s' not found"
 csNoOverloadsFound,"No overloads match for method '%s'."
 csNoOverloadsFoundArgumentsPrefixSingular,"Argument given: %s"
-csNoOverloadsFoundArgumentsPrefixPlural,"Arguments given:"
+csNoOverloadsFoundArgumentsPrefixPlural,"Arguments given:\n%s"
 csMethodIsOverloaded,"A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed."
-csCandidates,"Candidates:"
-csSeeAvailableOverloads,"Available overloads:"
+csCandidates,"Candidates:\n%s"
+csAvailableOverloads,"Available overloads:\n%s"
 512,parsDoCannotHaveVisibilityDeclarations,"Accessibility modifiers are not permitted on 'do' bindings, but '%s' was given."
 513,parsEofInHashIf,"End of file in #if section begun at or after here"
 514,parsEofInString,"End of file in string begun at or before here"

From e64f4f6a003cdf66008ffab862e6aec8e96e31f3 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 00:13:20 -0700
Subject: [PATCH 32/96] update base lines

---
 .../expressions/syntacticsugar/E_Slices01.bsl |  32 ---
 .../E_RigidTypeAnnotation03.bsl               |  52 +++--
 .../E_LeftToRightOverloadResolution01.bsl     |   6 -
 .../inference/E_OneTypeVariable03.bsl         |  16 --
 .../inference/E_OneTypeVariable03rec.bsl      |  16 --
 .../E_TwoDifferentTypeVariables01.bsl         |  32 ---
 .../E_TwoDifferentTypeVariables01rec.bsl      |  32 ---
 .../E_TwoDifferentTypeVariablesGen00.bsl      | 221 ++----------------
 .../E_TwoDifferentTypeVariablesGen00.fsx      |  95 +++-----
 .../E_TwoDifferentTypeVariablesGen00rec.bsl   |  24 --
 .../inference/E_TwoEqualTypeVariables02.bsl   |  48 ----
 .../E_TwoEqualYypeVariables02rec.bsl          |  48 ----
 .../E_LessThanDotOpenParen001.bsl             |  35 +--
 .../E_Clashing_Values_in_AbstractClass01.bsl  |   9 +-
 .../E_Clashing_Values_in_AbstractClass03.bsl  |   6 -
 .../E_Clashing_Values_in_AbstractClass04.bsl  |   6 -
 ...g_System.Convert.ToString.OverloadList.bsl |  88 +++----
 ...g_System.Convert.ToString.OverloadList.fsx |   2 +-
 ....Threading.Tasks.Task.Run.OverloadList.bsl |  18 --
 19 files changed, 135 insertions(+), 651 deletions(-)

diff --git a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
index 04e09af706..521e1dd1fa 100644
--- a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
+++ b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
@@ -4,7 +4,6 @@ E_Slices01.fsx(15,9,15,19): typecheck error FS0041: A unique overload for method
 
 
 Arguments given:
-
  - int
 
  - int option
@@ -13,24 +12,16 @@ Arguments given:
 
 
 
-
-
-
-
 Candidates:
-
  - member Foo.GetSlice : x:int * y1:int option * y2:float option -> unit
 
  - member Foo.GetSlice : x:int * y1:int option * y2:int option -> unit
 
-
-
 E_Slices01.fsx(16,9,16,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - int
 
  - 'a option
@@ -39,24 +30,16 @@ Arguments given:
 
 
 
-
-
-
-
 Candidates:
-
  - member Foo.GetSlice : x:int * y1:int option * y2:float option -> unit
 
  - member Foo.GetSlice : x:int * y1:int option * y2:int option -> unit
 
-
-
 E_Slices01.fsx(17,9,17,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a option
 
  - int option
@@ -65,24 +48,16 @@ Arguments given:
 
 
 
-
-
-
-
 Candidates:
-
  - member Foo.GetSlice : x1:float option * x2:int option * y:int -> unit
 
  - member Foo.GetSlice : x1:int option * x2:int option * y:int -> unit
 
-
-
 E_Slices01.fsx(18,9,18,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a option
 
  - 'a option
@@ -91,18 +66,11 @@ Arguments given:
 
 
 
-
-
-
-
 Candidates:
-
  - member Foo.GetSlice : x1:float option * x2:int option * y:int -> unit
 
  - member Foo.GetSlice : x1:int option * x2:int option * y:int -> unit
 
-
-
 E_Slices01.fsx(19,9,19,17): typecheck error FS0039: The field, constructor or member 'Item' is not defined.
 
 E_Slices01.fsx(20,9,20,26): typecheck error FS0503: A member or object constructor 'GetSlice' taking 4 arguments is not accessible from this code location. All accessible versions of method 'GetSlice' take 3 arguments.
diff --git a/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
index bf8682dcaa..46eeb1805f 100644
--- a/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
+++ b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
@@ -8,19 +8,20 @@ E_RigidTypeAnnotation03.fsx(17,9,17,25): typecheck error FS0041: No overloads ma
 
 
 
-Argument given: sbyte Available overloads:
+Argument given: sbyte
 
- - static member T.M : a:string -> int
 
- - static member T.M : a:decimal<Kg> -> int
 
- - static member T.M : a:float32<Kg> -> int
+Available overloads:
+ - static member T.M : a:byte -> int
 
- - static member T.M : a:float -> int
+ - static member T.M : a:decimal<Kg> -> int
 
- - static member T.M : a:byte -> int
+ - static member T.M : a:float -> int
 
+ - static member T.M : a:float32<Kg> -> int
 
+ - static member T.M : a:string -> int
 
 E_RigidTypeAnnotation03.fsx(18,13,18,19): typecheck error FS0001: This expression was expected to have type
     'float32'    
@@ -31,19 +32,20 @@ E_RigidTypeAnnotation03.fsx(18,9,18,30): typecheck error FS0041: No overloads ma
 
 
 
-Argument given: float32 Available overloads:
+Argument given: float32
 
- - static member T.M : a:string -> int
 
- - static member T.M : a:decimal<Kg> -> int
 
- - static member T.M : a:float32<Kg> -> int
+Available overloads:
+ - static member T.M : a:byte -> int
 
- - static member T.M : a:float -> int
+ - static member T.M : a:decimal<Kg> -> int
 
- - static member T.M : a:byte -> int
+ - static member T.M : a:float -> int
 
+ - static member T.M : a:float32<Kg> -> int
 
+ - static member T.M : a:string -> int
 
 E_RigidTypeAnnotation03.fsx(19,13,19,20): typecheck error FS0001: This expression was expected to have type
     'float32<'u>'    
@@ -60,19 +62,20 @@ E_RigidTypeAnnotation03.fsx(20,9,20,39): typecheck error FS0041: No overloads ma
 
 
 
-Argument given: decimal<N s ^ 2> Available overloads:
+Argument given: decimal<N s ^ 2>
 
- - static member T.M : a:string -> int
 
- - static member T.M : a:decimal<Kg> -> int
 
- - static member T.M : a:float32<Kg> -> int
+Available overloads:
+ - static member T.M : a:byte -> int
 
- - static member T.M : a:float -> int
+ - static member T.M : a:decimal<Kg> -> int
 
- - static member T.M : a:byte -> int
+ - static member T.M : a:float -> int
 
+ - static member T.M : a:float32<Kg> -> int
 
+ - static member T.M : a:string -> int
 
 E_RigidTypeAnnotation03.fsx(21,14,21,18): typecheck error FS0001: This expression was expected to have type
     'char'    
@@ -83,16 +86,17 @@ E_RigidTypeAnnotation03.fsx(21,9,21,27): typecheck error FS0041: No overloads ma
 
 
 
-Argument given: char Available overloads:
+Argument given: char
 
- - static member T.M : a:string -> int
 
- - static member T.M : a:decimal<Kg> -> int
 
- - static member T.M : a:float32<Kg> -> int
+Available overloads:
+ - static member T.M : a:byte -> int
 
- - static member T.M : a:float -> int
+ - static member T.M : a:decimal<Kg> -> int
 
- - static member T.M : a:byte -> int
+ - static member T.M : a:float -> int
 
+ - static member T.M : a:float32<Kg> -> int
 
+ - static member T.M : a:string -> int
diff --git a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
index d5b7327501..4bbd949751 100644
--- a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
+++ b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
@@ -8,7 +8,6 @@ Argument given: 'a
 
 
 Candidates:
-
  - System.Console.WriteLine(buffer: char []) : unit
 
  - System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit
@@ -35,8 +34,6 @@ Candidates:
 
  - System.Console.WriteLine(value: uint64) : unit
 
-
-
 E_LeftToRightOverloadResolution01.fsx(9,23,9,51): typecheck error FS0041: A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -46,7 +43,6 @@ Argument given: 'a
 
 
 Candidates:
-
  - System.Console.WriteLine(buffer: char []) : unit
 
  - System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit
@@ -72,5 +68,3 @@ Candidates:
  - System.Console.WriteLine(value: uint32) : unit
 
  - System.Console.WriteLine(value: uint64) : unit
-
-
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl b/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
index 53ca50cf46..a7e18142eb 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
@@ -4,47 +4,31 @@ E_OneTypeVariable03.fsx(60,34,60,44): typecheck error FS0041: A unique overload
 
 
 Arguments given:
-
  - 'a
 
  - int
 
 
 
-
-
-
-
 Candidates:
-
  - static member C23.M : x:'a * y:'b -> Two
 
  - static member C23.M : x:'a * y:int -> Three
 
-
-
 E_OneTypeVariable03.fsx(61,34,61,45): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - int
 
 
 
-
-
-
-
 Candidates:
-
  - static member C123.M : x:'a * y:'a -> One
 
  - static member C123.M : x:'a * y:'b -> Two
 
  - static member C123.M : x:'a * y:int -> Three
-
-
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
index 1f496d88e5..6b2ca0de7d 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
@@ -4,47 +4,31 @@ E_OneTypeVariable03rec.fsx(60,38,60,48): typecheck error FS0041: A unique overlo
 
 
 Arguments given:
-
  - 'a
 
  - int
 
 
 
-
-
-
-
 Candidates:
-
  - static member C23.M : x:'a * y:'b -> Two
 
  - static member C23.M : x:'a * y:int -> Three
 
-
-
 E_OneTypeVariable03rec.fsx(61,38,61,49): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - int
 
 
 
-
-
-
-
 Candidates:
-
  - static member C123.M : x:'a * y:'a -> One
 
  - static member C123.M : x:'a * y:'b -> Two
 
  - static member C123.M : x:'a * y:int -> Three
-
-
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
index 46c1c8765e..ce5f62f1d3 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
@@ -4,93 +4,61 @@ E_TwoDifferentTypeVariables01.fsx(61,33,61,43): typecheck error FS0041: A unique
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C13.M : x:'a * y:'a -> One
 
  - static member C13.M : x:'a * y:int -> Three
 
-
-
 E_TwoDifferentTypeVariables01.fsx(62,33,62,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C24.M : x:'a * y:'b -> Two
 
  - static member C24.M : x:'a * y:C -> Four
 
-
-
 E_TwoDifferentTypeVariables01.fsx(63,33,63,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C13.M : x:'a * y:'a -> One
 
  - static member C13.M : x:'a * y:int -> Three
 
-
-
 E_TwoDifferentTypeVariables01.fsx(64,33,64,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C13.M : x:'a * y:'a -> One
 
  - static member C13.M : x:'a * y:int -> Three
-
-
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
index 2ed81f80d2..7450a34955 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
@@ -4,93 +4,61 @@ E_TwoDifferentTypeVariables01rec.fsx(60,37,60,47): typecheck error FS0041: A uni
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C13.M : x:'a * y:'a -> One
 
  - static member C13.M : x:'a * y:int -> Three
 
-
-
 E_TwoDifferentTypeVariables01rec.fsx(61,37,61,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C24.M : x:'a * y:'b -> Two
 
  - static member C24.M : x:'a * y:C -> Four
 
-
-
 E_TwoDifferentTypeVariables01rec.fsx(62,37,62,51): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C13.M : x:'a * y:'a -> One
 
  - static member C13.M : x:'a * y:int -> Three
 
-
-
 E_TwoDifferentTypeVariables01rec.fsx(63,37,63,50): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C13.M : x:'a * y:'a -> One
 
  - static member C13.M : x:'a * y:int -> Three
-
-
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
index bdb800a95c..9eed2741c9 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
@@ -1,251 +1,80 @@
 
-E_TwoDifferentTypeVariablesGen00.fsx(104,17,104,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+E_TwoDifferentTypeVariablesGen00.fsx(61,52,61,53): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
 
-E_TwoDifferentTypeVariablesGen00.fsx(105,17,105,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+E_TwoDifferentTypeVariablesGen00.fsx(61,18,61,42): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type ''a'.
 
-E_TwoDifferentTypeVariablesGen00.fsx(106,17,106,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+E_TwoDifferentTypeVariablesGen00.fsx(61,18,61,42): typecheck error FS0043: The type ''b' does not match the type ''b0'
 
-E_TwoDifferentTypeVariablesGen00.fsx(107,17,107,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+E_TwoDifferentTypeVariablesGen00.fsx(62,52,62,53): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type 'int'.
 
-E_TwoDifferentTypeVariablesGen00.fsx(108,17,108,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
+E_TwoDifferentTypeVariablesGen00.fsx(62,18,62,42): typecheck error FS0043: The type ''b' does not match the type 'int'
 
-E_TwoDifferentTypeVariablesGen00.fsx(109,17,109,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(110,17,110,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(111,17,111,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(112,17,112,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(113,17,113,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(114,17,114,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(115,17,115,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(116,17,116,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(117,17,117,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(118,17,118,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(119,17,119,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(104,17,104,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(105,17,105,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(106,17,106,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(107,17,107,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(108,17,108,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(109,17,109,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(110,17,110,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(111,17,111,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(112,17,112,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(113,17,113,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(114,17,114,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(115,17,115,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(116,17,116,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(117,17,117,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(118,17,118,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(119,17,119,24): parse error FS1189: Remove spaces between the type name and type parameter, e.g. "type C<'T>", not type "C   <'T>". Type parameters must be placed directly adjacent to the type name.
-
-E_TwoDifferentTypeVariablesGen00.fsx(104,48,104,49): typecheck error FS0001: This expression was expected to have type
-    ''a'    
-but here has type
-    ''b'    
-
-E_TwoDifferentTypeVariablesGen00.fsx(105,48,105,49): typecheck error FS0001: This expression was expected to have type
-    'int'    
-but here has type
-    ''b'    
-
-E_TwoDifferentTypeVariablesGen00.fsx(106,48,106,49): typecheck error FS0001: A type parameter is missing a constraint 'when 'b :> C'
-
-E_TwoDifferentTypeVariablesGen00.fsx(106,48,106,49): typecheck error FS0193: Type constraint mismatch. The type 
-    ''b'    
-is not compatible with type
-    'C'    
-
-
-E_TwoDifferentTypeVariablesGen00.fsx(107,41,107,51): typecheck error FS0041: No overloads match for method 'M'.
+E_TwoDifferentTypeVariablesGen00.fsx(63,45,63,55): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
- Available overloads:
-
- - static member C13.M : x:'a * y:int -> Three
-
+Candidates:
  - static member C13.M : x:'a * y:'a -> One
 
-
-
-E_TwoDifferentTypeVariablesGen00.fsx(108,41,108,51): typecheck error FS0041: No overloads match for method 'M'.
-
-
-
-Arguments given:
-
- - 'a
-
- - 'b
-
-
-
- Available overloads:
-
- - static member C14.M : x:'a * y:C -> Four
-
- - static member C14.M : x:'a * y:'a -> One
-
-
-
-E_TwoDifferentTypeVariablesGen00.fsx(109,52,109,53): typecheck error FS0001: This expression was expected to have type
-    ''a'    
-but here has type
-    ''b'    
-
-E_TwoDifferentTypeVariablesGen00.fsx(110,50,110,51): typecheck error FS0001: This expression was expected to have type
-    ''b'    
-but here has type
-    ''a'    
-
-E_TwoDifferentTypeVariablesGen00.fsx(110,52,110,53): typecheck error FS0001: This expression was expected to have type
-    'int'    
-but here has type
-    ''b'    
-
-E_TwoDifferentTypeVariablesGen00.fsx(111,52,111,53): typecheck error FS0001: A type parameter is missing a constraint 'when 'b :> C'
-
-E_TwoDifferentTypeVariablesGen00.fsx(111,52,111,53): typecheck error FS0193: Type constraint mismatch. The type 
-    ''b'    
-is not compatible with type
-    'C'    
-
-
-E_TwoDifferentTypeVariablesGen00.fsx(112,41,112,55): typecheck error FS0041: No overloads match for method 'M'.
-
-
-
-Arguments given:
-
- - 'a
-
- - 'b
-
-
-
- Available overloads:
-
  - static member C13.M : x:'a * y:int -> Three
 
- - static member C13.M : x:'a * y:'a -> One
-
-
-
-E_TwoDifferentTypeVariablesGen00.fsx(113,41,113,55): typecheck error FS0041: No overloads match for method 'M'.
+E_TwoDifferentTypeVariablesGen00.fsx(64,56,64,57): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
 
+E_TwoDifferentTypeVariablesGen00.fsx(64,18,64,42): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type ''a'.
 
+E_TwoDifferentTypeVariablesGen00.fsx(64,18,64,42): typecheck error FS0043: The type ''b' does not match the type ''b0'
 
-Arguments given:
-
- - 'a
-
- - 'b
-
-
-
- Available overloads:
-
- - static member C14.M : x:'a * y:C -> Four
-
- - static member C14.M : x:'a * y:'a -> One
-
-
-
-E_TwoDifferentTypeVariablesGen00.fsx(114,51,114,52): typecheck error FS0001: This expression was expected to have type
-    ''a'    
-but here has type
-    ''b'    
+E_TwoDifferentTypeVariablesGen00.fsx(65,54,65,55): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type ''a'.
 
-E_TwoDifferentTypeVariablesGen00.fsx(115,51,115,52): typecheck error FS0001: This expression was expected to have type
-    'int'    
-but here has type
-    ''b'    
+E_TwoDifferentTypeVariablesGen00.fsx(65,56,65,57): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type 'int'.
 
-E_TwoDifferentTypeVariablesGen00.fsx(116,51,116,52): typecheck error FS0001: A type parameter is missing a constraint 'when 'b :> C'
+E_TwoDifferentTypeVariablesGen00.fsx(65,18,65,42): typecheck error FS0043: The type ''a' does not match the type 'int'
 
-E_TwoDifferentTypeVariablesGen00.fsx(116,51,116,52): typecheck error FS0193: Type constraint mismatch. The type 
-    ''b'    
-is not compatible with type
-    'C'    
-
-
-E_TwoDifferentTypeVariablesGen00.fsx(117,41,117,54): typecheck error FS0041: No overloads match for method 'M'.
+E_TwoDifferentTypeVariablesGen00.fsx(66,45,66,59): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
- Available overloads:
+Candidates:
+ - static member C13.M : x:'a * y:'a -> One
 
  - static member C13.M : x:'a * y:int -> Three
 
- - static member C13.M : x:'a * y:'a -> One
+E_TwoDifferentTypeVariablesGen00.fsx(67,55,67,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
 
+E_TwoDifferentTypeVariablesGen00.fsx(67,18,67,42): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type ''a'.
 
+E_TwoDifferentTypeVariablesGen00.fsx(67,18,67,42): typecheck error FS0043: The type ''b' does not match the type ''b0'
 
-E_TwoDifferentTypeVariablesGen00.fsx(118,41,118,54): typecheck error FS0041: No overloads match for method 'M'.
+E_TwoDifferentTypeVariablesGen00.fsx(68,45,68,58): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
- Available overloads:
-
- - static member C14.M : x:'a * y:C -> Four
-
- - static member C14.M : x:'a * y:'a -> One
-
-
+Candidates:
+ - static member C13.M : x:'a * y:'a -> One
 
-E_TwoDifferentTypeVariablesGen00.fsx(119,52,119,53): typecheck error FS0001: A type parameter is missing a constraint 'when 'b :> C'
+ - static member C13.M : x:'a * y:int -> Three
 
-E_TwoDifferentTypeVariablesGen00.fsx(119,52,119,53): typecheck error FS0193: Type constraint mismatch. The type 
-    ''b'    
-is not compatible with type
-    'C'    
+E_TwoDifferentTypeVariablesGen00.fsx(69,55,69,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type 'int'.
 
+E_TwoDifferentTypeVariablesGen00.fsx(69,18,69,42): typecheck error FS0043: The type ''b' does not match the type 'int'
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx
index a567c6e395..b4c54e0eaa 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx
@@ -2,51 +2,7 @@
 // Regression test for FSHARP1.0:4758
 // Type Inference
 // Check Method Disambiguation When User Generic Variable Get Instantiated By Overload Resolution
-
-//<Expects id="FS0001" span="(104,48-104,49)" status="error">This expression was expected to have type.    ''a'    .but here has type.    ''b'</Expects>
-//<Expects id="FS0001" span="(105,48-105,49)" status="error">This expression was expected to have type.    'int'    .but here has type.    ''b'</Expects>
-//<Expects id="FS0001" span="(106,48-106,49)" status="error">A type parameter is missing a constraint 'when 'b :> C'</Expects>
-//<Expects id="FS0193" span="(106,48-106,49)" status="error">Type constraint mismatch. The type.+''b'.+is not compatible with type</Expects>
-//<Expects id="FS0041" span="(107,41-107,51)" status="error">No overloads match for method 'M'\. The available overloads are shown below\.</Expects>
-
-
-
-//<Expects id="FS0041" span="(108,41-108,51)" status="error">No overloads match for method 'M'\. The available overloads are shown below\.</Expects>
-
-
-
-//<Expects id="FS0001" span="(109,52-109,53)" status="error">This expression was expected to have type.    ''a'    .but here has type.    ''b'</Expects>
-//<Expects id="FS0001" span="(110,50-110,51)" status="error">This expression was expected to have type.    ''b'    .but here has type.    ''a'</Expects>
-//<Expects id="FS0001" span="(110,52-110,53)" status="error">This expression was expected to have type.    'int'    .but here has type.    ''b'</Expects>
-//<Expects id="FS0001" span="(111,52-111,53)" status="error">A type parameter is missing a constraint 'when 'b :> C'</Expects>
-//<Expects id="FS0193" span="(111,52-111,53)" status="error">Type constraint mismatch. The type.+''b'.+is not compatible with type</Expects>
-//<Expects id="FS0041" span="(112,41-112,55)" status="error">No overloads match for method 'M'\. The available overloads are shown below\.</Expects>
-
-
-
-
-//<Expects id="FS0041" span="(113,41-113,55)" status="error">No overloads match for method 'M'\. The available overloads are shown below\.</Expects>
-
-
-
-
-//<Expects id="FS0001" span="(114,51-114,52)" status="error">This expression was expected to have type.    ''a'    .but here has type.    ''b'</Expects>
-//<Expects id="FS0001" span="(115,51-115,52)" status="error">This expression was expected to have type.    'int'    .but here has type.    ''b'</Expects>
-//<Expects id="FS0001" span="(116,51-116,52)" status="error">A type parameter is missing a constraint 'when 'b :> C'</Expects>
-//<Expects id="FS0193" span="(116,51-116,52)" status="error">Type constraint mismatch. The type.+''b'.+is not compatible with type</Expects>
-//<Expects id="FS0041" span="(117,41-117,54)" status="error">No overloads match for method 'M'\. The available overloads are shown below\.</Expects>
-
-
-
-
-//<Expects id="FS0041" span="(118,41-118,54)" status="error">No overloads match for method 'M'\. The available overloads are shown below\.</Expects>
-
-
-
-
-//<Expects id="FS0001" span="(119,52-119,53)" status="error">A type parameter is missing a constraint 'when 'b :> C'</Expects>
-//<Expects id="FS0193" span="(119,52-119,53)" status="error">Type constraint mismatch. The type.+''b'.+is not compatible with type</Expects>
-
+module M
 // These different return types are used to determine which overload got chosen
 type One = | One
 type Two = | Two
@@ -100,21 +56,34 @@ type C1234 =
     static member M<'a>(x:'a,y:int) = Three
     static member M<'a>(x:'a,y:C) = Four
 
-module M0 =
-    let gB1     <'a,'b> (x:'a) (y:'b) = C1.M(x,y) = One      // expect: type error
-    let gB3     <'a,'b> (x:'a) (y:'b) = C3.M(x,y)  = Three   // expect: type error
-    let gB4     <'a,'b> (x:'a) (y:'b) = C4.M(x,y)  = Four    // expect: type error
-    let gB13    <'a,'b> (x:'a) (y:'b) = C13.M(x,y)           // expect: ambiguity error (and note: both would instantiate 'a or 'b)
-    let gB14    <'a,'b> (x:'a) (y:'b) = C14.M(x,y) = Four    // expect: ambiguity error 
-    let gC1     <'a,'b> (x:'a) (y:'b) = C1.M<'a>(x,y) = One      // expect: type error
-    let gC3     <'a,'b> (x:'a) (y:'b) = C3.M<'b>(x,y)  = Three   // expect: type error
-    let gC4     <'a,'b> (x:'a) (y:'b) = C4.M<'a>(x,y)  = Four    // expect: type error
-    let gC13    <'a,'b> (x:'a) (y:'b) = C13.M<'a>(x,y)           // expect: ambiguity error 
-    let gC14    <'a,'b> (x:'a) (y:'b) = C14.M<'a>(x,y)           // expect: ambiguity error 
-    let gD1     <'a,'b> (x:'a) (y:'b) = C1.M<_>(x,y) = One       // expect: type error
-    let gD3     <'a,'b> (x:'a) (y:'b) = C3.M<_>(x,y)  = Three    // expect: type error
-    let gD4     <'a,'b> (x:'a) (y:'b) = C4.M<_>(x,y)  = Four     // expect: type error
-    let gD13    <'a,'b> (x:'a) (y:'b) = C13.M<_>(x,y)            // expect: ambiguity error (and note: both would instantiate 'a or 'b)
-    let gD14    <'a,'b> (x:'a) (y:'b) = C14.M<_>(x,y)            // expect: type error
-    let gD24    <'a,'b> (x:'a) (y:'b) = C24.M<_>(x,y)            // expect: type error
-
+ 
+module M0Rec =
+    let rec      gB1<'a,'b> (x:'a) (y:'b) = C1.M(x,y) = One      // expect: type error
+    let rec      gB3<'a,'b> (x:'a) (y:'b) = C3.M(x,y)  = Three   // expect: type error
+    let rec     gB13<'a,'b> (x:'a) (y:'b) = C13.M(x,y)           // expect: ambiguity error (and note: both would instantiate 'a or 'b)
+    let rec      gC1<'a,'b> (x:'a) (y:'b) = C1.M<'a>(x,y) = One      // expect: error
+    let rec      gC3<'a,'b> (x:'a) (y:'b) = C3.M<'b>(x,y)  = Three   // expect: error
+    let rec     gC13<'a,'b> (x:'a) (y:'b) = C13.M<'a>(x,y)           // expect: ambiguity error 
+    let rec      gD1<'a,'b> (x:'a) (y:'b) = C1.M<_>(x,y) = One       // expect: type error
+    let rec     gD13<'a,'b> (x:'a) (y:'b) = C13.M<_>(x,y)            // expect: ambiguity error (and note: both would instantiate 'a or 'b)
+    let rec      gD3<'a,'b> (x:'a) (y:'b) = C3.M<_>(x,y)  = Three    // expect: error
+
+//<Expects spans="(60,52-60,53)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
+//<Expects spans="(60,18-60,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
+//<Expects spans="(60,18-60,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
+//<Expects spans="(61,52-61,53)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type 'int'\.</Expects>
+//<Expects spans="(61,18-61,42)" status="error" id="FS0043">The type ''b' does not match the type 'int'</Expects>
+//<Expects status="error" span="(63,45-63,55)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects spans="(63,56-63,57)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
+//<Expects spans="(63,18-63,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
+//<Expects spans="(63,18-63,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
+//<Expects spans="(64,54-64,55)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
+//<Expects spans="(64,56-64,57)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type 'int'\.</Expects>
+//<Expects spans="(64,18-64,42)" status="error" id="FS0043">The type ''a' does not match the type 'int'</Expects>
+//<Expects status="error" span="(66,45-66,59)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects spans="(66,55-66,56)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
+//<Expects spans="(66,18-66,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
+//<Expects spans="(66,18-66,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
+//<Expects status="error" span="(68,45-68,58)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
+//<Expects spans="(68,55-68,56)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type 'int'\.</Expects>
+//<Expects spans="(68,18-68,42)" status="error" id="FS0043">The type ''b' does not match the type 'int'</Expects>
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
index 8ae77411d0..36dd8553c6 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
@@ -14,25 +14,17 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(63,45,63,55): typecheck error FS0041: A
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C13.M : x:'a * y:'a -> One
 
  - static member C13.M : x:'a * y:int -> Three
 
-
-
 E_TwoDifferentTypeVariablesGen00rec.fsx(64,56,64,57): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(64,18,64,42): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type ''a'.
@@ -50,25 +42,17 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(66,45,66,59): typecheck error FS0041: A
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C13.M : x:'a * y:'a -> One
 
  - static member C13.M : x:'a * y:int -> Three
 
-
-
 E_TwoDifferentTypeVariablesGen00rec.fsx(67,55,67,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(67,18,67,42): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type ''a'.
@@ -80,25 +64,17 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(68,45,68,58): typecheck error FS0041: A
 
 
 Arguments given:
-
  - 'a
 
  - 'b
 
 
 
-
-
-
-
 Candidates:
-
  - static member C13.M : x:'a * y:'a -> One
 
  - static member C13.M : x:'a * y:int -> Three
 
-
-
 E_TwoDifferentTypeVariablesGen00rec.fsx(69,55,69,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type 'int'.
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(69,18,69,42): typecheck error FS0043: The type ''b' does not match the type 'int'
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
index 2e12a848ba..3912e40b47 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
@@ -4,117 +4,79 @@ E_TwoEqualTypeVariables02.fsx(61,33,61,43): typecheck error FS0041: A unique ove
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C12.M : x:'a * y:'a -> One
 
  - static member C12.M : x:'a * y:'b -> Two
 
-
-
 E_TwoEqualTypeVariables02.fsx(62,33,62,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C14.M : x:'a * y:'a -> One
 
  - static member C14.M : x:'a * y:C -> Four
 
-
-
 E_TwoEqualTypeVariables02.fsx(63,33,63,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C24.M : x:'a * y:'b -> Two
 
  - static member C24.M : x:'a * y:C -> Four
 
-
-
 E_TwoEqualTypeVariables02.fsx(64,33,64,44): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C123.M : x:'a * y:'a -> One
 
  - static member C123.M : x:'a * y:'b -> Two
 
  - static member C123.M : x:'a * y:int -> Three
 
-
-
 E_TwoEqualTypeVariables02.fsx(65,33,65,45): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C1234.M : x:'a * y:'a -> One
 
  - static member C1234.M : x:'a * y:'b -> Two
@@ -123,28 +85,18 @@ Candidates:
 
  - static member C1234.M : x:'a * y:int -> Three
 
-
-
 E_TwoEqualTypeVariables02.fsx(66,33,66,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C14.M : x:'a * y:'a -> One
 
  - static member C14.M : x:'a * y:C -> Four
-
-
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
index 4c855ca3fd..de1b498e3c 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
@@ -4,117 +4,79 @@ E_TwoEqualYypeVariables02rec.fsx(60,37,60,47): typecheck error FS0041: A unique
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C12.M : x:'a * y:'a -> One
 
  - static member C12.M : x:'a * y:'b -> Two
 
-
-
 E_TwoEqualYypeVariables02rec.fsx(61,37,61,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C14.M : x:'a * y:'a -> One
 
  - static member C14.M : x:'a * y:C -> Four
 
-
-
 E_TwoEqualYypeVariables02rec.fsx(62,37,62,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C24.M : x:'a * y:'b -> Two
 
  - static member C24.M : x:'a * y:C -> Four
 
-
-
 E_TwoEqualYypeVariables02rec.fsx(63,37,63,48): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C123.M : x:'a * y:'a -> One
 
  - static member C123.M : x:'a * y:'b -> Two
 
  - static member C123.M : x:'a * y:int -> Three
 
-
-
 E_TwoEqualYypeVariables02rec.fsx(64,37,64,49): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C1234.M : x:'a * y:'a -> One
 
  - static member C1234.M : x:'a * y:'b -> Two
@@ -123,28 +85,18 @@ Candidates:
 
  - static member C1234.M : x:'a * y:int -> Three
 
-
-
 E_TwoEqualYypeVariables02rec.fsx(65,37,65,50): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
 
 Arguments given:
-
  - 'a
 
  - 'a
 
 
 
-
-
-
-
 Candidates:
-
  - static member C14.M : x:'a * y:'a -> One
 
  - static member C14.M : x:'a * y:C -> Four
-
-
diff --git a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
index 7909ec8f39..30209cdc42 100644
--- a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
+++ b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
@@ -7,45 +7,38 @@ 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)
 
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
-
- - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
 
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
-
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
 
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
 
 E_LessThanDotOpenParen001.fsx(33,10,33,45): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
 
 
 
 Arguments given:
-
  - (string -> int)
 
  - TestType<int,string>
 
 
 
- Available overloads:
+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)
 
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
-
- - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
 
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
-
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
 
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
 
 E_LessThanDotOpenParen001.fsx(34,44,34,54): typecheck error FS0001: This expression was expected to have type
     'int'    
@@ -57,23 +50,19 @@ E_LessThanDotOpenParen001.fsx(34,10,34,68): typecheck error FS0041: No overloads
 
 
 Arguments given:
-
  - (int -> 'a)
 
  - TestType<int,string>
 
 
 
- Available overloads:
+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)
 
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
-
- - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
 
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
-
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
 
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
index 6b73305795..85d7af269f 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
@@ -1,12 +1,5 @@
 
-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
-
-
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
index 94c6d6e4df..75657ad283 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
@@ -8,13 +8,10 @@ Argument given: int
 
 
 Candidates:
-
  - abstract member D.M : 'T -> int
 
  - abstract member D.M : 'U -> string
 
-
-
 E_Clashing_Values_in_AbstractClass03.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -24,9 +21,6 @@ Argument given: int
 
 
 Candidates:
-
  - abstract member D.M : 'T -> int
 
  - abstract member D.M : 'U -> string
-
-
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
index 1d438fcb72..698f690a7a 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
@@ -8,13 +8,10 @@ Argument given: int
 
 
 Candidates:
-
  - abstract member D.M : 'T -> int
 
  - abstract member D.M : 'U -> string
 
-
-
 E_Clashing_Values_in_AbstractClass04.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -24,9 +21,6 @@ Argument given: int
 
 
 Candidates:
-
  - abstract member D.M : 'T -> int
 
  - abstract member D.M : 'U -> string
-
-
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
index 3114003249..76ea741745 100644
--- a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
@@ -1,128 +1,112 @@
 
-neg_System.Convert.ToString.OverloadList.fsx(2,1,2,31): typecheck error FS0041: No overloads match for method 'ToString'.
+neg_System.Convert.ToString.OverloadList.fsx(1,1,1,31): typecheck error FS0041: No overloads match for method 'ToString'.
 
 
 
 Arguments given:
-
  - char
 
  - int
 
 
 
- Available overloads:
-
- - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
+Available overloads:
+ - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string
 
  - System.Convert.ToString(value: bool, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string
-
- - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: byte, toBase: int) : string
 
- - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: int, toBase: int) : string
 
- - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: int16, toBase: int) : string
 
- - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: int64, toBase: int) : string
 
- - System.Convert.ToString(value: byte, toBase: int) : string
+ - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: int16, toBase: int) : string
+ - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: int, toBase: int) : string
+ - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: int64, toBase: int) : string
+ - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string
 
+ - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string
 
+ - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string
 
-neg_System.Convert.ToString.OverloadList.fsx(3,1,3,47): typecheck error FS0041: No overloads match for method 'ToString'.
+neg_System.Convert.ToString.OverloadList.fsx(2,1,2,47): typecheck error FS0041: No overloads match for method 'ToString'.
 
 
 
 Arguments given:
-
  - (provider) : char
 
  - (value) : int
 
 
 
- Available overloads:
-
- - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
+Available overloads:
+ - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string
 
  - System.Convert.ToString(value: bool, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string
 
  - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string
 
  - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string
-
- - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string
-
- - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string
-
- - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
 
- - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string
 
  - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string
 
+ - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string
 
+ - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string
 
-neg_System.Convert.ToString.OverloadList.fsx(4,1,4,48): typecheck error FS0041: A unique overload for method 'ToString' could not be determined based on type information prior to this program point. A type annotation may be needed.
+ - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string
 
+neg_System.Convert.ToString.OverloadList.fsx(3,1,3,48): typecheck error FS0041: A unique overload for method 'ToString' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
-Arguments given:
 
+Arguments given:
  - (provider) : 'a when 'a : null
 
  - (value) : int
 
 
 
-
-
-
-
 Candidates:
-
  - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
 
  - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
-
-
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.fsx b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.fsx
index b982b38a9b..be91d10893 100644
--- a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.fsx
+++ b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.fsx
@@ -1,4 +1,4 @@
-module Overloads
 System.Convert.ToString('a',0) |> ignore
 System.Convert.ToString(provider='a', value=0) |> ignore
 System.Convert.ToString(provider=null, value=0) |> ignore
+;;
\ No newline at end of file
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
index 37b7668cb7..06089d9946 100644
--- a/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
@@ -8,13 +8,10 @@ Argument given: (unit -> Task<int>)
 
 
 Candidates:
-
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
 
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
 
-
-
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(6,11,6,44): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -24,13 +21,10 @@ Argument given: Func<Task<int>>
 
 
 Candidates:
-
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
 
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
 
-
-
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(7,11,7,47): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -40,13 +34,10 @@ Argument given: Func<Task<int>>
 
 
 Candidates:
-
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
 
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
 
-
-
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(8,21,8,57): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -56,13 +47,10 @@ Argument given: Func<Task<int>>
 
 
 Candidates:
-
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
 
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
 
-
-
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(9,11,9,50): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -72,13 +60,10 @@ Argument given: Func<Task<int>>
 
 
 Candidates:
-
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
 
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
 
-
-
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(10,11,10,52): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -88,9 +73,6 @@ Argument given: Func<Task<int>>
 
 
 Candidates:
-
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
 
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
-
-

From db5df8de76b615d70284cd5f90cdc8bd1802a897 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 00:13:59 -0700
Subject: [PATCH 33/96] remove the migrated tests from fsharpqa

---
 .../Conformance/Expressions/Type-relatedExpressions/env.lst      | 1 -
 .../Source/Conformance/InferenceProcedures/TypeInference/env.lst | 1 -
 .../Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst | 1 -
 3 files changed, 3 deletions(-)

diff --git a/tests/fsharpqa/Source/Conformance/Expressions/Type-relatedExpressions/env.lst b/tests/fsharpqa/Source/Conformance/Expressions/Type-relatedExpressions/env.lst
index 53addca20e..2e667f0362 100644
--- a/tests/fsharpqa/Source/Conformance/Expressions/Type-relatedExpressions/env.lst
+++ b/tests/fsharpqa/Source/Conformance/Expressions/Type-relatedExpressions/env.lst
@@ -16,7 +16,6 @@
 
 	SOURCE=E_RigidTypeAnnotation01.fsx        SCFLAGS="--test:ErrorRanges --flaterrors"	# E_RigidTypeAnnotation01.fsx
 	SOURCE=E_RigidTypeAnnotation02.fsx        SCFLAGS="--test:ErrorRanges --flaterrors"	# E_RigidTypeAnnotation02.fsx
-	SOURCE=E_RigidTypeAnnotation03.fsx        SCFLAGS="--test:ErrorRanges --flaterrors"	# E_RigidTypeAnnotation03.fsx
 	SOURCE=E_rigidtypeannotation02.fs   COMPILE_ONLY=1 SCFLAGS="--test:ErrorRanges --flaterrors"	# E_rigidtypeannotation02.fs
 	SOURCE=E_rigidtypeannotation02b.fs  COMPILE_ONLY=1 SCFLAGS="--test:ErrorRanges --flaterrors"	# E_rigidtypeannotation02b.fs
 	SOURCE=E_RigidTypeAnnotation03.fs                  SCFLAGS="--test:ErrorRanges --flaterrors"	# E_RigidTypeAnnotation03.fs
diff --git a/tests/fsharpqa/Source/Conformance/InferenceProcedures/TypeInference/env.lst b/tests/fsharpqa/Source/Conformance/InferenceProcedures/TypeInference/env.lst
index 72da539ce6..b11e575c47 100644
--- a/tests/fsharpqa/Source/Conformance/InferenceProcedures/TypeInference/env.lst
+++ b/tests/fsharpqa/Source/Conformance/InferenceProcedures/TypeInference/env.lst
@@ -16,7 +16,6 @@
 	SOURCE=OneTypeVariable03.fs                   SCFLAGS="-a --test:ErrorRanges --warnaserror+"	# OneTypeVariable03.fs
 	SOURCE=OneTypeVariable03rec.fs                SCFLAGS="-a --test:ErrorRanges --warnaserror+"	# OneTypeVariable03rec.fs
 
-	SOURCE=E_TwoDifferentTypeVariablesGen00.fs    SCFLAGS="--test:ErrorRanges --flaterrors"		# E_TwoDifferentTypeVariablesGen00.fs
 	SOURCE=E_TwoDifferentTypeVariablesGen01rec.fs SCFLAGS="-a --test:ErrorRanges --flaterrors"	# E_TwoDifferentTypeVariablesGen01rec.fs
 	SOURCE=W_OneTypeVariable03.fs                 SCFLAGS="-a --test:ErrorRanges"			# W_OneTypeVariable03.fs
 	SOURCE=W_OneTypeVariable03rec.fs              SCFLAGS="-a --test:ErrorRanges"			# W_OneTypeVariable03rec.fs
diff --git a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst
index 2cd6bea706..27e2dee163 100644
--- a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst
+++ b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst
@@ -2,7 +2,6 @@
 	SOURCE=E_GreaterThanDotParen01.fs COMPILE_ONLY=1			# E_GreaterThanDotParen01.fs
 
 	SOURCE=E_LessThanDotOpenParen001.fs COMPILE_ONLY=1 SCFLAGS=--flaterrors	# E_LessThanDotOpenParen001.fs
-	SOURCE=LessThanDotOpenParen001.fs   COMPILE_ONLY=1			# LessThanDotOpenParen001.fs
 
 	SOURCE=GreaterThanColon001.fs   COMPILE_ONLY=1	# GreaterThanColon001.fs
 	SOURCE=E_GreaterThanColon002.fs COMPILE_ONLY=1	# E_GreaterThanColon002.fs

From dce9b9231a3aea9d76487ba1e662187a6d304868 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 01:02:41 -0700
Subject: [PATCH 34/96] fix vstest error message

---
 .../Tests.LanguageService.ErrorList.fs                   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
index 93112a0e1e..0d1610504b 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
@@ -214,8 +214,7 @@ Argument given: float
 
 Available overloads:
  - new : bool -> X
- - new : int -> X
-""" 
+ - new : int -> X""" 
             ]
 
         CheckErrorList content (assertExpectedErrorMessages expectedMessages)
@@ -304,8 +303,7 @@ Candidates:
  - System.Console.WriteLine(buffer: char []) : unit
  - System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit
  - System.Console.WriteLine(value: obj) : unit
- - System.Console.WriteLine(value: string) : unit
-"""
+ - System.Console.WriteLine(value: string) : unit"""
         ]
         CheckErrorList content (assertExpectedErrorMessages expectedMessages)
 
@@ -330,8 +328,7 @@ Arguments given:
 
 Candidates:
  - member A.Do : a:int * b:'T -> unit
- - member A.Do : a:int * b:int -> unit
-"""        
+ - member A.Do : a:int * b:int -> unit"""        
         ]
         CheckErrorList content (assertExpectedErrorMessages expectedMessages)
 

From 36b6a1398612be0119523f4d9770f7916a16084a Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 01:05:50 -0700
Subject: [PATCH 35/96] fix env.lst, removed wrong one...

---
 .../Conformance/LexicalAnalysis/SymbolicOperators/env.lst       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst
index 27e2dee163..a1066dd6ee 100644
--- a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst
+++ b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst
@@ -1,7 +1,7 @@
 	SOURCE=GreaterThanDotParen01.fs COMPILE_ONLY=1				# GreaterThanDotParen01.fs
 	SOURCE=E_GreaterThanDotParen01.fs COMPILE_ONLY=1			# E_GreaterThanDotParen01.fs
 
-	SOURCE=E_LessThanDotOpenParen001.fs COMPILE_ONLY=1 SCFLAGS=--flaterrors	# E_LessThanDotOpenParen001.fs
+	SOURCE=LessThanDotOpenParen001.fs   COMPILE_ONLY=1			# LessThanDotOpenParen001.fs
 
 	SOURCE=GreaterThanColon001.fs   COMPILE_ONLY=1	# GreaterThanColon001.fs
 	SOURCE=E_GreaterThanColon002.fs COMPILE_ONLY=1	# E_GreaterThanColon002.fs

From bf4ee091cf5a6603602660e0b83f079c9ba5cb4a Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 08:03:58 -0700
Subject: [PATCH 36/96] update baselines of remaining tests

---
 .../E_LessThanDotOpenParen001.bsl             |   6 +-
 .../E_Clashing_Values_in_AbstractClass01.bsl  |   6 +-
 tests/fsharp/typecheck/sigs/neg06.bsl         |  13 +-
 tests/fsharp/typecheck/sigs/neg106.bsl        |  36 +---
 tests/fsharp/typecheck/sigs/neg106.vsbsl      | 180 +++++++++---------
 tests/fsharp/typecheck/sigs/neg20.bsl         |  20 +-
 tests/fsharp/typecheck/sigs/neg45.bsl         |   9 -
 tests/fsharp/typecheck/sigs/neg61.bsl         |  23 +--
 8 files changed, 130 insertions(+), 163 deletions(-)

diff --git a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
index 30209cdc42..34b3951a7d 100644
--- a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
+++ b/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)
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
index 85d7af269f..1af0a83c7a 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
+++ b/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
diff --git a/tests/fsharp/typecheck/sigs/neg06.bsl b/tests/fsharp/typecheck/sigs/neg06.bsl
index 431398803d..65930d6951 100644
--- a/tests/fsharp/typecheck/sigs/neg06.bsl
+++ b/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.
diff --git a/tests/fsharp/typecheck/sigs/neg106.bsl b/tests/fsharp/typecheck/sigs/neg106.bsl
index c8cdb088bb..6eac870cdc 100644
--- a/tests/fsharp/typecheck/sigs/neg106.bsl
+++ b/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,23 +15,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(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'.
@@ -40,7 +36,6 @@ neg106.fs(17,14,17,68): typecheck error FS0041: No overloads match for method 'C
 
 
 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,7 +76,6 @@ neg106.fs(40,18,40,32): typecheck error FS0041: No overloads match for method 'M
 
 
 Arguments given:
-
  - string
 
  - inref<int>
@@ -92,19 +83,15 @@ Arguments given:
 
 
 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>
@@ -112,12 +99,9 @@ Arguments given:
 
 
 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>'    
diff --git a/tests/fsharp/typecheck/sigs/neg106.vsbsl b/tests/fsharp/typecheck/sigs/neg106.vsbsl
index e07dd731fb..6eac870cdc 100644
--- a/tests/fsharp/typecheck/sigs/neg106.vsbsl
+++ b/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>'    
diff --git a/tests/fsharp/typecheck/sigs/neg20.bsl b/tests/fsharp/typecheck/sigs/neg20.bsl
index a5368a91f7..e24792df3b 100644
--- a/tests/fsharp/typecheck/sigs/neg20.bsl
+++ b/tests/fsharp/typecheck/sigs/neg20.bsl
@@ -164,7 +164,6 @@ neg20.fs(131,5,131,24): typecheck error FS0041: No overloads match for method 'O
 
 
 Arguments given:
-
  - string
 
  - obj
@@ -172,12 +171,9 @@ Arguments given:
 
 
 Available overloads:
-
- - static member C.OM3 : x:'b * y:int -> int
-
  - static member C.OM3 : x:'b * y:'b -> int
 
-
+ - static member C.OM3 : x:'b * y:int -> int
 
 neg20.fs(152,13,152,23): typecheck error FS0033: The type 'Test.BadNumberOfGenericParameters.C<_>' expects 1 type argument(s) but is given 2
 
@@ -212,7 +208,6 @@ neg20.fs(182,14,182,31): typecheck error FS0041: No overloads match for method '
 
 
 Arguments given:
-
  - string
 
  - obj
@@ -220,13 +215,10 @@ Arguments given:
 
 
 Available overloads:
-
  - static member C2.M : fmt:string * [<System.ParamArray>] args:int [] -> string
 
  - static member C2.M : fmt:string * [<System.ParamArray>] args:int [] -> string
 
-
-
 neg20.fs(183,29,183,34): typecheck error FS0001: This expression was expected to have type
     'int'    
 but here has type
@@ -277,7 +269,6 @@ neg20.fs(188,14,188,31): typecheck error FS0041: No overloads match for method '
 
 
 Arguments given:
-
  - string
 
  - obj
@@ -285,13 +276,10 @@ Arguments given:
 
 
 Available overloads:
-
  - static member C3.M : fmt:string * [<System.ParamArray>] args:string [] -> string
 
  - static member C3.M : fmt:string * [<System.ParamArray>] args:string [] -> string
 
-
-
 neg20.fs(189,29,189,34): typecheck error FS0001: This expression was expected to have type
     'string'    
 but here has type
@@ -422,15 +410,12 @@ Argument given: 'a
 
 
 Candidates:
-
  - System.String(value: char []) : System.String
 
  - System.String(value: nativeptr<char>) : System.String
 
  - System.String(value: nativeptr<sbyte>) : System.String
 
-
-
 neg20.fs(336,11,336,22): typecheck error FS0041: A unique overload for method 'Guid' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -440,13 +425,10 @@ Argument given: 'a
 
 
 Candidates:
-
  - System.Guid(b: byte []) : System.Guid
 
  - System.Guid(g: string) : System.Guid
 
-
-
 neg20.fs(355,19,355,38): typecheck error FS1124: Multiple types exist called 'OverloadedClassName', taking different numbers of generic parameters. Provide a type instantiation to disambiguate the type resolution, e.g. 'OverloadedClassName<_>'.
 
 neg20.fs(356,22,356,41): typecheck error FS1124: Multiple types exist called 'OverloadedClassName', taking different numbers of generic parameters. Provide a type instantiation to disambiguate the type resolution, e.g. 'OverloadedClassName<_>'.
diff --git a/tests/fsharp/typecheck/sigs/neg45.bsl b/tests/fsharp/typecheck/sigs/neg45.bsl
index d74a99b19a..a908230af7 100644
--- a/tests/fsharp/typecheck/sigs/neg45.bsl
+++ b/tests/fsharp/typecheck/sigs/neg45.bsl
@@ -62,13 +62,10 @@ Argument given: R1
 
 
 Candidates:
-
  - member D.M : 'a -> 'b
 
  - member D.M : 'a -> 'b
 
-
-
 neg45.fs(97,26,97,55): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -78,13 +75,10 @@ Argument given: (R1 * R1)
 
 
 Candidates:
-
  - member D.M : 'a -> 'b
 
  - member D.M : 'a -> 'b
 
-
-
 neg45.fs(104,26,104,31): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 
@@ -94,13 +88,10 @@ Argument given: int
 
 
 Candidates:
-
  - member D.M : 'a -> 'b
 
  - member D.M : 'a -> 'b
 
-
-
 neg45.fs(105,24,105,25): typecheck error FS0025: Incomplete pattern matches on this expression. For example, the value '0' may indicate a case not covered by the pattern(s).
 
 neg45.fs(113,53,113,54): typecheck error FS0040: This and other recursive references to the object(s) being defined will be checked for initialization-soundness at runtime through the use of a delayed reference. This is because you are defining one or more recursive objects, rather than recursive functions. This warning may be suppressed by using '#nowarn "40"' or '--nowarn:40'.
diff --git a/tests/fsharp/typecheck/sigs/neg61.bsl b/tests/fsharp/typecheck/sigs/neg61.bsl
index b513bb46a9..b8761ee8e5 100644
--- a/tests/fsharp/typecheck/sigs/neg61.bsl
+++ b/tests/fsharp/typecheck/sigs/neg61.bsl
@@ -83,17 +83,18 @@ neg61.fs(156,21,156,22): typecheck error FS3147: This 'let' definition may not b
 
 neg61.fs(171,13,171,18): typecheck error FS3099: 'sumBy' is used with an incorrect number of arguments. This is a custom operation in this query or computation expression. Expected 1 argument(s), but given 0.
 
-neg61.fs(174,22,174,23): typecheck error FS0041: No overloads match for method 'Source'. The available overloads are shown below.
-neg61.fs(174,22,174,23): typecheck error FS0041: Possible overload: 'member Linq.QueryBuilder.Source : source:System.Linq.IQueryable<'T> -> Linq.QuerySource<'T,'Q>'. Type constraint mismatch. The type 
-    'int'    
-is not compatible with type
-    'System.Linq.IQueryable<'a>'    
-.
-neg61.fs(174,22,174,23): typecheck error FS0041: Possible overload: 'member Linq.QueryBuilder.Source : source:System.Collections.Generic.IEnumerable<'T> -> Linq.QuerySource<'T,System.Collections.IEnumerable>'. Type constraint mismatch. The type 
-    'int'    
-is not compatible with type
-    'System.Collections.Generic.IEnumerable<'a>'    
-.
+neg61.fs(174,22,174,23): typecheck error FS0041: No overloads match for method 'Source'.
+
+
+
+Argument given: int
+
+
+
+Available overloads:
+ - member Linq.QueryBuilder.Source : source:System.Collections.Generic.IEnumerable<'T> -> Linq.QuerySource<'T,System.Collections.IEnumerable>
+
+ - member Linq.QueryBuilder.Source : source:System.Linq.IQueryable<'T> -> Linq.QuerySource<'T,'Q>
 
 neg61.fs(180,19,180,31): typecheck error FS3153: Arguments to query operators may require parentheses, e.g. 'where (x > y)' or 'groupBy (x.Length / 10)'
 

From f45a2180b9a2d4e932eed575023986419feadb85 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 08:05:32 -0700
Subject: [PATCH 37/96] adding one simple test with many overloads

---
 tests/fsharp/tests.fs                         |   2 +
 .../overloads/neg_many_many_overloads.bsl     | 684 ++++++++++++++++++
 .../overloads/neg_many_many_overloads.fsx     | 126 ++++
 3 files changed, 812 insertions(+)
 create mode 100644 tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
 create mode 100644 tests/fsharp/typecheck/overloads/neg_many_many_overloads.fsx

diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index 965e80dd56..30cf667227 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -2970,4 +2970,6 @@ module OverloadResolution =
     module ``error messages using BCL``=
         let [<Test>] ``neg_System.Convert.ToString.OverloadList``() = singleNegTest (testConfig "typecheck/overloads") "neg_System.Convert.ToString.OverloadList"
         let [<Test>] ``neg_System.Threading.Tasks.Task.Run.OverloadList``() = singleNegTest (testConfig "typecheck/overloads") "neg_System.Threading.Tasks.Task.Run.OverloadList"
+    module ``ad hoc code overload error messages``=
+        let [<Test>] ``neg_many_many_overloads`` () = singleNegTest (testConfig "typecheck/overloads") "neg_many_many_overloads"
 #endif
\ No newline at end of file
diff --git a/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl b/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
new file mode 100644
index 0000000000..ce51c4619e
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
@@ -0,0 +1,684 @@
+
+neg_many_many_overloads.fsx(123,1,123,13): typecheck error FS0041: A unique overload for method 'A' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Argument given: 'a when 'a : null
+
+
+
+Candidates:
+ - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime>
+
+ - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task>
+
+ - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal>
+
+ - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float>
+
+ - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32>
+
+ - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16>
+
+ - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32>
+
+ - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64>
+
+ - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8>
+
+ - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string>
+
+ - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16>
+
+ - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32>
+
+ - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64>
+
+ - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8>
+
+ - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime>
+
+ - static member Class.A : a:HashSet<Task> -> HashSet<Task>
+
+ - static member Class.A : a:HashSet<decimal> -> HashSet<decimal>
+
+ - static member Class.A : a:HashSet<float32> -> HashSet<float32>
+
+ - static member Class.A : a:HashSet<float> -> HashSet<float>
+
+ - static member Class.A : a:HashSet<int16> -> HashSet<int16>
+
+ - static member Class.A : a:HashSet<int32> -> HashSet<int32>
+
+ - static member Class.A : a:HashSet<int64> -> HashSet<int64>
+
+ - static member Class.A : a:HashSet<int8> -> HashSet<int8>
+
+ - static member Class.A : a:HashSet<string> -> HashSet<string>
+
+ - static member Class.A : a:HashSet<uint16> -> HashSet<uint16>
+
+ - static member Class.A : a:HashSet<uint32> -> HashSet<uint32>
+
+ - static member Class.A : a:HashSet<uint64> -> HashSet<uint64>
+
+ - static member Class.A : a:HashSet<uint8> -> HashSet<uint8>
+
+ - static member Class.A : a:List<DateTime> -> List<DateTime>
+
+ - static member Class.A : a:List<Task> -> List<Task>
+
+ - static member Class.A : a:List<decimal> -> List<decimal>
+
+ - static member Class.A : a:List<float32> -> List<float32>
+
+ - static member Class.A : a:List<float> -> List<float>
+
+ - static member Class.A : a:List<int16> -> List<int16>
+
+ - static member Class.A : a:List<int32> -> List<int32>
+
+ - static member Class.A : a:List<int64> -> List<int64>
+
+ - static member Class.A : a:List<int8> -> List<int8>
+
+ - static member Class.A : a:List<string> -> List<string>
+
+ - static member Class.A : a:List<uint16> -> List<uint16>
+
+ - static member Class.A : a:List<uint32> -> List<uint32>
+
+ - static member Class.A : a:List<uint64> -> List<uint64>
+
+ - static member Class.A : a:List<uint8> -> List<uint8>
+
+ - static member Class.A : a:Queue<DateTime> -> Queue<DateTime>
+
+ - static member Class.A : a:Queue<Task> -> Queue<Task>
+
+ - static member Class.A : a:Queue<decimal> -> Queue<decimal>
+
+ - static member Class.A : a:Queue<float32> -> Queue<float32>
+
+ - static member Class.A : a:Queue<float> -> Queue<float>
+
+ - static member Class.A : a:Queue<int16> -> Queue<int16>
+
+ - static member Class.A : a:Queue<int32> -> Queue<int32>
+
+ - static member Class.A : a:Queue<int64> -> Queue<int64>
+
+ - static member Class.A : a:Queue<int8> -> Queue<int8>
+
+ - static member Class.A : a:Queue<string> -> Queue<string>
+
+ - static member Class.A : a:Queue<uint16> -> Queue<uint16>
+
+ - static member Class.A : a:Queue<uint32> -> Queue<uint32>
+
+ - static member Class.A : a:Queue<uint64> -> Queue<uint64>
+
+ - static member Class.A : a:Queue<uint8> -> Queue<uint8>
+
+ - static member Class.A : a:Task -> Task
+
+ - static member Class.A : a:Task<DateTime> -> Task<DateTime>
+
+ - static member Class.A : a:Task<Task> -> Task<Task>
+
+ - static member Class.A : a:Task<decimal> -> Task<decimal>
+
+ - static member Class.A : a:Task<float32> -> Task<float32>
+
+ - static member Class.A : a:Task<float> -> Task<float>
+
+ - static member Class.A : a:Task<int16> -> Task<int16>
+
+ - static member Class.A : a:Task<int32> -> Task<int32>
+
+ - static member Class.A : a:Task<int64> -> Task<int64>
+
+ - static member Class.A : a:Task<int8> -> Task<int8>
+
+ - static member Class.A : a:Task<string> -> Task<string>
+
+ - static member Class.A : a:Task<uint16> -> Task<uint16>
+
+ - static member Class.A : a:Task<uint32> -> Task<uint32>
+
+ - static member Class.A : a:Task<uint64> -> Task<uint64>
+
+ - static member Class.A : a:Task<uint8> -> Task<uint8>
+
+ - static member Class.A : a:string -> string
+
+neg_many_many_overloads.fsx(124,1,124,34): typecheck error FS0041: No overloads match for method 'A'.
+
+
+
+Argument given: Type
+
+
+
+Available overloads:
+ - static member Class.A : a:DateTime -> DateTime
+
+ - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime>
+
+ - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task>
+
+ - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal>
+
+ - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float>
+
+ - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32>
+
+ - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16>
+
+ - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32>
+
+ - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64>
+
+ - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8>
+
+ - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string>
+
+ - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16>
+
+ - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32>
+
+ - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64>
+
+ - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8>
+
+ - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime>
+
+ - static member Class.A : a:HashSet<Task> -> HashSet<Task>
+
+ - static member Class.A : a:HashSet<decimal> -> HashSet<decimal>
+
+ - static member Class.A : a:HashSet<float32> -> HashSet<float32>
+
+ - static member Class.A : a:HashSet<float> -> HashSet<float>
+
+ - static member Class.A : a:HashSet<int16> -> HashSet<int16>
+
+ - static member Class.A : a:HashSet<int32> -> HashSet<int32>
+
+ - static member Class.A : a:HashSet<int64> -> HashSet<int64>
+
+ - static member Class.A : a:HashSet<int8> -> HashSet<int8>
+
+ - static member Class.A : a:HashSet<string> -> HashSet<string>
+
+ - static member Class.A : a:HashSet<uint16> -> HashSet<uint16>
+
+ - static member Class.A : a:HashSet<uint32> -> HashSet<uint32>
+
+ - static member Class.A : a:HashSet<uint64> -> HashSet<uint64>
+
+ - static member Class.A : a:HashSet<uint8> -> HashSet<uint8>
+
+ - static member Class.A : a:List<DateTime> -> List<DateTime>
+
+ - static member Class.A : a:List<Task> -> List<Task>
+
+ - static member Class.A : a:List<decimal> -> List<decimal>
+
+ - static member Class.A : a:List<float32> -> List<float32>
+
+ - static member Class.A : a:List<float> -> List<float>
+
+ - static member Class.A : a:List<int16> -> List<int16>
+
+ - static member Class.A : a:List<int32> -> List<int32>
+
+ - static member Class.A : a:List<int64> -> List<int64>
+
+ - static member Class.A : a:List<int8> -> List<int8>
+
+ - static member Class.A : a:List<string> -> List<string>
+
+ - static member Class.A : a:List<uint16> -> List<uint16>
+
+ - static member Class.A : a:List<uint32> -> List<uint32>
+
+ - static member Class.A : a:List<uint64> -> List<uint64>
+
+ - static member Class.A : a:List<uint8> -> List<uint8>
+
+ - static member Class.A : a:Queue<DateTime> -> Queue<DateTime>
+
+ - static member Class.A : a:Queue<Task> -> Queue<Task>
+
+ - static member Class.A : a:Queue<decimal> -> Queue<decimal>
+
+ - static member Class.A : a:Queue<float32> -> Queue<float32>
+
+ - static member Class.A : a:Queue<float> -> Queue<float>
+
+ - static member Class.A : a:Queue<int16> -> Queue<int16>
+
+ - static member Class.A : a:Queue<int32> -> Queue<int32>
+
+ - static member Class.A : a:Queue<int64> -> Queue<int64>
+
+ - static member Class.A : a:Queue<int8> -> Queue<int8>
+
+ - static member Class.A : a:Queue<string> -> Queue<string>
+
+ - static member Class.A : a:Queue<uint16> -> Queue<uint16>
+
+ - static member Class.A : a:Queue<uint32> -> Queue<uint32>
+
+ - static member Class.A : a:Queue<uint64> -> Queue<uint64>
+
+ - static member Class.A : a:Queue<uint8> -> Queue<uint8>
+
+ - static member Class.A : a:Task -> Task
+
+ - static member Class.A : a:Task<DateTime> -> Task<DateTime>
+
+ - static member Class.A : a:Task<Task> -> Task<Task>
+
+ - static member Class.A : a:Task<decimal> -> Task<decimal>
+
+ - static member Class.A : a:Task<float32> -> Task<float32>
+
+ - static member Class.A : a:Task<float> -> Task<float>
+
+ - static member Class.A : a:Task<int16> -> Task<int16>
+
+ - static member Class.A : a:Task<int32> -> Task<int32>
+
+ - static member Class.A : a:Task<int64> -> Task<int64>
+
+ - static member Class.A : a:Task<int8> -> Task<int8>
+
+ - static member Class.A : a:Task<string> -> Task<string>
+
+ - static member Class.A : a:Task<uint16> -> Task<uint16>
+
+ - static member Class.A : a:Task<uint32> -> Task<uint32>
+
+ - static member Class.A : a:Task<uint64> -> Task<uint64>
+
+ - static member Class.A : a:Task<uint8> -> Task<uint8>
+
+ - static member Class.A : a:decimal -> decimal
+
+ - static member Class.A : a:float -> float
+
+ - static member Class.A : a:float32 -> float32
+
+ - static member Class.A : a:int16 -> int16
+
+ - static member Class.A : a:int32 -> int32
+
+ - static member Class.A : a:int64 -> int64
+
+ - static member Class.A : a:int8 -> int8
+
+ - static member Class.A : a:string -> string
+
+ - static member Class.A : a:uint16 -> uint16
+
+ - static member Class.A : a:uint32 -> uint32
+
+ - static member Class.A : a:uint64 -> uint64
+
+ - static member Class.A : a:uint8 -> uint8
+
+neg_many_many_overloads.fsx(125,1,125,25): typecheck error FS0041: No overloads match for method 'A'.
+
+
+
+Argument given: Guid
+
+
+
+Available overloads:
+ - static member Class.A : a:DateTime -> DateTime
+
+ - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime>
+
+ - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task>
+
+ - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal>
+
+ - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float>
+
+ - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32>
+
+ - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16>
+
+ - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32>
+
+ - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64>
+
+ - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8>
+
+ - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string>
+
+ - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16>
+
+ - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32>
+
+ - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64>
+
+ - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8>
+
+ - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime>
+
+ - static member Class.A : a:HashSet<Task> -> HashSet<Task>
+
+ - static member Class.A : a:HashSet<decimal> -> HashSet<decimal>
+
+ - static member Class.A : a:HashSet<float32> -> HashSet<float32>
+
+ - static member Class.A : a:HashSet<float> -> HashSet<float>
+
+ - static member Class.A : a:HashSet<int16> -> HashSet<int16>
+
+ - static member Class.A : a:HashSet<int32> -> HashSet<int32>
+
+ - static member Class.A : a:HashSet<int64> -> HashSet<int64>
+
+ - static member Class.A : a:HashSet<int8> -> HashSet<int8>
+
+ - static member Class.A : a:HashSet<string> -> HashSet<string>
+
+ - static member Class.A : a:HashSet<uint16> -> HashSet<uint16>
+
+ - static member Class.A : a:HashSet<uint32> -> HashSet<uint32>
+
+ - static member Class.A : a:HashSet<uint64> -> HashSet<uint64>
+
+ - static member Class.A : a:HashSet<uint8> -> HashSet<uint8>
+
+ - static member Class.A : a:List<DateTime> -> List<DateTime>
+
+ - static member Class.A : a:List<Task> -> List<Task>
+
+ - static member Class.A : a:List<decimal> -> List<decimal>
+
+ - static member Class.A : a:List<float32> -> List<float32>
+
+ - static member Class.A : a:List<float> -> List<float>
+
+ - static member Class.A : a:List<int16> -> List<int16>
+
+ - static member Class.A : a:List<int32> -> List<int32>
+
+ - static member Class.A : a:List<int64> -> List<int64>
+
+ - static member Class.A : a:List<int8> -> List<int8>
+
+ - static member Class.A : a:List<string> -> List<string>
+
+ - static member Class.A : a:List<uint16> -> List<uint16>
+
+ - static member Class.A : a:List<uint32> -> List<uint32>
+
+ - static member Class.A : a:List<uint64> -> List<uint64>
+
+ - static member Class.A : a:List<uint8> -> List<uint8>
+
+ - static member Class.A : a:Queue<DateTime> -> Queue<DateTime>
+
+ - static member Class.A : a:Queue<Task> -> Queue<Task>
+
+ - static member Class.A : a:Queue<decimal> -> Queue<decimal>
+
+ - static member Class.A : a:Queue<float32> -> Queue<float32>
+
+ - static member Class.A : a:Queue<float> -> Queue<float>
+
+ - static member Class.A : a:Queue<int16> -> Queue<int16>
+
+ - static member Class.A : a:Queue<int32> -> Queue<int32>
+
+ - static member Class.A : a:Queue<int64> -> Queue<int64>
+
+ - static member Class.A : a:Queue<int8> -> Queue<int8>
+
+ - static member Class.A : a:Queue<string> -> Queue<string>
+
+ - static member Class.A : a:Queue<uint16> -> Queue<uint16>
+
+ - static member Class.A : a:Queue<uint32> -> Queue<uint32>
+
+ - static member Class.A : a:Queue<uint64> -> Queue<uint64>
+
+ - static member Class.A : a:Queue<uint8> -> Queue<uint8>
+
+ - static member Class.A : a:Task -> Task
+
+ - static member Class.A : a:Task<DateTime> -> Task<DateTime>
+
+ - static member Class.A : a:Task<Task> -> Task<Task>
+
+ - static member Class.A : a:Task<decimal> -> Task<decimal>
+
+ - static member Class.A : a:Task<float32> -> Task<float32>
+
+ - static member Class.A : a:Task<float> -> Task<float>
+
+ - static member Class.A : a:Task<int16> -> Task<int16>
+
+ - static member Class.A : a:Task<int32> -> Task<int32>
+
+ - static member Class.A : a:Task<int64> -> Task<int64>
+
+ - static member Class.A : a:Task<int8> -> Task<int8>
+
+ - static member Class.A : a:Task<string> -> Task<string>
+
+ - static member Class.A : a:Task<uint16> -> Task<uint16>
+
+ - static member Class.A : a:Task<uint32> -> Task<uint32>
+
+ - static member Class.A : a:Task<uint64> -> Task<uint64>
+
+ - static member Class.A : a:Task<uint8> -> Task<uint8>
+
+ - static member Class.A : a:decimal -> decimal
+
+ - static member Class.A : a:float -> float
+
+ - static member Class.A : a:float32 -> float32
+
+ - static member Class.A : a:int16 -> int16
+
+ - static member Class.A : a:int32 -> int32
+
+ - static member Class.A : a:int64 -> int64
+
+ - static member Class.A : a:int8 -> int8
+
+ - static member Class.A : a:string -> string
+
+ - static member Class.A : a:uint16 -> uint16
+
+ - static member Class.A : a:uint32 -> uint32
+
+ - static member Class.A : a:uint64 -> uint64
+
+ - static member Class.A : a:uint8 -> uint8
+
+neg_many_many_overloads.fsx(126,1,126,48): typecheck error FS0041: No overloads match for method 'A'.
+
+
+
+Argument given: DayOfWeek
+
+
+
+Available overloads:
+ - static member Class.A : a:DateTime -> DateTime
+
+ - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime>
+
+ - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task>
+
+ - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal>
+
+ - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float>
+
+ - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32>
+
+ - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16>
+
+ - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32>
+
+ - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64>
+
+ - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8>
+
+ - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string>
+
+ - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16>
+
+ - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32>
+
+ - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64>
+
+ - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8>
+
+ - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime>
+
+ - static member Class.A : a:HashSet<Task> -> HashSet<Task>
+
+ - static member Class.A : a:HashSet<decimal> -> HashSet<decimal>
+
+ - static member Class.A : a:HashSet<float32> -> HashSet<float32>
+
+ - static member Class.A : a:HashSet<float> -> HashSet<float>
+
+ - static member Class.A : a:HashSet<int16> -> HashSet<int16>
+
+ - static member Class.A : a:HashSet<int32> -> HashSet<int32>
+
+ - static member Class.A : a:HashSet<int64> -> HashSet<int64>
+
+ - static member Class.A : a:HashSet<int8> -> HashSet<int8>
+
+ - static member Class.A : a:HashSet<string> -> HashSet<string>
+
+ - static member Class.A : a:HashSet<uint16> -> HashSet<uint16>
+
+ - static member Class.A : a:HashSet<uint32> -> HashSet<uint32>
+
+ - static member Class.A : a:HashSet<uint64> -> HashSet<uint64>
+
+ - static member Class.A : a:HashSet<uint8> -> HashSet<uint8>
+
+ - static member Class.A : a:List<DateTime> -> List<DateTime>
+
+ - static member Class.A : a:List<Task> -> List<Task>
+
+ - static member Class.A : a:List<decimal> -> List<decimal>
+
+ - static member Class.A : a:List<float32> -> List<float32>
+
+ - static member Class.A : a:List<float> -> List<float>
+
+ - static member Class.A : a:List<int16> -> List<int16>
+
+ - static member Class.A : a:List<int32> -> List<int32>
+
+ - static member Class.A : a:List<int64> -> List<int64>
+
+ - static member Class.A : a:List<int8> -> List<int8>
+
+ - static member Class.A : a:List<string> -> List<string>
+
+ - static member Class.A : a:List<uint16> -> List<uint16>
+
+ - static member Class.A : a:List<uint32> -> List<uint32>
+
+ - static member Class.A : a:List<uint64> -> List<uint64>
+
+ - static member Class.A : a:List<uint8> -> List<uint8>
+
+ - static member Class.A : a:Queue<DateTime> -> Queue<DateTime>
+
+ - static member Class.A : a:Queue<Task> -> Queue<Task>
+
+ - static member Class.A : a:Queue<decimal> -> Queue<decimal>
+
+ - static member Class.A : a:Queue<float32> -> Queue<float32>
+
+ - static member Class.A : a:Queue<float> -> Queue<float>
+
+ - static member Class.A : a:Queue<int16> -> Queue<int16>
+
+ - static member Class.A : a:Queue<int32> -> Queue<int32>
+
+ - static member Class.A : a:Queue<int64> -> Queue<int64>
+
+ - static member Class.A : a:Queue<int8> -> Queue<int8>
+
+ - static member Class.A : a:Queue<string> -> Queue<string>
+
+ - static member Class.A : a:Queue<uint16> -> Queue<uint16>
+
+ - static member Class.A : a:Queue<uint32> -> Queue<uint32>
+
+ - static member Class.A : a:Queue<uint64> -> Queue<uint64>
+
+ - static member Class.A : a:Queue<uint8> -> Queue<uint8>
+
+ - static member Class.A : a:Task -> Task
+
+ - static member Class.A : a:Task<DateTime> -> Task<DateTime>
+
+ - static member Class.A : a:Task<Task> -> Task<Task>
+
+ - static member Class.A : a:Task<decimal> -> Task<decimal>
+
+ - static member Class.A : a:Task<float32> -> Task<float32>
+
+ - static member Class.A : a:Task<float> -> Task<float>
+
+ - static member Class.A : a:Task<int16> -> Task<int16>
+
+ - static member Class.A : a:Task<int32> -> Task<int32>
+
+ - static member Class.A : a:Task<int64> -> Task<int64>
+
+ - static member Class.A : a:Task<int8> -> Task<int8>
+
+ - static member Class.A : a:Task<string> -> Task<string>
+
+ - static member Class.A : a:Task<uint16> -> Task<uint16>
+
+ - static member Class.A : a:Task<uint32> -> Task<uint32>
+
+ - static member Class.A : a:Task<uint64> -> Task<uint64>
+
+ - static member Class.A : a:Task<uint8> -> Task<uint8>
+
+ - static member Class.A : a:decimal -> decimal
+
+ - static member Class.A : a:float -> float
+
+ - static member Class.A : a:float32 -> float32
+
+ - static member Class.A : a:int16 -> int16
+
+ - static member Class.A : a:int32 -> int32
+
+ - static member Class.A : a:int64 -> int64
+
+ - static member Class.A : a:int8 -> int8
+
+ - static member Class.A : a:string -> string
+
+ - static member Class.A : a:uint16 -> uint16
+
+ - static member Class.A : a:uint32 -> uint32
+
+ - static member Class.A : a:uint64 -> uint64
+
+ - static member Class.A : a:uint8 -> uint8
diff --git a/tests/fsharp/typecheck/overloads/neg_many_many_overloads.fsx b/tests/fsharp/typecheck/overloads/neg_many_many_overloads.fsx
new file mode 100644
index 0000000000..9a32383821
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_many_many_overloads.fsx
@@ -0,0 +1,126 @@
+(**)
+let types0 = [
+    "int8"
+    "int16"
+    "int32"
+    "int64"
+    "uint8"
+    "uint16"
+    "uint32"
+    "uint64"
+    "string"
+    "decimal"
+    "float"
+    "float32"
+    "DateTime"
+    "Task"
+    
+]
+
+let types = [
+  yield! types0
+  for t in types0 do
+    yield sprintf "Task<%s>" t
+    yield sprintf "Dictionary<%s,%s>" t t
+    yield sprintf "HashSet<%s>" t
+    yield sprintf "List<%s>" t
+    yield sprintf "Queue<%s>" t
+]
+
+let generate () =
+  [ for t in types -> sprintf "    static member A (a:%s) = a" t ]
+  |> String.concat "\n"
+printfn "%s" (generate ())
+(**)
+open System
+open System.Collections.Generic
+open System.Threading.Tasks
+type Class() =
+    static member A (a:int8) = a
+    static member A (a:int16) = a
+    static member A (a:int32) = a
+    static member A (a:int64) = a
+    static member A (a:uint8) = a
+    static member A (a:uint16) = a
+    static member A (a:uint32) = a
+    static member A (a:uint64) = a
+    static member A (a:string) = a
+    static member A (a:decimal) = a
+    static member A (a:float) = a
+    static member A (a:float32) = a
+    static member A (a:DateTime) = a
+    static member A (a:Task) = a
+    static member A (a:Task<int8>) = a
+    static member A (a:Dictionary<int8,int8>) = a
+    static member A (a:HashSet<int8>) = a
+    static member A (a:List<int8>) = a
+    static member A (a:Queue<int8>) = a
+    static member A (a:Task<int16>) = a
+    static member A (a:Dictionary<int16,int16>) = a
+    static member A (a:HashSet<int16>) = a
+    static member A (a:List<int16>) = a
+    static member A (a:Queue<int16>) = a
+    static member A (a:Task<int32>) = a
+    static member A (a:Dictionary<int32,int32>) = a
+    static member A (a:HashSet<int32>) = a
+    static member A (a:List<int32>) = a
+    static member A (a:Queue<int32>) = a
+    static member A (a:Task<int64>) = a
+    static member A (a:Dictionary<int64,int64>) = a
+    static member A (a:HashSet<int64>) = a
+    static member A (a:List<int64>) = a
+    static member A (a:Queue<int64>) = a
+    static member A (a:Task<uint8>) = a
+    static member A (a:Dictionary<uint8,uint8>) = a
+    static member A (a:HashSet<uint8>) = a
+    static member A (a:List<uint8>) = a
+    static member A (a:Queue<uint8>) = a
+    static member A (a:Task<uint16>) = a
+    static member A (a:Dictionary<uint16,uint16>) = a
+    static member A (a:HashSet<uint16>) = a
+    static member A (a:List<uint16>) = a
+    static member A (a:Queue<uint16>) = a
+    static member A (a:Task<uint32>) = a
+    static member A (a:Dictionary<uint32,uint32>) = a
+    static member A (a:HashSet<uint32>) = a
+    static member A (a:List<uint32>) = a
+    static member A (a:Queue<uint32>) = a
+    static member A (a:Task<uint64>) = a
+    static member A (a:Dictionary<uint64,uint64>) = a
+    static member A (a:HashSet<uint64>) = a
+    static member A (a:List<uint64>) = a
+    static member A (a:Queue<uint64>) = a
+    static member A (a:Task<string>) = a
+    static member A (a:Dictionary<string,string>) = a
+    static member A (a:HashSet<string>) = a
+    static member A (a:List<string>) = a
+    static member A (a:Queue<string>) = a
+    static member A (a:Task<decimal>) = a
+    static member A (a:Dictionary<decimal,decimal>) = a
+    static member A (a:HashSet<decimal>) = a
+    static member A (a:List<decimal>) = a
+    static member A (a:Queue<decimal>) = a
+    static member A (a:Task<float>) = a
+    static member A (a:Dictionary<float,float>) = a
+    static member A (a:HashSet<float>) = a
+    static member A (a:List<float>) = a
+    static member A (a:Queue<float>) = a
+    static member A (a:Task<float32>) = a
+    static member A (a:Dictionary<float32,float32>) = a
+    static member A (a:HashSet<float32>) = a
+    static member A (a:List<float32>) = a
+    static member A (a:Queue<float32>) = a
+    static member A (a:Task<DateTime>) = a
+    static member A (a:Dictionary<DateTime,DateTime>) = a
+    static member A (a:HashSet<DateTime>) = a
+    static member A (a:List<DateTime>) = a
+    static member A (a:Queue<DateTime>) = a
+    static member A (a:Task<Task>) = a
+    static member A (a:Dictionary<Task,Task>) = a
+    static member A (a:HashSet<Task>) = a
+    static member A (a:List<Task>) = a
+    static member A (a:Queue<Task>) = a
+Class.A null // does filter only reference type
+Class.A typedefof<ResizeArray<_>>
+Class.A (Guid.NewGuid())
+Class.A (Unchecked.defaultof<System.DayOfWeek>)

From ce65f30054bb0be9dc1d66e53c366774bf433d45 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 08:19:25 -0700
Subject: [PATCH 38/96] appropriate /// comments on `CalledMeth` constructor
 arguments

---
 src/fsharp/MethodCalls.fs | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 0917092287..55a561d6a1 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -318,18 +318,31 @@ type CalledMeth<'T>
       (infoReader: InfoReader,
        nameEnv: NameResolutionEnv option,
        isCheckingAttributeCall,
-       freshenMethInfo,             // a function to help generate fresh type variables the property setters methods in generic classes 
-       m,                           // range                           
-       ad,                          // the access domain of the place where the call is taking place
-       minfo: MethInfo,             // the method we're attempting to call 
-       calledTyArgs,                // the 'called type arguments', i.e. the fresh generic instantiation of the method we're attempting to call 
-       callerTyArgs: TType list,    // the 'caller type arguments', i.e. user-given generic instantiation of the method we're attempting to call 
-       pinfoOpt: PropInfo option,   // the property related to the method we're attempting to call, if any  
-       callerObjArgTys: TType list, // the types of the actual object argument, if any 
-       callerArgs: CallerArgs<'T>,  // the data about any arguments supplied by the caller 
-       allowParamArgs: bool,        // do we allow the use of a param args method in its "expanded" form?
-       allowOutAndOptArgs: bool,    // do we allow the use of the transformation that converts out arguments as tuple returns?
-       tyargsOpt : TType option)    // method parameters
+       /// a function to help generate fresh type variables the property setters methods in generic classes
+       freshenMethInfo,
+       /// range
+       m,
+       /// the access domain of the place where the call is taking place
+       ad,
+       /// the method we're attempting to call
+       minfo: MethInfo,
+       /// the 'called type arguments', i.e. the fresh generic instantiation of the method we're attempting to call
+       calledTyArgs,
+       /// the 'caller type arguments', i.e. user-given generic instantiation of the method we're attempting to call
+       // todo: consider CallerTypeArgs record
+       callerTyArgs: TType list,
+       /// the property related to the method we're attempting to call, if any
+       pinfoOpt: PropInfo option,
+       /// the types of the actual object argument, if any
+       callerObjArgTys: TType list,
+       /// the 'caller method arguments', i.e. a list of user-given parameter expressions, split between unnamed and named arguments
+       callerArgs: CallerArgs<'T>,
+       /// do we allow the use of a param args method in its "expanded" form?
+       allowParamArgs: bool,
+       /// do we allow the use of the transformation that converts out arguments as tuple returns?
+       allowOutAndOptArgs: bool,
+       /// method parameters
+       tyargsOpt : TType option)    
     =
     let g = infoReader.g
     let methodRetTy = minfo.GetFSharpReturnTy(infoReader.amap, m, calledTyArgs)

From 372a375c5318dd1935fa5771211451cb08e38b42 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 08:24:25 -0700
Subject: [PATCH 39/96] minimize diff / formatting

---
 src/fsharp/MethodCalls.fs                      |  2 +-
 .../Tests.LanguageService.ErrorList.fs         | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 55a561d6a1..d6ed6cdd69 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -349,7 +349,7 @@ type CalledMeth<'T>
 
     let fullCurriedCalledArgs = MakeCalledArgs infoReader.amap m minfo calledTyArgs
     do assert (fullCurriedCalledArgs.Length = fullCurriedCalledArgs.Length)
-    
+
     let argSetInfos = 
         (callerArgs.CurriedCallerArgs, fullCurriedCalledArgs) 
         ||> List.map2 (fun (unnamedCallerArgs, namedCallerArgs) fullCalledArgs -> 
diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
index 0d1610504b..a90387f461 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
@@ -207,15 +207,13 @@ let g (t : T) = t.Count()
         X(1.0)
         """
 
-        let expectedMessages =
-            [ """No overloads match for method 'X'.
+        let expectedMessages = [ """No overloads match for method 'X'.
 
 Argument given: float
 
 Available overloads:
  - new : bool -> X
- - new : int -> X""" 
-            ]
+ - new : int -> X""" ]
 
         CheckErrorList content (assertExpectedErrorMessages expectedMessages)
             
@@ -294,8 +292,7 @@ let x =
         let content = """
         System.Console.WriteLine(null)
         """
-        let expectedMessages = [
-"""A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed.
+        let expectedMessages = [ """A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 Argument given: 'a when 'a : null
 
@@ -303,8 +300,7 @@ Candidates:
  - System.Console.WriteLine(buffer: char []) : unit
  - System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit
  - System.Console.WriteLine(value: obj) : unit
- - System.Console.WriteLine(value: string) : unit"""
-        ]
+ - System.Console.WriteLine(value: string) : unit""" ]
         CheckErrorList content (assertExpectedErrorMessages expectedMessages)
 
     [<Test>]
@@ -319,8 +315,7 @@ type B() =
 let b = B()
 b.Do(1, 1)
         """
-        let expectedMessages = [
-"""A unique overload for method 'Do' could not be determined based on type information prior to this program point. A type annotation may be needed.
+        let expectedMessages = [ """A unique overload for method 'Do' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
 Arguments given:
  - int
@@ -328,8 +323,7 @@ Arguments given:
 
 Candidates:
  - member A.Do : a:int * b:'T -> unit
- - member A.Do : a:int * b:int -> unit"""        
-        ]
+ - member A.Do : a:int * b:int -> unit""" ]
         CheckErrorList content (assertExpectedErrorMessages expectedMessages)
 
     [<Test; Category("Expensive")>]

From db26509dc979ab65d59a7ff3485da98158c89aaa Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 12:52:45 -0700
Subject: [PATCH 40/96] trim unused code

---
 src/fsharp/CompileOps.fs        | 2 --
 src/fsharp/ConstraintSolver.fs  | 2 --
 src/fsharp/ConstraintSolver.fsi | 1 -
 3 files changed, 5 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 373a47c318..dd9b07a44b 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -188,7 +188,6 @@ let GetRangeOfDiagnostic(err: PhasedDiagnostic) =
       | NameClash(_, _, _, m, _, _, _) 
       | UnresolvedOverloading(_, _, _, m) 
       | UnresolvedConversionOperator (_, _, _, m)
-      | PossibleOverload(_, _, m) 
       | VirtualAugmentationOnNullValuedType m
       | NonVirtualAugmentationOnNullValuedType m
       | NonRigidTypar(_, _, _, _, _, m)
@@ -449,7 +448,6 @@ let ErrorFromApplyingDefault2E() = DeclareResourceString("ErrorFromApplyingDefau
 let ErrorsFromAddingSubsumptionConstraintE() = DeclareResourceString("ErrorsFromAddingSubsumptionConstraint", "%s%s%s")
 let UpperCaseIdentifierInPatternE() = DeclareResourceString("UpperCaseIdentifierInPattern", "")
 let NotUpperCaseConstructorE() = DeclareResourceString("NotUpperCaseConstructor", "")
-let PossibleOverloadE() = DeclareResourceString("PossibleOverload", "%s%s")
 let FunctionExpectedE() = DeclareResourceString("FunctionExpected", "")
 let BakedInMemberConstraintNameE() = DeclareResourceString("BakedInMemberConstraintName", "%s")
 let BadEventTransformationE() = DeclareResourceString("BadEventTransformation", "")
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 46980eb858..73f6c2ebb7 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -43,7 +43,6 @@
 module internal FSharp.Compiler.ConstraintSolver
 
 open Internal.Utilities.Collections
-open Internal.Utilities.StructuredFormat
 
 open FSharp.Compiler 
 open FSharp.Compiler.AbstractIL 
@@ -215,7 +214,6 @@ exception ErrorFromAddingTypeEquation of tcGlobals: TcGlobals * displayEnv: Disp
 
 exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * ContextInfo * range
 exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn * range
-exception PossibleOverload                      of displayEnv: DisplayEnv * overload: OverloadInformation * range
 exception UnresolvedOverloading                 of displayEnv: DisplayEnv * callerArgs: CallerArgs<Expr> * failure: OverloadResolutionFailure * range
 exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
 
diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 55df7287a1..7babf283e0 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -118,7 +118,6 @@ exception ErrorFromAddingTypeEquation           of tcGlobals: TcGlobals * displa
 exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * ContextInfo * range
 exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn * range
 exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
-exception PossibleOverload                      of displayEnv: DisplayEnv * overload: OverloadInformation * range
 exception UnresolvedOverloading                 of displayEnv: DisplayEnv * callerArgs: CallerArgs<Expr> * failure: OverloadResolutionFailure * range
 exception NonRigidTypar                         of displayEnv: DisplayEnv * string option * range * TType * TType * range
 

From 46174af114ad3ff650812c7fa4322285b5f0d4e1 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Thu, 2 May 2019 22:03:35 -0700
Subject: [PATCH 41/96] add simple test, one message is interesting, mentioning
 parameter count for possible overloads

---
 tests/fsharp/tests.fs                         |  1 +
 .../overloads/neg_interface_generics.bsl      | 18 ++++++++++++++++
 .../overloads/neg_interface_generics.fsx      | 21 +++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
 create mode 100644 tests/fsharp/typecheck/overloads/neg_interface_generics.fsx

diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index 30cf667227..4dea13d9ce 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -2972,4 +2972,5 @@ module OverloadResolution =
         let [<Test>] ``neg_System.Threading.Tasks.Task.Run.OverloadList``() = singleNegTest (testConfig "typecheck/overloads") "neg_System.Threading.Tasks.Task.Run.OverloadList"
     module ``ad hoc code overload error messages``=
         let [<Test>] ``neg_many_many_overloads`` () = singleNegTest (testConfig "typecheck/overloads") "neg_many_many_overloads"
+        let [<Test>] ``neg_interface_generics`` () = singleNegTest (testConfig "typecheck/overloads") "neg_interface_generics"
 #endif
\ No newline at end of file
diff --git a/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl b/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
new file mode 100644
index 0000000000..cba40e8308
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
@@ -0,0 +1,18 @@
+
+neg_interface_generics.fsx(14,1,18,2): typecheck error FS0505: The member or object constructor 'Foo' does not take 13073 argument(s). An overload was found taking 1 arguments.
+
+neg_interface_generics.fsx(20,9,20,27): typecheck error FS0041: No overloads match for method 'Foo'.
+
+
+
+Arguments given:
+ - string
+
+ - XmlReader
+
+
+
+Available overloads:
+ - abstract member IFoo.Foo : t:Type * r:TextReader -> obj * 't
+
+ - abstract member IFoo.Foo : t:string * r:TextReader -> obj * 't
diff --git a/tests/fsharp/typecheck/overloads/neg_interface_generics.fsx b/tests/fsharp/typecheck/overloads/neg_interface_generics.fsx
new file mode 100644
index 0000000000..694b2de923
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_interface_generics.fsx
@@ -0,0 +1,21 @@
+open System
+open System.Xml
+open System.IO
+type IFoo =
+  abstract member Foo : t:string * r:XmlReader -> obj
+  abstract member Foo : t:Type * r:TextReader -> obj
+  abstract member Foo<'t> : t:string * r:TextReader -> obj * 't
+  abstract member Foo<'t> : t:Type * r:TextReader -> obj * 't
+  abstract member Foo<'t when 't : struct> : TextReader -> 't
+  abstract member Foo<'t when 't :> IDisposable > : XmlReader -> 't
+
+let foo = Unchecked.defaultof<IFoo>
+let r = Unchecked.defaultof<XmlReader>
+foo.Foo<_>(r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r
+,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r
+,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r
+,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r
+)
+let a = foo.Foo( "", r)
+let b = foo.Foo<_>( "", r)
+

From c2120f65f8c22a5aaebcac357e4ebeb6a0b6f59e Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Fri, 3 May 2019 00:14:34 -0700
Subject: [PATCH 42/96] comment flaky test for now

---
 tests/fsharpqa/Source/Optimizations/Inlining/env.lst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fsharpqa/Source/Optimizations/Inlining/env.lst b/tests/fsharpqa/Source/Optimizations/Inlining/env.lst
index 9c95c7c654..8d8d11c5d5 100644
--- a/tests/fsharpqa/Source/Optimizations/Inlining/env.lst
+++ b/tests/fsharpqa/Source/Optimizations/Inlining/env.lst
@@ -1,3 +1,3 @@
-NoMT	SOURCE=Match01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match01.dll"	# Match01.fs
+#NoMT	SOURCE=Match01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match01.dll"	# Match01.fs
 NoMT	SOURCE=Match02.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match02.dll"	# Match02.fs
 NoMT	SOURCE=StructUnion01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd StructUnion01.dll"	# StructUnion01.fs

From ec6089c9fbefd10baaeebee7b9ab968b2c4e7c19 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.segay@gmail.com>
Date: Wed, 8 May 2019 01:42:16 -0700
Subject: [PATCH 43/96] code review on the `coerceExpr` function from @tihan,
 we can discard first `isOutArg` argument as the only hardcoded usage was
 guarded by `error` when the value is true, and passing an explicit false
 which is now guaranteed equivalent to `callerArg.IsOptional`

---
 src/fsharp/MethodCalls.fs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index d6ed6cdd69..3b983da81c 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -114,7 +114,7 @@ type CallerNamedArg<'T> =
     member x.CallerArg = (let (CallerNamedArg(_, a)) = x in a)
 
 /// Represents the list of unnamed / named arguments at method call site
-// todo: figure out / document why we are using list²
+// todo: figure out / document why we are using list²
 [<Struct>]
 type CallerArgs<'T> = 
     { Unnamed: CallerArg<'T> list list
@@ -1006,7 +1006,10 @@ let CoerceFromFSharpFuncToDelegate g amap infoReader ad callerArgTy m callerArgE
 
 // Handle adhoc argument conversions
 let AdjustCallerArgExprForCoercions (g: TcGlobals) amap infoReader ad isOutArg calledArgTy (reflArgInfo: ReflectedArgInfo) callerArgTy m callerArgExpr = 
-
+   // todo after rebase:
+   // code review on the `coerceExpr` function from @tihan, we can discard first `isOutArg` argument as the only
+   // hardcoded usage was guarded by `error` when the value is true, and passing an explicit false which is now
+   // guaranteed equivalent to `callerArg.IsOptional`
    if isByrefTy g calledArgTy && isRefCellTy g callerArgTy then 
        None, Expr.Op (TOp.RefAddrGet false, [destRefCellTy g callerArgTy], [callerArgExpr], m) 
 

From 4f51ad4828ee5ae962a2614360f5bf15bc70560e Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Mon, 13 May 2019 20:09:53 -0700
Subject: [PATCH 44/96] code formatting remarks on ConstraintSolver.fs/fsi

---
 src/fsharp/ConstraintSolver.fs  | 34 ++++++++++++++++-----------------
 src/fsharp/ConstraintSolver.fsi | 12 ++++++------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 73f6c2ebb7..1daea795d6 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -184,12 +184,12 @@ type ContextInfo =
 
 /// Captures relevant information for a particular failed overload resolution.
 [<Struct>]
-type OverloadInformation = {
-  methodSlot: CalledMeth<Expr>
-  amap : ImportMap
-  error: exn
-}
-with
+type OverloadInformation = 
+    {
+        methodSlot: CalledMeth<Expr>
+        amap : ImportMap
+        error: exn
+    }
     member x.OverloadMethodInfo displayEnv m = NicePrint.stringOfMethInfo x.amap m displayEnv x.methodSlot.Method
 
 /// Cases for overload resolution failure that exists in the implementation of the compiler.
@@ -2730,21 +2730,21 @@ and ResolveOverloading
                 | [(calledMeth, warns, t)] -> Some calledMeth, OkResult (warns, ()), WithTrace t
                 | bestMethods -> 
                     let methods = 
-                        let getMethodSlotsAndErrors =
-                          function | methodSlot, []      -> List.singleton {methodSlot = methodSlot; error = Unchecked.defaultof<exn>; amap = amap}
-                                   | methodSlot, [error] -> List.singleton {methodSlot = methodSlot; error = error; amap = amap}
-                                   | methodSlot, errors  -> errors |> List.map (fun error -> {methodSlot = methodSlot; error = error; amap = amap})
-                                   // not totally sure about what's going on with last case, so making cartesian product in case we have several exceptions
+                        let getMethodSlotsAndErrors methodSlot errors =
+                            [ match errors with
+                              | [] -> yield { methodSlot = methodSlot; error = Unchecked.defaultof<exn>; amap = amap }
+                              | errors -> for error in errors do yield { methodSlot = methodSlot; error = error; amap = amap } ]
+
 
                         // use the most precise set
                         // - if after filtering bestMethods still contains something - use it
                         // - otherwise use applicableMeths or initial set of candidate methods
-                        match bestMethods with
-                        | [] -> 
-                            match applicableMeths with
-                            | [] -> candidates |> List.map (fun methodSlot -> getMethodSlotsAndErrors (methodSlot, []))
-                            | m -> m |> List.map (fun (methodSlot, errors, _) -> getMethodSlotsAndErrors (methodSlot,errors))
-                        | m -> m |> List.map (fun (methodSlot, errors, _) -> getMethodSlotsAndErrors (methodSlot,errors))
+                        [ match bestMethods with
+                          | [] -> 
+                              match applicableMeths with
+                              | [] -> for methodSlot in candidates do yield getMethodSlotsAndErrors methodSlot []
+                              | m -> for (methodSlot, errors, _) in m do yield getMethodSlotsAndErrors methodSlot errors
+                          | m -> for (methodSlot, errors, _) in m do yield getMethodSlotsAndErrors methodSlot errors ]
 
                     let methods = List.concat methods
 
diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 7babf283e0..2bca519f68 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -92,12 +92,12 @@ type ContextInfo =
 
 /// Captures relevant information for a particular failed overload resolution.
 [<Struct>]
-type OverloadInformation = {
-  methodSlot: CalledMeth<Expr>
-  amap : ImportMap
-  error: exn
-}
-with
+type OverloadInformation = 
+    {
+        methodSlot: CalledMeth<Expr>
+        amap : ImportMap
+        error: exn
+    }
     member OverloadMethodInfo : displayEnv: DisplayEnv -> m: range -> string
 
 /// Cases for overload resolution failure that exists in the implementation of the compiler.

From 2d27e6388a16e988014ffd8f2c69960dc4260bbb Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Mon, 13 May 2019 22:10:36 -0700
Subject: [PATCH 45/96] (minor) formatting

---
 src/fsharp/MethodCalls.fs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 3b983da81c..0c719bad00 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -117,9 +117,10 @@ type CallerNamedArg<'T> =
 // todo: figure out / document why we are using list²
 [<Struct>]
 type CallerArgs<'T> = 
-    { Unnamed: CallerArg<'T> list list
-      Named: CallerNamedArg<'T> list list }
-with
+    { 
+        Unnamed: CallerArg<'T> list list
+        Named: CallerNamedArg<'T> list list 
+    }
     static member Empty : CallerArgs<'T> = { Unnamed = List.empty; Named = List.empty }
     member x.CallerArgCounts = (List.length x.Unnamed, List.length x.Named)
     member x.CurriedCallerArgs = List.zip x.Unnamed x.Named

From 28f46ca25813c4a39a33c2798e0dd8cedc33c638 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 15 May 2019 17:24:44 -0700
Subject: [PATCH 46/96] format known argument type / updating .bsl

---
 src/fsharp/CompileOps.fs                      |  7 ++---
 src/fsharp/FSComp.txt                         |  4 +--
 .../expressions/syntacticsugar/E_Slices01.bsl | 28 +++--------------
 .../E_RigidTypeAnnotation03.bsl               |  8 ++---
 .../E_LeftToRightOverloadResolution01.bsl     |  4 +--
 .../inference/E_OneTypeVariable03.bsl         | 10 ++-----
 .../inference/E_OneTypeVariable03rec.bsl      | 10 ++-----
 .../E_TwoDifferentTypeVariables01.bsl         | 20 +++----------
 .../E_TwoDifferentTypeVariables01rec.bsl      | 20 +++----------
 .../E_TwoDifferentTypeVariablesGen00.bsl      | 15 ++--------
 .../E_TwoDifferentTypeVariablesGen00rec.bsl   | 15 ++--------
 .../inference/E_TwoEqualTypeVariables02.bsl   | 30 ++++---------------
 .../E_TwoEqualYypeVariables02rec.bsl          | 30 ++++---------------
 .../E_Clashing_Values_in_AbstractClass03.bsl  |  4 +--
 .../E_Clashing_Values_in_AbstractClass04.bsl  |  4 +--
 ...g_System.Convert.ToString.OverloadList.bsl | 15 ++--------
 ....Threading.Tasks.Task.Run.OverloadList.bsl | 12 ++++----
 .../overloads/neg_interface_generics.bsl      |  5 +---
 .../overloads/neg_many_many_overloads.bsl     |  8 ++---
 .../fsharp/update.base.line.with.actuals.fsx  |  1 +
 20 files changed, 64 insertions(+), 186 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index dd9b07a44b..483173e831 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -770,7 +770,7 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
           let displayArgType (name, ttype) =
               let typeDisplay = NicePrint.prettyStringOfTy denv ttype
               match name with
-              | Some name -> sprintf "(%s) : %s" name typeDisplay
+              | Some name -> sprintf "%s: %s" name typeDisplay
               | None -> sprintf "%s" typeDisplay
           let argsMessage =
               let prefix = nl + nl
@@ -781,9 +781,8 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
               | items -> 
                   let args = 
                       items 
-                      |> List.map (displayArgType >> FSComp.SR.formatDashItem) // consider if --flaterrors is on, we may like commas better in this case
-                      |> List.toArray
-                      |> String.concat nl
+                      |> List.map displayArgType
+                      |> String.concat " * "
           
                   prefix + (FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural args) + suffix
           let formatOverloads (overloads: OverloadInformation list) =
diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index 1d8f456d04..2a1a91830b 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -362,8 +362,8 @@ csCtorHasNoArgumentOrReturnProperty,"The object constructor '%s' has no argument
 508,csNoMemberTakesTheseArguments3,"No %s member or object constructor named '%s' takes %d arguments. The named argument '%s' doesn't correspond to any argument or settable return property for any overload."
 509,csMethodNotFound,"Method or object constructor '%s' not found"
 csNoOverloadsFound,"No overloads match for method '%s'."
-csNoOverloadsFoundArgumentsPrefixSingular,"Argument given: %s"
-csNoOverloadsFoundArgumentsPrefixPlural,"Arguments given:\n%s"
+csNoOverloadsFoundArgumentsPrefixSingular,"Known type of argument: %s"
+csNoOverloadsFoundArgumentsPrefixPlural,"Known types of arguments: %s"
 csMethodIsOverloaded,"A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed."
 csCandidates,"Candidates:\n%s"
 csAvailableOverloads,"Available overloads:\n%s"
diff --git a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
index 521e1dd1fa..657ca3422b 100644
--- a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
+++ b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
@@ -3,12 +3,7 @@ E_Slices01.fsx(15,9,15,19): typecheck error FS0041: A unique overload for method
 
 
 
-Arguments given:
- - int
-
- - int option
-
- - 'a option
+Known types of arguments: int * int option * 'a option
 
 
 
@@ -21,12 +16,7 @@ E_Slices01.fsx(16,9,16,17): typecheck error FS0041: A unique overload for method
 
 
 
-Arguments given:
- - int
-
- - 'a option
-
- - 'a option
+Known types of arguments: int * 'a option * 'a option
 
 
 
@@ -39,12 +29,7 @@ E_Slices01.fsx(17,9,17,19): typecheck error FS0041: A unique overload for method
 
 
 
-Arguments given:
- - 'a option
-
- - int option
-
- - int
+Known types of arguments: 'a option * int option * int
 
 
 
@@ -57,12 +42,7 @@ E_Slices01.fsx(18,9,18,17): typecheck error FS0041: A unique overload for method
 
 
 
-Arguments given:
- - 'a option
-
- - 'a option
-
- - int
+Known types of arguments: 'a option * 'a option * int
 
 
 
diff --git a/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
index 46eeb1805f..97435593f7 100644
--- a/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
+++ b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
@@ -8,7 +8,7 @@ E_RigidTypeAnnotation03.fsx(17,9,17,25): typecheck error FS0041: No overloads ma
 
 
 
-Argument given: sbyte
+Known type of argument: sbyte
 
 
 
@@ -32,7 +32,7 @@ E_RigidTypeAnnotation03.fsx(18,9,18,30): typecheck error FS0041: No overloads ma
 
 
 
-Argument given: float32
+Known type of argument: float32
 
 
 
@@ -62,7 +62,7 @@ E_RigidTypeAnnotation03.fsx(20,9,20,39): typecheck error FS0041: No overloads ma
 
 
 
-Argument given: decimal<N s ^ 2>
+Known type of argument: decimal<N s ^ 2>
 
 
 
@@ -86,7 +86,7 @@ E_RigidTypeAnnotation03.fsx(21,9,21,27): typecheck error FS0041: No overloads ma
 
 
 
-Argument given: char
+Known type of argument: char
 
 
 
diff --git a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
index 4bbd949751..0ef22fbc79 100644
--- a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
+++ b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
@@ -3,7 +3,7 @@ E_LeftToRightOverloadResolution01.fsx(7,23,7,51): typecheck error FS0041: A uniq
 
 
 
-Argument given: 'a
+Known type of argument: 'a
 
 
 
@@ -38,7 +38,7 @@ E_LeftToRightOverloadResolution01.fsx(9,23,9,51): typecheck error FS0041: A uniq
 
 
 
-Argument given: 'a
+Known type of argument: 'a
 
 
 
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl b/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
index a7e18142eb..9e72bb379b 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
@@ -3,10 +3,7 @@ E_OneTypeVariable03.fsx(60,34,60,44): typecheck error FS0041: A unique overload
 
 
 
-Arguments given:
- - 'a
-
- - int
+Known types of arguments: 'a * int
 
 
 
@@ -19,10 +16,7 @@ E_OneTypeVariable03.fsx(61,34,61,45): typecheck error FS0041: A unique overload
 
 
 
-Arguments given:
- - 'a
-
- - int
+Known types of arguments: 'a * int
 
 
 
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
index 6b2ca0de7d..edfc05dcce 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
@@ -3,10 +3,7 @@ E_OneTypeVariable03rec.fsx(60,38,60,48): typecheck error FS0041: A unique overlo
 
 
 
-Arguments given:
- - 'a
-
- - int
+Known types of arguments: 'a * int
 
 
 
@@ -19,10 +16,7 @@ E_OneTypeVariable03rec.fsx(61,38,61,49): typecheck error FS0041: A unique overlo
 
 
 
-Arguments given:
- - 'a
-
- - int
+Known types of arguments: 'a * int
 
 
 
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
index ce5f62f1d3..de6bdbda87 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
@@ -3,10 +3,7 @@ E_TwoDifferentTypeVariables01.fsx(61,33,61,43): typecheck error FS0041: A unique
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
@@ -19,10 +16,7 @@ E_TwoDifferentTypeVariables01.fsx(62,33,62,43): typecheck error FS0041: A unique
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
@@ -35,10 +29,7 @@ E_TwoDifferentTypeVariables01.fsx(63,33,63,47): typecheck error FS0041: A unique
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
@@ -51,10 +42,7 @@ E_TwoDifferentTypeVariables01.fsx(64,33,64,46): typecheck error FS0041: A unique
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
index 7450a34955..db326483ff 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
@@ -3,10 +3,7 @@ E_TwoDifferentTypeVariables01rec.fsx(60,37,60,47): typecheck error FS0041: A uni
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
@@ -19,10 +16,7 @@ E_TwoDifferentTypeVariables01rec.fsx(61,37,61,47): typecheck error FS0041: A uni
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
@@ -35,10 +29,7 @@ E_TwoDifferentTypeVariables01rec.fsx(62,37,62,51): typecheck error FS0041: A uni
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
@@ -51,10 +42,7 @@ E_TwoDifferentTypeVariables01rec.fsx(63,37,63,50): typecheck error FS0041: A uni
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
index 9eed2741c9..4d4e288a5d 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
@@ -13,10 +13,7 @@ E_TwoDifferentTypeVariablesGen00.fsx(63,45,63,55): typecheck error FS0041: A uni
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
@@ -41,10 +38,7 @@ E_TwoDifferentTypeVariablesGen00.fsx(66,45,66,59): typecheck error FS0041: A uni
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
@@ -63,10 +57,7 @@ E_TwoDifferentTypeVariablesGen00.fsx(68,45,68,58): typecheck error FS0041: A uni
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
index 36dd8553c6..0909f25a99 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
@@ -13,10 +13,7 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(63,45,63,55): typecheck error FS0041: A
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
@@ -41,10 +38,7 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(66,45,66,59): typecheck error FS0041: A
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
@@ -63,10 +57,7 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(68,45,68,58): typecheck error FS0041: A
 
 
 
-Arguments given:
- - 'a
-
- - 'b
+Known types of arguments: 'a * 'b
 
 
 
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
index 3912e40b47..b07a943366 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
@@ -3,10 +3,7 @@ E_TwoEqualTypeVariables02.fsx(61,33,61,43): typecheck error FS0041: A unique ove
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
@@ -19,10 +16,7 @@ E_TwoEqualTypeVariables02.fsx(62,33,62,43): typecheck error FS0041: A unique ove
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
@@ -35,10 +29,7 @@ E_TwoEqualTypeVariables02.fsx(63,33,63,43): typecheck error FS0041: A unique ove
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
@@ -51,10 +42,7 @@ E_TwoEqualTypeVariables02.fsx(64,33,64,44): typecheck error FS0041: A unique ove
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
@@ -69,10 +57,7 @@ E_TwoEqualTypeVariables02.fsx(65,33,65,45): typecheck error FS0041: A unique ove
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
@@ -89,10 +74,7 @@ E_TwoEqualTypeVariables02.fsx(66,33,66,46): typecheck error FS0041: A unique ove
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
index de1b498e3c..fdb19e54d0 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
@@ -3,10 +3,7 @@ E_TwoEqualYypeVariables02rec.fsx(60,37,60,47): typecheck error FS0041: A unique
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
@@ -19,10 +16,7 @@ E_TwoEqualYypeVariables02rec.fsx(61,37,61,47): typecheck error FS0041: A unique
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
@@ -35,10 +29,7 @@ E_TwoEqualYypeVariables02rec.fsx(62,37,62,47): typecheck error FS0041: A unique
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
@@ -51,10 +42,7 @@ E_TwoEqualYypeVariables02rec.fsx(63,37,63,48): typecheck error FS0041: A unique
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
@@ -69,10 +57,7 @@ E_TwoEqualYypeVariables02rec.fsx(64,37,64,49): typecheck error FS0041: A unique
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
@@ -89,10 +74,7 @@ E_TwoEqualYypeVariables02rec.fsx(65,37,65,50): typecheck error FS0041: A unique
 
 
 
-Arguments given:
- - 'a
-
- - 'a
+Known types of arguments: 'a * 'a
 
 
 
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
index 75657ad283..ac9de0f12a 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
@@ -3,7 +3,7 @@ E_Clashing_Values_in_AbstractClass03.fsx(16,18,16,25): typecheck error FS0041: A
 
 
 
-Argument given: int
+Known type of argument: int
 
 
 
@@ -16,7 +16,7 @@ E_Clashing_Values_in_AbstractClass03.fsx(17,18,17,25): typecheck error FS0041: A
 
 
 
-Argument given: int
+Known type of argument: int
 
 
 
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
index 698f690a7a..a4114d2793 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
@@ -3,7 +3,7 @@ E_Clashing_Values_in_AbstractClass04.fsx(16,18,16,25): typecheck error FS0041: A
 
 
 
-Argument given: int
+Known type of argument: int
 
 
 
@@ -16,7 +16,7 @@ E_Clashing_Values_in_AbstractClass04.fsx(17,18,17,25): typecheck error FS0041: A
 
 
 
-Argument given: int
+Known type of argument: int
 
 
 
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
index 76ea741745..2a4c76ed72 100644
--- a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
@@ -3,10 +3,7 @@ neg_System.Convert.ToString.OverloadList.fsx(1,1,1,31): typecheck error FS0041:
 
 
 
-Arguments given:
- - char
-
- - int
+Known types of arguments: char * int
 
 
 
@@ -55,10 +52,7 @@ neg_System.Convert.ToString.OverloadList.fsx(2,1,2,47): typecheck error FS0041:
 
 
 
-Arguments given:
- - (provider) : char
-
- - (value) : int
+Known types of arguments: provider: char * value: int
 
 
 
@@ -99,10 +93,7 @@ neg_System.Convert.ToString.OverloadList.fsx(3,1,3,48): typecheck error FS0041:
 
 
 
-Arguments given:
- - (provider) : 'a when 'a : null
-
- - (value) : int
+Known types of arguments: provider: 'a when 'a : null * value: int
 
 
 
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
index 06089d9946..66cf990edd 100644
--- a/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
@@ -3,7 +3,7 @@ neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(5,11,5,35): typecheck error
 
 
 
-Argument given: (unit -> Task<int>)
+Known type of argument: (unit -> Task<int>)
 
 
 
@@ -16,7 +16,7 @@ neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(6,11,6,44): typecheck error
 
 
 
-Argument given: Func<Task<int>>
+Known type of argument: Func<Task<int>>
 
 
 
@@ -29,7 +29,7 @@ neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(7,11,7,47): typecheck error
 
 
 
-Argument given: Func<Task<int>>
+Known type of argument: Func<Task<int>>
 
 
 
@@ -42,7 +42,7 @@ neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(8,21,8,57): typecheck error
 
 
 
-Argument given: Func<Task<int>>
+Known type of argument: Func<Task<int>>
 
 
 
@@ -55,7 +55,7 @@ neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(9,11,9,50): typecheck error
 
 
 
-Argument given: Func<Task<int>>
+Known type of argument: Func<Task<int>>
 
 
 
@@ -68,7 +68,7 @@ neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(10,11,10,52): typecheck err
 
 
 
-Argument given: Func<Task<int>>
+Known type of argument: Func<Task<int>>
 
 
 
diff --git a/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl b/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
index cba40e8308..02832060e8 100644
--- a/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
@@ -5,10 +5,7 @@ neg_interface_generics.fsx(20,9,20,27): typecheck error FS0041: No overloads mat
 
 
 
-Arguments given:
- - string
-
- - XmlReader
+Known types of arguments: string * XmlReader
 
 
 
diff --git a/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl b/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
index ce51c4619e..6fa1f1201c 100644
--- a/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
@@ -3,7 +3,7 @@ neg_many_many_overloads.fsx(123,1,123,13): typecheck error FS0041: A unique over
 
 
 
-Argument given: 'a when 'a : null
+Known type of argument: 'a when 'a : null
 
 
 
@@ -156,7 +156,7 @@ neg_many_many_overloads.fsx(124,1,124,34): typecheck error FS0041: No overloads
 
 
 
-Argument given: Type
+Known type of argument: Type
 
 
 
@@ -333,7 +333,7 @@ neg_many_many_overloads.fsx(125,1,125,25): typecheck error FS0041: No overloads
 
 
 
-Argument given: Guid
+Known type of argument: Guid
 
 
 
@@ -510,7 +510,7 @@ neg_many_many_overloads.fsx(126,1,126,48): typecheck error FS0041: No overloads
 
 
 
-Argument given: DayOfWeek
+Known type of argument: DayOfWeek
 
 
 
diff --git a/tests/fsharp/update.base.line.with.actuals.fsx b/tests/fsharp/update.base.line.with.actuals.fsx
index a60baebcbe..b55911e461 100644
--- a/tests/fsharp/update.base.line.with.actuals.fsx
+++ b/tests/fsharp/update.base.line.with.actuals.fsx
@@ -9,6 +9,7 @@ let directories =
       "typecheck/sigs"
       "typecheck/overloads"
       "conformance/expressions/syntacticsugar"
+      "conformance/expressions/type-relatedexpressions"
       "conformance/inference"
       "conformance/wellformedness"
       "typeProviders/negTests"

From 20abb54878d868308568822bf963dd0f1d5ff3e4 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 16 May 2019 00:43:33 -0700
Subject: [PATCH 47/96] update missing baseline

---
 .../lexicalanalysis/E_LessThanDotOpenParen001.bsl      | 10 ++--------
 tests/fsharp/update.base.line.with.actuals.fsx         |  1 +
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
index 34b3951a7d..ddaf35a08d 100644
--- a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
+++ b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
@@ -26,10 +26,7 @@ E_LessThanDotOpenParen001.fsx(33,10,33,45): typecheck error FS0041: No overloads
 
 
 
-Arguments given:
- - (string -> int)
-
- - TestType<int,string>
+Known types of arguments: (string -> int) * TestType<int,string>
 
 
 
@@ -53,10 +50,7 @@ E_LessThanDotOpenParen001.fsx(34,10,34,68): typecheck error FS0041: No overloads
 
 
 
-Arguments given:
- - (int -> 'a)
-
- - TestType<int,string>
+Known types of arguments: (int -> 'a) * TestType<int,string>
 
 
 
diff --git a/tests/fsharp/update.base.line.with.actuals.fsx b/tests/fsharp/update.base.line.with.actuals.fsx
index b55911e461..de28ba0118 100644
--- a/tests/fsharp/update.base.line.with.actuals.fsx
+++ b/tests/fsharp/update.base.line.with.actuals.fsx
@@ -13,6 +13,7 @@ let directories =
       "conformance/inference"
       "conformance/wellformedness"
       "typeProviders/negTests"
+      "conformance/lexicalanalysis"
     ]
     |> List.map (fun d -> Path.Combine(__SOURCE_DIRECTORY__, d) |> DirectoryInfo)
 

From c5de0ac8c38c18f8db9f3902d243354e66e97d9b Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 16 May 2019 00:52:18 -0700
Subject: [PATCH 48/96] update missing baselines

---
 tests/fsharp/typecheck/sigs/neg06.bsl         |  2 +-
 tests/fsharp/typecheck/sigs/neg106.bsl        | 24 ++++---------------
 tests/fsharp/typecheck/sigs/neg20.bsl         | 19 ++++-----------
 tests/fsharp/typecheck/sigs/neg45.bsl         |  6 ++---
 tests/fsharp/typecheck/sigs/neg61.bsl         |  2 +-
 .../fsharp/update.base.line.with.actuals.fsx  |  1 +
 6 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/tests/fsharp/typecheck/sigs/neg06.bsl b/tests/fsharp/typecheck/sigs/neg06.bsl
index 65930d6951..4f095970fc 100644
--- a/tests/fsharp/typecheck/sigs/neg06.bsl
+++ b/tests/fsharp/typecheck/sigs/neg06.bsl
@@ -142,7 +142,7 @@ neg06.fs(382,13,382,19): typecheck error FS0041: A unique overload for method 'M
 
 
 
-Argument given: 'a
+Known type of argument: 'a
 
 
 
diff --git a/tests/fsharp/typecheck/sigs/neg106.bsl b/tests/fsharp/typecheck/sigs/neg106.bsl
index 6eac870cdc..3d00ac07ce 100644
--- a/tests/fsharp/typecheck/sigs/neg106.bsl
+++ b/tests/fsharp/typecheck/sigs/neg106.bsl
@@ -5,12 +5,7 @@ neg106.fs(13,18,13,72): typecheck error FS0041: No overloads match for method 'C
 
 
 
-Arguments given:
- - inref<int>
-
- - int
-
- - int
+Known types of arguments: inref<int> * int * int
 
 
 
@@ -35,12 +30,7 @@ neg106.fs(17,14,17,68): typecheck error FS0041: No overloads match for method 'C
 
 
 
-Arguments given:
- - inref<int>
-
- - int
-
- - int
+Known types of arguments: inref<int> * int * int
 
 
 
@@ -75,10 +65,7 @@ neg106.fs(40,18,40,32): typecheck error FS0041: No overloads match for method 'M
 
 
 
-Arguments given:
- - string
-
- - inref<int>
+Known types of arguments: string * inref<int>
 
 
 
@@ -91,10 +78,7 @@ neg106.fs(41,19,41,31): typecheck error FS0041: No overloads match for method 'M
 
 
 
-Arguments given:
- - int
-
- - inref<int>
+Known types of arguments: int * inref<int>
 
 
 
diff --git a/tests/fsharp/typecheck/sigs/neg20.bsl b/tests/fsharp/typecheck/sigs/neg20.bsl
index e24792df3b..c7fc162c29 100644
--- a/tests/fsharp/typecheck/sigs/neg20.bsl
+++ b/tests/fsharp/typecheck/sigs/neg20.bsl
@@ -163,10 +163,7 @@ neg20.fs(131,5,131,24): typecheck error FS0041: No overloads match for method 'O
 
 
 
-Arguments given:
- - string
-
- - obj
+Known types of arguments: string * obj
 
 
 
@@ -207,10 +204,7 @@ neg20.fs(182,14,182,31): typecheck error FS0041: No overloads match for method '
 
 
 
-Arguments given:
- - string
-
- - obj
+Known types of arguments: string * obj
 
 
 
@@ -268,10 +262,7 @@ neg20.fs(188,14,188,31): typecheck error FS0041: No overloads match for method '
 
 
 
-Arguments given:
- - string
-
- - obj
+Known types of arguments: string * obj
 
 
 
@@ -405,7 +396,7 @@ neg20.fs(335,11,335,24): typecheck error FS0041: A unique overload for method 'S
 
 
 
-Argument given: 'a
+Known type of argument: 'a
 
 
 
@@ -420,7 +411,7 @@ neg20.fs(336,11,336,22): typecheck error FS0041: A unique overload for method 'G
 
 
 
-Argument given: 'a
+Known type of argument: 'a
 
 
 
diff --git a/tests/fsharp/typecheck/sigs/neg45.bsl b/tests/fsharp/typecheck/sigs/neg45.bsl
index a908230af7..c338d61611 100644
--- a/tests/fsharp/typecheck/sigs/neg45.bsl
+++ b/tests/fsharp/typecheck/sigs/neg45.bsl
@@ -57,7 +57,7 @@ neg45.fs(89,26,89,40): typecheck error FS0041: A unique overload for method 'M'
 
 
 
-Argument given: R1
+Known type of argument: R1
 
 
 
@@ -70,7 +70,7 @@ neg45.fs(97,26,97,55): typecheck error FS0041: A unique overload for method 'M'
 
 
 
-Argument given: (R1 * R1)
+Known type of argument: (R1 * R1)
 
 
 
@@ -83,7 +83,7 @@ neg45.fs(104,26,104,31): typecheck error FS0041: A unique overload for method 'M
 
 
 
-Argument given: int
+Known type of argument: int
 
 
 
diff --git a/tests/fsharp/typecheck/sigs/neg61.bsl b/tests/fsharp/typecheck/sigs/neg61.bsl
index b8761ee8e5..a6a49132d3 100644
--- a/tests/fsharp/typecheck/sigs/neg61.bsl
+++ b/tests/fsharp/typecheck/sigs/neg61.bsl
@@ -87,7 +87,7 @@ neg61.fs(174,22,174,23): typecheck error FS0041: No overloads match for method '
 
 
 
-Argument given: int
+Known type of argument: int
 
 
 
diff --git a/tests/fsharp/update.base.line.with.actuals.fsx b/tests/fsharp/update.base.line.with.actuals.fsx
index de28ba0118..bba6154b63 100644
--- a/tests/fsharp/update.base.line.with.actuals.fsx
+++ b/tests/fsharp/update.base.line.with.actuals.fsx
@@ -10,6 +10,7 @@ let directories =
       "typecheck/overloads"
       "conformance/expressions/syntacticsugar"
       "conformance/expressions/type-relatedexpressions"
+      "typecheck/sigs"
       "conformance/inference"
       "conformance/wellformedness"
       "typeProviders/negTests"

From e08db81e0fd066e44095958635944c40e94d148d Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 16 May 2019 00:55:35 -0700
Subject: [PATCH 49/96] update missing baseline

---
 tests/fsharp/typecheck/sigs/neg106.vsbsl | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/tests/fsharp/typecheck/sigs/neg106.vsbsl b/tests/fsharp/typecheck/sigs/neg106.vsbsl
index 6eac870cdc..3d00ac07ce 100644
--- a/tests/fsharp/typecheck/sigs/neg106.vsbsl
+++ b/tests/fsharp/typecheck/sigs/neg106.vsbsl
@@ -5,12 +5,7 @@ neg106.fs(13,18,13,72): typecheck error FS0041: No overloads match for method 'C
 
 
 
-Arguments given:
- - inref<int>
-
- - int
-
- - int
+Known types of arguments: inref<int> * int * int
 
 
 
@@ -35,12 +30,7 @@ neg106.fs(17,14,17,68): typecheck error FS0041: No overloads match for method 'C
 
 
 
-Arguments given:
- - inref<int>
-
- - int
-
- - int
+Known types of arguments: inref<int> * int * int
 
 
 
@@ -75,10 +65,7 @@ neg106.fs(40,18,40,32): typecheck error FS0041: No overloads match for method 'M
 
 
 
-Arguments given:
- - string
-
- - inref<int>
+Known types of arguments: string * inref<int>
 
 
 
@@ -91,10 +78,7 @@ neg106.fs(41,19,41,31): typecheck error FS0041: No overloads match for method 'M
 
 
 
-Arguments given:
- - int
-
- - inref<int>
+Known types of arguments: int * inref<int>
 
 
 

From 628d8bce1b9143b089915c5b7679050d845c82d9 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sat, 24 Aug 2019 09:47:11 +0200
Subject: [PATCH 50/96] minor: make TTrait better in debugger display

---
 src/fsharp/tast.fs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs
index 33da5cd659..e591acedc9 100644
--- a/src/fsharp/tast.fs
+++ b/src/fsharp/tast.fs
@@ -2411,7 +2411,7 @@ and
     ///
     /// Indicates the signature of a member constraint. Contains a mutable solution cell
     /// to store the inferred solution of the constraint.
-    | TTrait of TTypes * string * MemberFlags * TTypes * TType option * TraitConstraintSln option ref 
+    | TTrait of _tys: TTypes * memberName: string * _memFlags: MemberFlags * _argTys: TTypes * returnType: TType option * solution: TraitConstraintSln option ref 
 
     /// Get the member name associated with the member constraint.
     member x.MemberName = (let (TTrait(_, nm, _, _, _, _)) = x in nm)
@@ -2426,10 +2426,11 @@ and
     member x.Solution 
         with get() = (let (TTrait(_, _, _, _, _, sln)) = x in sln.Value)
         and set v = (let (TTrait(_, _, _, _, _, sln)) = x in sln.Value <- v)
-
+    member x._Tys = let (TTrait(_tys, _, _, _, _, _)) = x in _tys
+    member x.MemberFlags = let (TTrait(_, _, _memFlags, _, _, _)) = x in _memFlags
+    member x.ArgTys = let (TTrait(_, _, _, _argTys, _, _)) = x in _argTys
     [<DebuggerBrowsable(DebuggerBrowsableState.Never)>]
     member x.DebugText = x.ToString()
-
     override x.ToString() = "TTrait(" + x.MemberName + ")"
     
 and 

From e2bc962e90859f112e34c70fa5d3d84f7b2fa947 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sat, 24 Aug 2019 09:48:48 +0200
Subject: [PATCH 51/96] [wip] pass TraitConstraintInfo around failed overload
 resolution error, and try to display some of it's info

---
 src/fsharp/CompileOps.fs        | 44 +++++++++++++++++++++++----------
 src/fsharp/ConstraintSolver.fs  | 12 ++++++---
 src/fsharp/ConstraintSolver.fsi |  8 ++++--
 3 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 483173e831..549db5a503 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -791,20 +791,38 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
               |> List.sort
               |> List.map FSComp.SR.formatDashItem
               |> String.concat nl
-          
-          let msg =
+          let formatTraitInfo (cx: TraitConstraintInfo) =
+
+            let prettyArgTys =
+              cx.ArgTys 
+              |> List.map (NicePrint.prettyStringOfTy denv)
+              |> String.concat " +!+ "
+                          
+            [ sprintf "cx.ArgTys      %s" prettyArgTys
+              sprintf "cx.MemberFlags %A" cx.MemberFlags
+              sprintf "cx.MemberName  %A" cx.MemberName
+              sprintf "cx.ReturnType  %A" (cx.ReturnType |> Option.map (NicePrint.prettyStringOfTy denv))
+              sprintf "cx.Solution    %A" cx.Solution
+              sprintf "cx._Tys        %A" (cx._Tys |> List.map (NicePrint.prettyStringOfTy denv))
+            
+            ] |> String.concat nl
+          let cx, msg =
               match failure with
-              | NoOverloadsFound (methodName, overloads) -> FSComp.SR.csNoOverloadsFound methodName + argsMessage + (FSComp.SR.csAvailableOverloads (formatOverloads overloads))
-              | PossibleCandidates (methodName, methodNames) ->
-                  let msg = FSComp.SR.csMethodIsOverloaded methodName
-                  match methodNames with
-                  | [] -> msg
-                  | names -> 
-                      let overloads = FSComp.SR.csCandidates (formatOverloads names)
-                      msg 
-                      + argsMessage
-                      + overloads
-          os.Append msg |> ignore
+              | NoOverloadsFound (methodName, overloads, cx) ->
+                cx, FSComp.SR.csNoOverloadsFound methodName + argsMessage + (FSComp.SR.csAvailableOverloads (formatOverloads overloads))
+              | PossibleCandidates (methodName, methodNames, cx) ->
+                  cx
+                  , (let msg = FSComp.SR.csMethodIsOverloaded methodName
+                     match methodNames with
+                     | [] -> msg
+                     | names -> 
+                         let overloads = FSComp.SR.csCandidates (formatOverloads names)
+                         msg 
+                         + argsMessage
+                         + overloads)
+                  
+          let traitInfo = cx |> Option.map (fun cx -> nl + nl + "TRAIIAT" + nl + formatTraitInfo cx + nl + nl) |> Option.defaultValue ""
+          os.Append (msg + traitInfo) |> ignore
 
       | UnresolvedConversionOperator(denv, fromTy, toTy, _) -> 
           let t1, t2, _tpcs = NicePrint.minimalStringsOfTwoTypes denv fromTy toTy
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 1daea795d6..4f424dffa5 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -194,8 +194,12 @@ type OverloadInformation =
 
 /// Cases for overload resolution failure that exists in the implementation of the compiler.
 type OverloadResolutionFailure =
-    | NoOverloadsFound   of methodName: string * candidates: OverloadInformation list
-    | PossibleCandidates of methodName: string * candidates: OverloadInformation list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
+  | NoOverloadsFound   of methodName: string
+                        * candidates: OverloadInformation list 
+                        * cx: TraitConstraintInfo option
+  | PossibleCandidates of methodName: string 
+                        * candidates: OverloadInformation list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
+                        * cx: TraitConstraintInfo option
 
 exception ConstraintSolverTupleDiffLengths              of displayEnv: DisplayEnv * TType list * TType list * range * range
 exception ConstraintSolverInfiniteTypes                 of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
@@ -2557,7 +2561,7 @@ and ResolveOverloading
                             | OkResult _ -> None
                             | ErrorResult(_, exn) -> Some {methodSlot = calledMeth; amap = amap; error = exn })
 
-                None, ErrorD (failOverloading (NoOverloadsFound (methodName, errors))), NoTrace
+                None, ErrorD (failOverloading (NoOverloadsFound (methodName, errors, cx))), NoTrace
 
             | [(calledMeth, warns, t)] ->
                 Some calledMeth, OkResult (warns, ()), WithTrace t
@@ -2748,7 +2752,7 @@ and ResolveOverloading
 
                     let methods = List.concat methods
 
-                    None, ErrorD (failOverloading (PossibleCandidates(methodName, methods))), NoTrace
+                    None, ErrorD (failOverloading (PossibleCandidates(methodName, methods,cx))), NoTrace
 
     // If we've got a candidate solution: make the final checks - no undo here! 
     // Allow subsumption on arguments. Include the return type.
diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 2bca519f68..9bab84318b 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -102,8 +102,12 @@ type OverloadInformation =
 
 /// Cases for overload resolution failure that exists in the implementation of the compiler.
 type OverloadResolutionFailure =
-    | NoOverloadsFound   of methodName: string * candidates: OverloadInformation list
-    | PossibleCandidates of methodName: string * candidates: OverloadInformation list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
+  | NoOverloadsFound   of methodName: string
+                        * candidates: OverloadInformation list 
+                        * cx: TraitConstraintInfo option
+  | PossibleCandidates of methodName: string 
+                        * candidates: OverloadInformation list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
+                        * cx: TraitConstraintInfo option
 
 exception ConstraintSolverTupleDiffLengths              of displayEnv: DisplayEnv * TType list * TType list * range * range
 exception ConstraintSolverInfiniteTypes                 of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range

From 4f708227af9cad798a2936abc3f58450fcf92830 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 28 Aug 2019 01:00:10 +0200
Subject: [PATCH 52/96] minimize diff

---
 src/fsharp/ConstraintSolver.fs | 18 ++++++++++++------
 src/fsharp/FSComp.txt          |  2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 4f424dffa5..4b0f1337c2 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -201,9 +201,12 @@ type OverloadResolutionFailure =
                         * candidates: OverloadInformation list // methodNames may be different (with operators?), this is refactored from original logic to assemble overload failure message
                         * cx: TraitConstraintInfo option
 
-exception ConstraintSolverTupleDiffLengths              of displayEnv: DisplayEnv * TType list * TType list * range * range
-exception ConstraintSolverInfiniteTypes                 of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
-exception ConstraintSolverTypesNotInEqualityRelation    of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
+exception ConstraintSolverTupleDiffLengths of displayEnv: DisplayEnv * TType list * TType list * range * range
+
+exception ConstraintSolverInfiniteTypes of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
+
+exception ConstraintSolverTypesNotInEqualityRelation of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
+
 exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argT: TType * paramT: TType * range * range
 
 exception ConstraintSolverMissingConstraint of displayEnv: DisplayEnv * Tast.Typar * Tast.TyparConstraint * range  * range 
@@ -217,9 +220,12 @@ exception ErrorFromApplyingDefault of tcGlobals: TcGlobals * displayEnv: Display
 exception ErrorFromAddingTypeEquation of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * range
 
 exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * ContextInfo * range
-exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn * range
-exception UnresolvedOverloading                 of displayEnv: DisplayEnv * callerArgs: CallerArgs<Expr> * failure: OverloadResolutionFailure * range
-exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
+
+exception ErrorFromAddingConstraint of displayEnv: DisplayEnv * exn * range
+
+exception UnresolvedOverloading of displayEnv: DisplayEnv * callerArgs: CallerArgs<Expr> * failure: OverloadResolutionFailure * range
+
+exception UnresolvedConversionOperator of displayEnv: DisplayEnv * TType * TType * range
 
 type TcValF = (ValRef -> ValUseFlag -> TType list -> range -> Expr * TType)
 
diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index 2a1a91830b..9f672cb57a 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -1486,5 +1486,7 @@ fSharpBannerVersion,"%s for F# %s"
 optsLangVersion,"Display the allowed values for language version, specify language version such as 'latest' or 'preview'"
 optsSupportedLangVersions,"Supported language versions:"
 nativeResourceFormatError,"Stream does not begin with a null resource and is not in '.RES' format."
+nativeResourceHeaderMalformed,"Resource header beginning at offset %s is malformed."formatDashItem," - %s"fSharpBannerVersion,"%s for F# %s"
+formatDashItem," - %s"
 nativeResourceHeaderMalformed,"Resource header beginning at offset %s is malformed."
 formatDashItem," - %s"

From 138267fd0ffad43362f162c8e553f5937eaf854b Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 28 Aug 2019 01:16:40 +0200
Subject: [PATCH 53/96] signature file mismatch

---
 src/fsharp/ConstraintSolver.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 4b0f1337c2..ef4ed54167 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -217,7 +217,7 @@ exception ConstraintSolverRelatedInformation of string option * range * exn
 
 exception ErrorFromApplyingDefault of tcGlobals: TcGlobals * displayEnv: DisplayEnv * Tast.Typar * TType * exn * range
 
-exception ErrorFromAddingTypeEquation of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * range
+exception ErrorFromAddingTypeEquation of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actual: TType * expected: TType * exn * range
 
 exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * ContextInfo * range
 

From ebf60fa1acc34f5a8fc3434172f708bb3a9c6792 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Fri, 27 Dec 2019 10:06:28 +0100
Subject: [PATCH 54/96] removing duplicate in fscomp.txt

---
 src/fsharp/FSComp.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index 9f672cb57a..2a1a91830b 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -1486,7 +1486,5 @@ fSharpBannerVersion,"%s for F# %s"
 optsLangVersion,"Display the allowed values for language version, specify language version such as 'latest' or 'preview'"
 optsSupportedLangVersions,"Supported language versions:"
 nativeResourceFormatError,"Stream does not begin with a null resource and is not in '.RES' format."
-nativeResourceHeaderMalformed,"Resource header beginning at offset %s is malformed."formatDashItem," - %s"fSharpBannerVersion,"%s for F# %s"
-formatDashItem," - %s"
 nativeResourceHeaderMalformed,"Resource header beginning at offset %s is malformed."
 formatDashItem," - %s"

From 20a4cff11d7b168696538d668c4cea778e20f2c8 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Fri, 27 Dec 2019 11:30:53 +0100
Subject: [PATCH 55/96] surfacing initial bits of TraitConstraintInfo, roughly
 for now

---
 src/fsharp/CompileOps.fs | 40 ++++++++++++++++++++++++++++++++++++++--
 src/fsharp/FSComp.txt    |  3 +++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 549db5a503..82b3f7071b 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -785,6 +785,35 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
                       |> String.concat " * "
           
                   prefix + (FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural args) + suffix
+
+          let knownReturnType (cx: TraitConstraintInfo option) =
+              match cx with 
+              | None -> String.Empty
+              | Some cx ->
+              let prefix = nl + nl
+              let suffix = nl + nl
+              match cx.ReturnType with
+              | None -> String.Empty
+              | Some t ->
+                prefix + (NicePrint.prettyStringOfTy denv t |> FSComp.SR.csNoOverloadsFoundReturnType) + suffix
+
+          let genericParametersMessage (cx: TraitConstraintInfo option) =
+              match cx with 
+              | None -> String.Empty
+              | Some cx ->
+              let prefix = nl + nl
+              let suffix = nl + nl
+            
+              match cx.ArgTys  with
+              | [] -> nl + nl
+              | [item] -> prefix + (item |> NicePrint.prettyStringOfTy denv |> FSComp.SR.csNoOverloadsFoundTypeParametersPrefixSingular) + suffix
+              | items ->
+                let args =
+                  items
+                  |> List.map (NicePrint.prettyStringOfTy denv)
+                  |> String.concat ", "
+                prefix + (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixPlural args) + suffix
+
           let formatOverloads (overloads: OverloadInformation list) =
               overloads
               |> List.map (fun overload -> overload.OverloadMethodInfo denv m)
@@ -796,7 +825,7 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
             let prettyArgTys =
               cx.ArgTys 
               |> List.map (NicePrint.prettyStringOfTy denv)
-              |> String.concat " +!+ "
+              |> String.concat ", "
                           
             [ sprintf "cx.ArgTys      %s" prettyArgTys
               sprintf "cx.MemberFlags %A" cx.MemberFlags
@@ -809,7 +838,12 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
           let cx, msg =
               match failure with
               | NoOverloadsFound (methodName, overloads, cx) ->
-                cx, FSComp.SR.csNoOverloadsFound methodName + argsMessage + (FSComp.SR.csAvailableOverloads (formatOverloads overloads))
+                cx
+                , FSComp.SR.csNoOverloadsFound methodName
+                  + (knownReturnType cx) 
+                  + (genericParametersMessage cx)
+                  + argsMessage
+                  + (FSComp.SR.csAvailableOverloads (formatOverloads overloads))
               | PossibleCandidates (methodName, methodNames, cx) ->
                   cx
                   , (let msg = FSComp.SR.csMethodIsOverloaded methodName
@@ -818,6 +852,8 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
                      | names -> 
                          let overloads = FSComp.SR.csCandidates (formatOverloads names)
                          msg 
+                         + (knownReturnType cx)
+                         + (genericParametersMessage cx)
                          + argsMessage
                          + overloads)
                   
diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index 2a1a91830b..7963fa9012 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -364,6 +364,9 @@ csCtorHasNoArgumentOrReturnProperty,"The object constructor '%s' has no argument
 csNoOverloadsFound,"No overloads match for method '%s'."
 csNoOverloadsFoundArgumentsPrefixSingular,"Known type of argument: %s"
 csNoOverloadsFoundArgumentsPrefixPlural,"Known types of arguments: %s"
+csNoOverloadsFoundTypeParametersPrefixSingular,"Known type parameter: %s"
+csNoOverloadsFoundTypeParametersPrefixPlural,"Known type parameters: %s"
+csNoOverloadsFoundReturnType,"Known return type: %s"
 csMethodIsOverloaded,"A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed."
 csCandidates,"Candidates:\n%s"
 csAvailableOverloads,"Available overloads:\n%s"

From 5bb714a8a046e711eda557985b902d8880f31731 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sun, 12 Jan 2020 10:28:01 +0100
Subject: [PATCH 56/96] formatting types of known argument in one go, the
 formatting is still wrong:

* unamed type arguments aren't relabelled (still show their numerical ids)
* SRTP constraints are dismissed, not sure how they should be lined up to pass to SimplifyTypes.CollectInfo
---
 src/fsharp/CompileOps.fs | 26 +++++++-----
 src/fsharp/NicePrint.fs  | 87 ++++++++++++++++++++++++++--------------
 2 files changed, 75 insertions(+), 38 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 82b3f7071b..3dcbb5af4e 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -767,24 +767,32 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
 
       | UnresolvedOverloading(denv, callerArgs, failure, m) ->
           let nl = System.Environment.NewLine
-          let displayArgType (name, ttype) =
-              let typeDisplay = NicePrint.prettyStringOfTy denv ttype
-              match name with
-              | Some name -> sprintf "%s: %s" name typeDisplay
-              | None -> sprintf "%s" typeDisplay
           let argsMessage =
               let prefix = nl + nl
               let suffix = nl + nl
               match callerArgs.ArgumentNamesAndTypes with
               | [] -> nl + nl
-              | [item] -> prefix + (item |> displayArgType |> FSComp.SR.csNoOverloadsFoundArgumentsPrefixSingular) + suffix
               | items -> 
-                  let args = 
+                  // more than one argument, need to lay them out in a single pass
+                  
+                  //let cxs = []
+                  let argsL = 
+                    NicePrint.prettyLayoutOfUnresolvedMethodCallArguments 
+                      denv 
+                      [] 
+                      (items |> List.map (fun (name,tTy) -> tTy, {ArgReprInfo.Name = name |> Option.map (fun name -> Ident(name, range.Zero)); Attribs = []}))
+                      //cxs
+                  let args = argsL |> List.map Layout.showL |> String.concat " "
+                  (*let args = 
                       items 
                       |> List.map displayArgType
                       |> String.concat " * "
-          
-                  prefix + (FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural args) + suffix
+                  *)
+                  let prefixMessage =
+                      match items with
+                      | [_] -> FSComp.SR.csNoOverloadsFoundArgumentsPrefixSingular
+                      | _ -> FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural
+                  prefix + (prefixMessage args) + suffix
 
           let knownReturnType (cx: TraitConstraintInfo option) =
               match cx with 
diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs
index 6479d6c672..e5296cdf6e 100644
--- a/src/fsharp/NicePrint.fs
+++ b/src/fsharp/NicePrint.fs
@@ -988,6 +988,37 @@ module private PrintTypes =
     and layoutType denv ty = 
         layoutTypeWithInfo denv SimplifyTypes.typeSimplificationInfo0 ty
 
+
+    let layoutArgInfos denv env argInfos =
+
+        // Format each argument, including its name and type 
+        let argL (ty, argInfo: ArgReprInfo) = 
+       
+            // Detect an optional argument 
+            let isOptionalArg = HasFSharpAttribute denv.g denv.g.attrib_OptionalArgumentAttribute argInfo.Attribs
+            let isParamArray = HasFSharpAttribute denv.g denv.g.attrib_ParamArrayAttribute argInfo.Attribs
+            match argInfo.Name, isOptionalArg, isParamArray, tryDestOptionTy denv.g ty with 
+            // Layout an optional argument 
+            | Some(id), true, _, ValueSome ty -> 
+                leftL (tagPunctuation "?") ^^ sepL (tagParameter id.idText) ^^ SepL.colon ^^ layoutTypeWithInfoAndPrec denv env 2 ty 
+            // Layout an unnamed argument 
+            | None, _, _, _ -> 
+                layoutTypeWithInfoAndPrec denv env 2 ty
+            // Layout a named argument 
+            | Some id, _, isParamArray, _ -> 
+                let prefix =
+                    if isParamArray then
+                        layoutBuiltinAttribute denv denv.g.attrib_ParamArrayAttribute ^^ leftL (tagParameter id.idText)
+                    else
+                        leftL (tagParameter id.idText)
+                prefix ^^ SepL.colon ^^ layoutTypeWithInfoAndPrec denv env 2 ty
+
+        let allArgsL = 
+            argInfos 
+            |> List.mapSquared argL 
+            |> List.map (sepListL (wordL (tagPunctuation "*")))
+        allArgsL
+
     /// Layout a single type used as the type of a member or value 
     let layoutTopType denv env argInfos rty cxs =
         // Parenthesize the return type to match the topValInfo 
@@ -996,35 +1027,9 @@ module private PrintTypes =
         match argInfos with
         | [] -> rtyL --- cxsL
         | _ -> 
-
-            // Format each argument, including its name and type 
-            let argL (ty, argInfo: ArgReprInfo) = 
-                   
-                // Detect an optional argument 
-                let isOptionalArg = HasFSharpAttribute denv.g denv.g.attrib_OptionalArgumentAttribute argInfo.Attribs
-                let isParamArray = HasFSharpAttribute denv.g denv.g.attrib_ParamArrayAttribute argInfo.Attribs
-                match argInfo.Name, isOptionalArg, isParamArray, tryDestOptionTy denv.g ty with 
-                // Layout an optional argument 
-                | Some(id), true, _, ValueSome ty -> 
-                    leftL (tagPunctuation "?") ^^ sepL (tagParameter id.idText) ^^ SepL.colon ^^ layoutTypeWithInfoAndPrec denv env 2 ty 
-                // Layout an unnamed argument 
-                | None, _, _, _ -> 
-                    layoutTypeWithInfoAndPrec denv env 2 ty
-                // Layout a named argument 
-                | Some id, _, isParamArray, _ -> 
-                    let prefix =
-                        if isParamArray then
-                            layoutBuiltinAttribute denv denv.g.attrib_ParamArrayAttribute ^^ leftL (tagParameter id.idText)
-                        else
-                            leftL (tagParameter id.idText)
-                    prefix ^^ SepL.colon ^^ layoutTypeWithInfoAndPrec denv env 2 ty
-                        
             let delimitReturnValue = tagPunctuation (if denv.useColonForReturnType then ":" else "->")
-
             let allArgsL = 
-                argInfos 
-                |> List.mapSquared argL 
-                |> List.map (sepListL (wordL (tagPunctuation "*")))
+                layoutArgInfos denv env argInfos
                 |> List.map (fun x -> (x ^^ wordL delimitReturnValue)) 
             (List.foldBack (---) allArgsL rtyL) --- cxsL
 
@@ -1073,6 +1078,12 @@ module private PrintTypes =
         let cxs = cxs |> List.filter (fun (tp, _) -> not (parentTyparTys |> List.exists (fun ty -> match tryDestTyparTy denv.g ty with ValueSome destTypar -> typarEq tp destTypar | _ -> false))) 
         prettyTyparInst, prettyLayoutOfTopTypeInfoAux denv argInfos retTy cxs
 
+
+    let private prettyArgInfos denv allTyparInst =
+        function 
+        | [] -> [(denv.g.unit_ty, ValReprInfo.unnamedTopArg1)] 
+        | infos -> infos |> List.map (map1Of2 (instType allTyparInst)) 
+
     // Layout: type spec - class, datatype, record, abbrev 
 
     let private prettyLayoutOfMemberSigCore denv memberToParentInst (typarInst, methTypars: Typars, argInfos, retTy) = 
@@ -1081,7 +1092,7 @@ module private PrintTypes =
             PrettyTypes.NewPrettyTypars memberToParentInst methTypars methTyparNames
 
         let retTy = instType allTyparInst retTy
-        let argInfos = argInfos |> List.map (fun infos -> if isNil infos then [(denv.g.unit_ty, ValReprInfo.unnamedTopArg1)] else infos |> List.map (map1Of2 (instType allTyparInst))) 
+        let argInfos = argInfos |> List.map (prettyArgInfos denv allTyparInst) 
 
         // Also format dummy types corresponding to any type variables on the container to make sure they 
         // aren't chosen as names for displayed variables. 
@@ -1107,6 +1118,24 @@ module private PrintTypes =
             nameL
         nameL ^^ wordL (tagPunctuation ":") ^^ tauL
 
+
+    let prettyLayoutOfUnresolvedMethodCallArguments denv typarInst argInfos =
+       
+        let argInfos = prettyArgInfos denv typarInst argInfos
+
+        let ___cxs = 
+          argInfos
+          |> List.map (fun (tTy, _) -> 
+            let __tTy,constraints = (PrettyTypes.PrettifyType denv.g tTy)
+            constraints
+          )
+
+        // don't really know what to do to work with CollectInfo below with all the constraints...
+        let cxs = []
+          
+        let env = SimplifyTypes.CollectInfo true (List.collect (List.map fst) [argInfos]) cxs
+        layoutArgInfos denv env [argInfos]
+
     let prettyLayoutOfType denv ty = 
         let ty, cxs = PrettyTypes.PrettifyType denv.g ty
         let env = SimplifyTypes.CollectInfo true [ty] cxs
@@ -1246,7 +1275,7 @@ let layoutConst g ty c = PrintTypes.layoutConst g ty c
 
 let prettyLayoutOfMemberSig denv x = x |> PrintTypes.prettyLayoutOfMemberSig denv 
 let prettyLayoutOfUncurriedSig denv argInfos tau = PrintTypes.prettyLayoutOfUncurriedSig denv argInfos tau
-
+let prettyLayoutOfUnresolvedMethodCallArguments = PrintTypes.prettyLayoutOfUnresolvedMethodCallArguments
 //-------------------------------------------------------------------------
 
 /// Printing info objects

From 59f82b10b68550a22d1a56106dd0c8a33d42f413 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 15 Jan 2020 10:05:17 +0100
Subject: [PATCH 57/96] rework of overload failure message to prettify *ALL*
 types in a single go, not only argument types, but return types and known
 generic argument types (this info was never displayed originally but is
 useful for scenario similar to FSharpPlus implementation)

added `PrettifyDiscriminantAndTypePairs` in TastOps, this allow to weave extra information with the complete list of types, to help reconstituting the several types from their origin (in the usage spot: argument types, return type, generic parameter types)
---
 src/fsharp/CompileOps.fs | 136 ++++++++++++++++-----------------------
 src/fsharp/NicePrint.fs  |  68 +++++++++++++++-----
 src/fsharp/TastOps.fs    |   4 ++
 src/fsharp/TastOps.fsi   |   2 +
 4 files changed, 115 insertions(+), 95 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 3dcbb5af4e..86d61e5c3a 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -767,60 +767,55 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
 
       | UnresolvedOverloading(denv, callerArgs, failure, m) ->
           let nl = System.Environment.NewLine
-          let argsMessage =
-              let prefix = nl + nl
-              let suffix = nl + nl
+          let cx =
+              match failure with
+              | NoOverloadsFound (cx=cx)
+              | PossibleCandidates (cx=cx) -> cx
+              
+          let retTy =
+              cx 
+              |> Option.map (fun cx -> cx.ReturnType)
+              |> Option.flatten
+              |> Option.defaultValue (TType.TType_var (Typar.NewUnlinked()))
+          
+          let genericParameters =
+              cx 
+              |> Option.map (fun cx -> cx.ArgTys)
+              |> Option.defaultValue List.empty
+
+          let argsMessage, returnType, genericParameters =
+              let argRepr = 
+                  callerArgs.ArgumentNamesAndTypes
+                  |> List.map (fun (name,tTy) -> tTy, {ArgReprInfo.Name = name |> Option.map (fun name -> Ident(name, range.Zero)); ArgReprInfo.Attribs = []})
+              let argsL,retTyL,genParamTysL = NicePrint.prettyLayoutsOfUnresolvedOverloading denv argRepr retTy genericParameters
               match callerArgs.ArgumentNamesAndTypes with
-              | [] -> nl + nl
-              | items -> 
-                  // more than one argument, need to lay them out in a single pass
-                  
-                  //let cxs = []
-                  let argsL = 
-                    NicePrint.prettyLayoutOfUnresolvedMethodCallArguments 
-                      denv 
-                      [] 
-                      (items |> List.map (fun (name,tTy) -> tTy, {ArgReprInfo.Name = name |> Option.map (fun name -> Ident(name, range.Zero)); Attribs = []}))
-                      //cxs
-                  let args = argsL |> List.map Layout.showL |> String.concat " "
-                  (*let args = 
-                      items 
-                      |> List.map displayArgType
-                      |> String.concat " * "
-                  *)
+              | [] -> None, Layout.showL retTyL, Layout.showL genParamTysL
+              | items ->
+                  let args = Layout.showL argsL  
                   let prefixMessage =
                       match items with
                       | [_] -> FSComp.SR.csNoOverloadsFoundArgumentsPrefixSingular
                       | _ -> FSComp.SR.csNoOverloadsFoundArgumentsPrefixPlural
-                  prefix + (prefixMessage args) + suffix
+                  Some (prefixMessage args)
+                  , Layout.showL retTyL
+                  , Layout.showL genParamTysL
 
-          let knownReturnType (cx: TraitConstraintInfo option) =
+          let knownReturnType =
               match cx with 
-              | None -> String.Empty
+              | None -> None
               | Some cx ->
-              let prefix = nl + nl
-              let suffix = nl + nl
               match cx.ReturnType with
-              | None -> String.Empty
-              | Some t ->
-                prefix + (NicePrint.prettyStringOfTy denv t |> FSComp.SR.csNoOverloadsFoundReturnType) + suffix
+              | None -> None
+              | Some _ -> Some (FSComp.SR.csNoOverloadsFoundReturnType returnType)
 
-          let genericParametersMessage (cx: TraitConstraintInfo option) =
+          let genericParametersMessage =
               match cx with 
-              | None -> String.Empty
+              | None -> None
               | Some cx ->
-              let prefix = nl + nl
-              let suffix = nl + nl
-            
               match cx.ArgTys  with
-              | [] -> nl + nl
-              | [item] -> prefix + (item |> NicePrint.prettyStringOfTy denv |> FSComp.SR.csNoOverloadsFoundTypeParametersPrefixSingular) + suffix
-              | items ->
-                let args =
-                  items
-                  |> List.map (NicePrint.prettyStringOfTy denv)
-                  |> String.concat ", "
-                prefix + (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixPlural args) + suffix
+              | [] -> None
+              | [_] -> Some (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixSingular genericParameters)
+              | _ -> Some (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixPlural genericParameters)
 
           let formatOverloads (overloads: OverloadInformation list) =
               overloads
@@ -828,45 +823,28 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
               |> List.sort
               |> List.map FSComp.SR.formatDashItem
               |> String.concat nl
-          let formatTraitInfo (cx: TraitConstraintInfo) =
-
-            let prettyArgTys =
-              cx.ArgTys 
-              |> List.map (NicePrint.prettyStringOfTy denv)
-              |> String.concat ", "
-                          
-            [ sprintf "cx.ArgTys      %s" prettyArgTys
-              sprintf "cx.MemberFlags %A" cx.MemberFlags
-              sprintf "cx.MemberName  %A" cx.MemberName
-              sprintf "cx.ReturnType  %A" (cx.ReturnType |> Option.map (NicePrint.prettyStringOfTy denv))
-              sprintf "cx.Solution    %A" cx.Solution
-              sprintf "cx._Tys        %A" (cx._Tys |> List.map (NicePrint.prettyStringOfTy denv))
-            
-            ] |> String.concat nl
-          let cx, msg =
+         
+          let msg =
+              let optionalParts =
+                [knownReturnType; genericParametersMessage; argsMessage]
+                |> List.choose id
+                |> String.concat (nl + nl)
+                |> function | "" -> String.Empty
+                            | result -> nl + nl + result + nl + nl
+              
               match failure with
-              | NoOverloadsFound (methodName, overloads, cx) ->
-                cx
-                , FSComp.SR.csNoOverloadsFound methodName
-                  + (knownReturnType cx) 
-                  + (genericParametersMessage cx)
-                  + argsMessage
-                  + (FSComp.SR.csAvailableOverloads (formatOverloads overloads))
-              | PossibleCandidates (methodName, methodNames, cx) ->
-                  cx
-                  , (let msg = FSComp.SR.csMethodIsOverloaded methodName
-                     match methodNames with
-                     | [] -> msg
-                     | names -> 
-                         let overloads = FSComp.SR.csCandidates (formatOverloads names)
-                         msg 
-                         + (knownReturnType cx)
-                         + (genericParametersMessage cx)
-                         + argsMessage
-                         + overloads)
-                  
-          let traitInfo = cx |> Option.map (fun cx -> nl + nl + "TRAIIAT" + nl + formatTraitInfo cx + nl + nl) |> Option.defaultValue ""
-          os.Append (msg + traitInfo) |> ignore
+              | NoOverloadsFound (methodName, overloads, _) ->
+                  FSComp.SR.csNoOverloadsFound methodName
+                      + optionalParts                      
+                      + (FSComp.SR.csAvailableOverloads (formatOverloads overloads))
+              | PossibleCandidates (methodName, [], _) ->
+                  FSComp.SR.csMethodIsOverloaded methodName
+              | PossibleCandidates (methodName, overloads, _) ->
+                  FSComp.SR.csMethodIsOverloaded methodName
+                      + optionalParts
+                      + FSComp.SR.csCandidates (formatOverloads overloads)
+          
+          os.Append msg |> ignore
 
       | UnresolvedConversionOperator(denv, fromTy, toTy, _) -> 
           let t1, t2, _tpcs = NicePrint.minimalStringsOfTwoTypes denv fromTy toTy
diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs
index e5296cdf6e..4a93881db3 100644
--- a/src/fsharp/NicePrint.fs
+++ b/src/fsharp/NicePrint.fs
@@ -1019,10 +1019,26 @@ module private PrintTypes =
             |> List.map (sepListL (wordL (tagPunctuation "*")))
         allArgsL
 
+    let layoutReturnType denv env rty = layoutTypeWithInfoAndPrec denv env 4 rty
+
+    let layoutGenericParameterTypes denv env = 
+      function
+      | [] -> emptyL
+      | genParamTys ->
+        (wordL (tagPunctuation "<"))
+        ^^
+        (
+          genParamTys
+          |> List.map (layoutTypeWithInfoAndPrec denv env 4)
+          |> sepListL (wordL (tagPunctuation ","))
+        ) 
+        ^^
+        (wordL (tagPunctuation ">"))
+
     /// Layout a single type used as the type of a member or value 
     let layoutTopType denv env argInfos rty cxs =
         // Parenthesize the return type to match the topValInfo 
-        let rtyL = layoutTypeWithInfoAndPrec denv env 4 rty
+        let rtyL = layoutReturnType denv env rty
         let cxsL = layoutConstraintsWithInfo denv env cxs
         match argInfos with
         | [] -> rtyL --- cxsL
@@ -1118,23 +1134,43 @@ module private PrintTypes =
             nameL
         nameL ^^ wordL (tagPunctuation ":") ^^ tauL
 
-
-    let prettyLayoutOfUnresolvedMethodCallArguments denv typarInst argInfos =
-       
+    /// layouts the elements of an unresolved overloaded method call:
+    /// argInfos: unammed and named arguments
+    /// retTy: return type
+    /// genParamTy: generic parameter types
+    let prettyLayoutsOfUnresolvedOverloading denv argInfos retTy genParamTys =
+        let _niceMethodTypars, typarInst =
+            let memberToParentInst = List.empty
+            let typars = argInfos |> List.choose (function (TType.TType_var typar,_) -> Some typar | _ -> None)
+            let methTyparNames = typars |> List.mapi (fun i tp -> if (PrettyTypes.NeedsPrettyTyparName tp) then sprintf "a%d" (List.length memberToParentInst + i) else tp.Name)
+            PrettyTypes.NewPrettyTypars memberToParentInst typars methTyparNames
+        let retTy = instType typarInst retTy
         let argInfos = prettyArgInfos denv typarInst argInfos
+        let argInfos,retTy,genParamTys, cxs =
+          let typesWithDiscrimants =
+            [
+              yield 0uy,retTy 
+              for ty,_ in argInfos do
+                yield 1uy, ty
+              for ty in genParamTys do
+                yield 2uy, ty
+            ]
+          let typesWithDiscrimants,typarsAndCxs = PrettyTypes.PrettifyDiscriminantAndTypePairs denv.g typesWithDiscrimants
+          let argInfos = 
+            typesWithDiscrimants 
+            |> List.choose (function (1uy,ty) -> Some ty | _ -> None)
+            |> List.zip argInfos 
+            |> List.map (fun ((_,argInfo),tTy) -> tTy, argInfo)
+          let genParamTys = 
+            typesWithDiscrimants
+            |> List.choose (function (2uy,ty) -> Some ty | _ -> None)
+          argInfos, retTy, genParamTys, typarsAndCxs
 
-        let ___cxs = 
-          argInfos
-          |> List.map (fun (tTy, _) -> 
-            let __tTy,constraints = (PrettyTypes.PrettifyType denv.g tTy)
-            constraints
-          )
-
-        // don't really know what to do to work with CollectInfo below with all the constraints...
-        let cxs = []
-          
         let env = SimplifyTypes.CollectInfo true (List.collect (List.map fst) [argInfos]) cxs
-        layoutArgInfos denv env [argInfos]
+        let cxsL = layoutConstraintsWithInfo denv env env.postfixConstraints
+        List.foldBack (---) (layoutArgInfos denv env [argInfos]) cxsL
+        , layoutReturnType denv env retTy
+        , layoutGenericParameterTypes denv env genParamTys
 
     let prettyLayoutOfType denv ty = 
         let ty, cxs = PrettyTypes.PrettifyType denv.g ty
@@ -1275,7 +1311,7 @@ let layoutConst g ty c = PrintTypes.layoutConst g ty c
 
 let prettyLayoutOfMemberSig denv x = x |> PrintTypes.prettyLayoutOfMemberSig denv 
 let prettyLayoutOfUncurriedSig denv argInfos tau = PrintTypes.prettyLayoutOfUncurriedSig denv argInfos tau
-let prettyLayoutOfUnresolvedMethodCallArguments = PrintTypes.prettyLayoutOfUnresolvedMethodCallArguments
+let prettyLayoutsOfUnresolvedOverloading denv argInfos retTy genericParameters = PrintTypes.prettyLayoutsOfUnresolvedOverloading denv argInfos retTy genericParameters
 //-------------------------------------------------------------------------
 
 /// Printing info objects
diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs
index 8eb6e70cf5..b97c518d23 100644
--- a/src/fsharp/TastOps.fs
+++ b/src/fsharp/TastOps.fs
@@ -2510,6 +2510,10 @@ module PrettyTypes =
     let PrettifyType g x = PrettifyThings g id id x
     let PrettifyTypePair g x = PrettifyThings g (fun f -> foldPair (f, f)) (fun f -> mapPair (f, f)) x
     let PrettifyTypes g x = PrettifyThings g List.fold List.map x
+    let PrettifyDiscriminantAndTypePairs g x = 
+      let tys, cxs = (PrettifyThings g List.fold List.map (x |> List.map snd))
+      List.zip (List.map fst x) tys, cxs
+      
     let PrettifyCurriedTypes g x = PrettifyThings g (fun f -> List.fold (List.fold f)) List.mapSquared x
     let PrettifyCurriedSigTypes g x = PrettifyThings g (fun f -> foldPair (List.fold (List.fold f), f)) (fun f -> mapPair (List.mapSquared f, f)) x
 
diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi
index f57de99fb0..b3bca57a74 100755
--- a/src/fsharp/TastOps.fsi
+++ b/src/fsharp/TastOps.fsi
@@ -931,6 +931,8 @@ module PrettyTypes =
     val PrettifyTypePair : TcGlobals -> TType * TType -> (TType * TType) * TyparConstraintsWithTypars
 
     val PrettifyTypes : TcGlobals -> TTypes -> TTypes * TyparConstraintsWithTypars
+    
+    val PrettifyDiscriminantAndTypePairs : TcGlobals -> ('Discriminant * TType) list -> ('Discriminant * TType) list * TyparConstraintsWithTypars
 
     val PrettifyInst : TcGlobals -> TyparInst -> TyparInst * TyparConstraintsWithTypars
 

From 7b8fdfce80706ebd1f17184b61a26cc2651d747d Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 15 Jan 2020 10:07:47 +0100
Subject: [PATCH 58/96] fixup the tests and add two tests

* one checking on the new information of known return type and generic parameter types
* one checking we don't leak internal unammed Typar and that they don't all get named 'a despite being different
---
 tests/fsharp/tests.fs                         |  2 +
 .../neg_generic_known_argument_types.bsl      | 13 +++
 .../neg_generic_known_argument_types.fsx      | 10 +++
 ...n_return_type_and_known_type_arguments.bsl | 49 ++++++++++
 ...n_return_type_and_known_type_arguments.fsx | 90 +++++++++++++++++++
 .../overloads/neg_many_many_overloads.bsl     |  2 +-
 6 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.bsl
 create mode 100644 tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.fsx
 create mode 100644 tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl
 create mode 100644 tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.fsx

diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index 4dea13d9ce..45445bdb92 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -2973,4 +2973,6 @@ module OverloadResolution =
     module ``ad hoc code overload error messages``=
         let [<Test>] ``neg_many_many_overloads`` () = singleNegTest (testConfig "typecheck/overloads") "neg_many_many_overloads"
         let [<Test>] ``neg_interface_generics`` () = singleNegTest (testConfig "typecheck/overloads") "neg_interface_generics"
+        let [<Test>] ``neg_known_return_type_and_known_type_arguments`` () = singleNegTest (testConfig "typecheck/overloads") "neg_known_return_type_and_known_type_arguments"
+        let [<Test>] ``neg_generic_known_argument_types`` () = singleNegTest (testConfig "typecheck/overloads") "neg_generic_known_argument_types"
 #endif
\ No newline at end of file
diff --git a/tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.bsl b/tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.bsl
new file mode 100644
index 0000000000..edb000e24b
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.bsl
@@ -0,0 +1,13 @@
+
+neg_generic_known_argument_types.fsx(9,16,9,49): typecheck error FS0041: A unique overload for method 'Foo' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+
+
+Known types of arguments:  ^fa * 'fb * 'a * argD:'c when  ^fa : (member X :  ^fa *  ^b ->  ^b) and  ^b : (member BBBB :  ^b -> unit)
+
+
+
+Candidates:
+ - static member A.Foo : argA1:'a * argB1:('a -> 'b) * argC1:('a -> 'b) * argD:('a -> 'b) * argZ1:'zzz -> 'b
+
+ - static member A.Foo : argA2:'a * argB2:('a -> 'b) * argC2:('b -> 'c) * argD:('c -> 'd) * argZ2:'zzz -> 'd
diff --git a/tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.fsx b/tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.fsx
new file mode 100644
index 0000000000..60b76f772a
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.fsx
@@ -0,0 +1,10 @@
+open System.Runtime.InteropServices
+  
+type A<'zzz> =
+  static member Foo(argA1: 'a, argB1: 'a -> 'b) : 'b = argB1 argA1
+  static member Foo(argA1: 'a, argB1: 'a -> 'b, argC1: 'a -> 'b, argD: 'a -> 'b, [<Optional>] argZ1: 'zzz) : 'b = argB1 argA1
+  static member Foo(argA2: 'a, argB2: 'a -> 'b, argC2: 'b -> 'c, argD: 'c -> 'd, [<Optional>] argZ2: 'zzz) : 'd = argD (argC2( argB2 argA2))
+  
+let inline f (aa: 'fa) (ab: 'fb) ac ad : 'e when (^fa) : (member X : 'b -> 'b) and (^b) : (member BBBB : unit -> unit) =
+  let e : 'e = A<obj>.Foo(aa, ab, ac, argD = ad)
+  e
\ No newline at end of file
diff --git a/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl b/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl
new file mode 100644
index 0000000000..512d36df81
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl
@@ -0,0 +1,49 @@
+
+neg_known_return_type_and_known_type_arguments.fsx(90,24,90,28): typecheck error FS0001: No overloads match for method 'Zero'.
+
+
+
+Known return type: MonoidSample
+
+
+
+Known type parameters: < MonoidSample , Zero >
+
+
+
+Available overloads:
+ - static member Zero.Zero :  ^t * Default1 ->  ^t when  ^t : (static member get_Zero : ->  ^t)
+
+ - static member Zero.Zero :  ^t * Default1 -> ('a1 -> 'a1) when  ^t : null and  ^t : struct
+
+ - static member Zero.Zero :  ^t * Default2 ->  ^t when (FromInt32 or  ^t) : (static member FromInt32 :  ^t * FromInt32 -> int32 ->  ^t)
+
+ - static member Zero.Zero :  ^t * Default2 -> ('a1 -> 'a1) when  ^t : null and  ^t : struct
+
+ - static member Zero.Zero :  ^t * Default3 ->  ^t when  ^t : (static member get_Empty : ->  ^t)
+
+ - static member Zero.Zero : 'a array * Zero -> 'a array
+
+ - static member Zero.Zero : 'a list * Zero -> 'a list
+
+ - static member Zero.Zero : 'a option * Zero -> 'a option
+
+ - static member Zero.Zero : ('T ->  ^Monoid) * Zero -> ('T ->  ^Monoid) when (Zero or  ^Monoid) : (static member Zero :  ^Monoid * Zero ->  ^Monoid)
+
+ - static member Zero.Zero : Async< ^a> * Zero -> Async< ^a> when (Zero or  ^a) : (static member Zero :  ^a * Zero ->  ^a)
+
+ - static member Zero.Zero : Lazy< ^a> * Zero -> Lazy< ^a> when (Zero or  ^a) : (static member Zero :  ^a * Zero ->  ^a)
+
+ - static member Zero.Zero : Map<'a,'b> * Zero -> Map<'a,'b> when 'a : comparison
+
+ - static member Zero.Zero : ResizeArray<'a> * Zero -> ResizeArray<'a>
+
+ - static member Zero.Zero : Set<'a> * Zero -> Set<'a> when 'a : comparison
+
+ - static member Zero.Zero : System.TimeSpan * Zero -> System.TimeSpan
+
+ - static member Zero.Zero : seq<'a> * Zero -> seq<'a>
+
+ - static member Zero.Zero : string * Zero -> string
+
+ - static member Zero.Zero : unit * Zero -> unit
diff --git a/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.fsx b/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.fsx
new file mode 100644
index 0000000000..db2b2ae297
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.fsx
@@ -0,0 +1,90 @@
+open System.Runtime.CompilerServices
+open System.Runtime.InteropServices
+open System.Runtime.InteropServices
+type Default6 = class end
+type Default5 = class inherit Default6 end
+type Default4 = class inherit Default5 end
+type Default3 = class inherit Default4 end
+type Default2 = class inherit Default3 end
+type Default1 = class inherit Default2 end
+
+[<Extension; Sealed>]
+type Plus =     
+    inherit Default1
+    static member inline ``+`` (x: 'Plus             , y: 'Plus             ,             _mthd: Default2) = (^Plus :  (static member (<|>) : _*_ -> _) x, y) : ^Plus
+    static member inline ``+`` (x: 'Plus             , y: 'Plus             , [<Optional>]_mthd: Default1) = x + y : ^Plus
+    static member inline ``+`` (_: ^t when ^t: null and ^t: struct, _: ^t   , [<Optional>]_mthd: Default1) = id
+    
+    static member inline Invoke (x: 'Plus) (y: 'Plus) : 'Plus =
+        let inline call (mthd : ^M, input1 : ^I, input2 : ^I) = ((^M or ^I) : (static member ``+`` : _*_*_ -> _) input1, input2, mthd)
+        call (Unchecked.defaultof<Plus>, x, y)
+
+type FromInt32 =
+  inherit Default1
+  static member inline FromInt32 (_: ^R        , _: Default1 ) = fun (x: int32) -> (^R : (static member FromInt32 : _ -> ^R) x)
+  static member inline FromInt32 (_: Default1  , _: Default1 ) = fun (x: int32) -> (^R : (static member FromInt32 : _ -> ^R) x)
+  static member        FromInt32 (_: int32     , _: FromInt32) = fun (x: int32) ->                 x
+  static member        FromInt32 (_: int64     , _: FromInt32) = fun (x: int32) -> int64           x
+  #if !FABLE_COMPILER
+  static member        FromInt32 (_: nativeint , _: FromInt32) = fun (x: int32) -> nativeint  (int x)
+  static member        FromInt32 (_: unativeint, _: FromInt32) = fun (x: int32) -> unativeint (int x)
+  #endif
+  static member        FromInt32 (_: bigint    , _: FromInt32) = fun (x: int32) -> bigint          x
+  static member        FromInt32 (_: float     , _: FromInt32) = fun (x: int32) -> float           x
+  static member        FromInt32 (_: sbyte     , _: FromInt32) = fun (x: int32) -> sbyte           x
+  static member        FromInt32 (_: int16     , _: FromInt32) = fun (x: int32) -> int16           x
+  static member        FromInt32 (_: byte      , _: FromInt32) = fun (x: int32) -> byte            x
+  static member        FromInt32 (_: uint16    , _: FromInt32) = fun (x: int32) -> uint16          x
+  static member        FromInt32 (_: uint32    , _: FromInt32) = fun (x: int32) -> uint32          x
+  static member        FromInt32 (_: uint64    , _: FromInt32) = fun (x: int32) -> uint64          x
+  static member        FromInt32 (_: float32   , _: FromInt32) = fun (x: int32) -> float32         x
+  static member        FromInt32 (_: decimal   , _: FromInt32) = fun (x: int32) -> decimal         x
+
+  static member inline Invoke (x: int32) : 'Num =
+      let inline call_2 (a: ^a, b: ^b) = ((^a or ^b) : (static member FromInt32 : _*_ -> _) b, a)
+      let inline call (a: 'a) = fun (x: 'x) -> call_2 (a, Unchecked.defaultof<'r>) x : 'r
+      call Unchecked.defaultof<FromInt32> x
+
+type Zero =
+  inherit Default1
+  static member inline Zero (_: 't                             , _: Default3) = (^t : (static member Empty : ^t) ()) : 't
+  static member inline Zero (_: 't                             , _: Default2) = FromInt32.Invoke 0             : 't
+  static member inline Zero (_: ^t when ^t: null and ^t: struct, _: Default2) = id
+  static member inline Zero (_: 't                             , _: Default1) = LanguagePrimitives.GenericZero : 't
+  static member inline Zero (_: ^t when ^t: null and ^t: struct, _: Default1) = id
+  static member        Zero (_: System.TimeSpan                , _: Zero    ) = System.TimeSpan ()
+  static member        Zero (_: list<'a>                       , _: Zero    ) = []   :   list<'a>
+  static member        Zero (_: option<'a>                     , _: Zero    ) = None : option<'a>
+  static member        Zero (_: array<'a>                      , _: Zero    ) = [||] :  array<'a>
+  static member        Zero (_: string                         , _: Zero    ) = ""
+  static member        Zero (_: unit                           , _: Zero    ) = ()
+  static member        Zero (_: Set<'a>                        , _: Zero    ) = Set.empty : Set<'a>
+  static member        Zero (_: Map<'a,'b>                     , _: Zero    ) = Map.empty : Map<'a,'b>
+
+  static member inline Invoke () = 
+      let inline call_2 (a: ^a, b: ^b) = ((^a or ^b) : (static member Zero : _*_ -> _) b, a)
+      let inline call (a: 'a) = call_2 (a, Unchecked.defaultof<'r>) : 'r
+      call Unchecked.defaultof<Zero>
+
+type Zero with
+  static member inline Zero (_: 'T->'Monoid               , _: Zero) = (fun _ -> Zero.Invoke ()) : 'T->'Monoid
+  static member inline Zero (_: Async<'a>                 , _: Zero) = let (v: 'a) = Zero.Invoke () in async.Return v
+  static member inline Zero (_: Lazy<'a>                  , _: Zero) = let (v: 'a) = Zero.Invoke () in lazy v
+  static member        Zero (_: ResizeArray<'a>           , _: Zero) = ResizeArray () : ResizeArray<'a>
+  static member        Zero (_: seq<'a>                   , _: Zero) = Seq.empty      : seq<'a>
+
+let inline (++) (x: 'Monoid) (y: 'Monoid) : 'Monoid = Plus.Invoke x y
+let inline zero< ^Monoid when (Zero or ^Monoid) : (static member Zero : ^Monoid * Zero -> ^Monoid) > : ^Monoid = Zero.Invoke ()
+
+type MonoidSample = 
+  | MonoidSample of int
+
+  static member getr_Zero () = MonoidSample 0
+  //static member (+) (MonoidSample(x), MonoidSample(y)) = MonoidSample (x+y)
+  static member (+) (MonoidSample(x), y) = MonoidSample (x+y), 1
+  static member (+) (x,MonoidSample(y)) = MonoidSample (x+y)
+  static member (+) (x, y) = MonoidSample (x+y), 3
+
+let a = MonoidSample 1
+let b = MonoidSample 2
+let c : MonoidSample = zero
diff --git a/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl b/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
index 6fa1f1201c..a4fd73d0d7 100644
--- a/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
@@ -3,7 +3,7 @@ neg_many_many_overloads.fsx(123,1,123,13): typecheck error FS0041: A unique over
 
 
 
-Known type of argument: 'a when 'a : null
+Known type of argument: 'a0 when 'a0 : null
 
 
 

From a956bce4af8c2399c01172a347bcfc90206ef1b8 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 16 Jan 2020 23:15:38 +0100
Subject: [PATCH 59/96] updating baselines that got tighter.

---
 .../expressions/syntacticsugar/E_Slices01.bsl | 24 +--------
 .../E_RigidTypeAnnotation03.bsl               | 32 ------------
 .../E_LeftToRightOverloadResolution01.bsl     | 32 ------------
 .../inference/E_OneTypeVariable03.bsl         | 11 ----
 .../inference/E_OneTypeVariable03rec.bsl      | 11 ----
 .../E_TwoDifferentTypeVariables01.bsl         | 20 --------
 .../E_TwoDifferentTypeVariables01rec.bsl      | 20 --------
 .../E_TwoDifferentTypeVariablesGen00.bsl      | 15 ------
 .../E_TwoDifferentTypeVariablesGen00.fsx      | 20 --------
 .../inference/E_TwoEqualTypeVariables02.bsl   | 33 ------------
 .../E_TwoEqualYypeVariables02rec.bsl          | 33 ------------
 .../E_LessThanDotOpenParen001.bsl             | 24 ++-------
 .../E_Clashing_Values_in_AbstractClass01.bsl  |  7 +--
 .../E_Clashing_Values_in_AbstractClass03.bsl  | 10 ----
 .../E_Clashing_Values_in_AbstractClass04.bsl  | 10 ----
 ...g_System.Convert.ToString.OverloadList.bsl | 51 +------------------
 ....Threading.Tasks.Task.Run.OverloadList.bsl | 30 -----------
 .../neg_generic_known_argument_types.bsl      |  5 --
 .../overloads/neg_interface_generics.bsl      |  5 --
 ...n_return_type_and_known_type_arguments.bsl | 23 ---------
 20 files changed, 8 insertions(+), 408 deletions(-)

diff --git a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
index 657ca3422b..6980b299e2 100644
--- a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
+++ b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
@@ -1,54 +1,34 @@
 
 E_Slices01.fsx(15,9,15,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: int * int option * 'a option
 
-
-
 Candidates:
  - member Foo.GetSlice : x:int * y1:int option * y2:float option -> unit
-
  - member Foo.GetSlice : x:int * y1:int option * y2:int option -> unit
 
 E_Slices01.fsx(16,9,16,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
-Known types of arguments: int * 'a option * 'a option
-
-
+Known types of arguments: int * 'a option * 'b option
 
 Candidates:
  - member Foo.GetSlice : x:int * y1:int option * y2:float option -> unit
-
  - member Foo.GetSlice : x:int * y1:int option * y2:int option -> unit
 
 E_Slices01.fsx(17,9,17,19): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a option * int option * int
 
-
-
 Candidates:
  - member Foo.GetSlice : x1:float option * x2:int option * y:int -> unit
-
  - member Foo.GetSlice : x1:int option * x2:int option * y:int -> unit
 
 E_Slices01.fsx(18,9,18,17): typecheck error FS0041: A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
-Known types of arguments: 'a option * 'a option * int
-
-
+Known types of arguments: 'a option * 'b option * int
 
 Candidates:
  - member Foo.GetSlice : x1:float option * x2:int option * y:int -> unit
-
  - member Foo.GetSlice : x1:int option * x2:int option * y:int -> unit
 
 E_Slices01.fsx(19,9,19,17): typecheck error FS0039: The field, constructor or member 'Item' is not defined.
diff --git a/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
index 97435593f7..fcf7ffa0ca 100644
--- a/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
+++ b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
@@ -6,21 +6,13 @@ but here has type
 
 E_RigidTypeAnnotation03.fsx(17,9,17,25): typecheck error FS0041: No overloads match for method 'M'.
 
-
-
 Known type of argument: sbyte
 
-
-
 Available overloads:
  - static member T.M : a:byte -> int
-
  - static member T.M : a:decimal<Kg> -> int
-
  - static member T.M : a:float -> int
-
  - static member T.M : a:float32<Kg> -> int
-
  - static member T.M : a:string -> int
 
 E_RigidTypeAnnotation03.fsx(18,13,18,19): typecheck error FS0001: This expression was expected to have type
@@ -30,21 +22,13 @@ but here has type
 
 E_RigidTypeAnnotation03.fsx(18,9,18,30): typecheck error FS0041: No overloads match for method 'M'.
 
-
-
 Known type of argument: float32
 
-
-
 Available overloads:
  - static member T.M : a:byte -> int
-
  - static member T.M : a:decimal<Kg> -> int
-
  - static member T.M : a:float -> int
-
  - static member T.M : a:float32<Kg> -> int
-
  - static member T.M : a:string -> int
 
 E_RigidTypeAnnotation03.fsx(19,13,19,20): typecheck error FS0001: This expression was expected to have type
@@ -60,21 +44,13 @@ The unit of measure 'N s ^ 2' does not match the unit of measure 'Kg'
 
 E_RigidTypeAnnotation03.fsx(20,9,20,39): typecheck error FS0041: No overloads match for method 'M'.
 
-
-
 Known type of argument: decimal<N s ^ 2>
 
-
-
 Available overloads:
  - static member T.M : a:byte -> int
-
  - static member T.M : a:decimal<Kg> -> int
-
  - static member T.M : a:float -> int
-
  - static member T.M : a:float32<Kg> -> int
-
  - static member T.M : a:string -> int
 
 E_RigidTypeAnnotation03.fsx(21,14,21,18): typecheck error FS0001: This expression was expected to have type
@@ -84,19 +60,11 @@ but here has type
 
 E_RigidTypeAnnotation03.fsx(21,9,21,27): typecheck error FS0041: No overloads match for method 'M'.
 
-
-
 Known type of argument: char
 
-
-
 Available overloads:
  - static member T.M : a:byte -> int
-
  - static member T.M : a:decimal<Kg> -> int
-
  - static member T.M : a:float -> int
-
  - static member T.M : a:float32<Kg> -> int
-
  - static member T.M : a:string -> int
diff --git a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
index 0ef22fbc79..af2b7e0280 100644
--- a/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
+++ b/tests/fsharp/conformance/inference/E_LeftToRightOverloadResolution01.bsl
@@ -1,70 +1,38 @@
 
 E_LeftToRightOverloadResolution01.fsx(7,23,7,51): typecheck error FS0041: A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: 'a
 
-
-
 Candidates:
  - System.Console.WriteLine(buffer: char []) : unit
-
  - System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit
-
  - System.Console.WriteLine(value: bool) : unit
-
  - System.Console.WriteLine(value: char) : unit
-
  - System.Console.WriteLine(value: decimal) : unit
-
  - System.Console.WriteLine(value: float) : unit
-
  - System.Console.WriteLine(value: float32) : unit
-
  - System.Console.WriteLine(value: int) : unit
-
  - System.Console.WriteLine(value: int64) : unit
-
  - System.Console.WriteLine(value: obj) : unit
-
  - System.Console.WriteLine(value: string) : unit
-
  - System.Console.WriteLine(value: uint32) : unit
-
  - System.Console.WriteLine(value: uint64) : unit
 
 E_LeftToRightOverloadResolution01.fsx(9,23,9,51): typecheck error FS0041: A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: 'a
 
-
-
 Candidates:
  - System.Console.WriteLine(buffer: char []) : unit
-
  - System.Console.WriteLine(format: string, [<System.ParamArray>] arg: obj []) : unit
-
  - System.Console.WriteLine(value: bool) : unit
-
  - System.Console.WriteLine(value: char) : unit
-
  - System.Console.WriteLine(value: decimal) : unit
-
  - System.Console.WriteLine(value: float) : unit
-
  - System.Console.WriteLine(value: float32) : unit
-
  - System.Console.WriteLine(value: int) : unit
-
  - System.Console.WriteLine(value: int64) : unit
-
  - System.Console.WriteLine(value: obj) : unit
-
  - System.Console.WriteLine(value: string) : unit
-
  - System.Console.WriteLine(value: uint32) : unit
-
  - System.Console.WriteLine(value: uint64) : unit
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl b/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
index 9e72bb379b..4bfe7f854e 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03.bsl
@@ -1,28 +1,17 @@
 
 E_OneTypeVariable03.fsx(60,34,60,44): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * int
 
-
-
 Candidates:
  - static member C23.M : x:'a * y:'b -> Two
-
  - static member C23.M : x:'a * y:int -> Three
 
 E_OneTypeVariable03.fsx(61,34,61,45): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * int
 
-
-
 Candidates:
  - static member C123.M : x:'a * y:'a -> One
-
  - static member C123.M : x:'a * y:'b -> Two
-
  - static member C123.M : x:'a * y:int -> Three
diff --git a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
index edfc05dcce..ebce435a10 100644
--- a/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
+++ b/tests/fsharp/conformance/inference/E_OneTypeVariable03rec.bsl
@@ -1,28 +1,17 @@
 
 E_OneTypeVariable03rec.fsx(60,38,60,48): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * int
 
-
-
 Candidates:
  - static member C23.M : x:'a * y:'b -> Two
-
  - static member C23.M : x:'a * y:int -> Three
 
 E_OneTypeVariable03rec.fsx(61,38,61,49): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * int
 
-
-
 Candidates:
  - static member C123.M : x:'a * y:'a -> One
-
  - static member C123.M : x:'a * y:'b -> Two
-
  - static member C123.M : x:'a * y:int -> Three
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
index de6bdbda87..68f02f0b66 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01.bsl
@@ -1,52 +1,32 @@
 
 E_TwoDifferentTypeVariables01.fsx(61,33,61,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariables01.fsx(62,33,62,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C24.M : x:'a * y:'b -> Two
-
  - static member C24.M : x:'a * y:C -> Four
 
 E_TwoDifferentTypeVariables01.fsx(63,33,63,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariables01.fsx(64,33,64,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
index db326483ff..ebce84002e 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariables01rec.bsl
@@ -1,52 +1,32 @@
 
 E_TwoDifferentTypeVariables01rec.fsx(60,37,60,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariables01rec.fsx(61,37,61,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C24.M : x:'a * y:'b -> Two
-
  - static member C24.M : x:'a * y:C -> Four
 
 E_TwoDifferentTypeVariables01rec.fsx(62,37,62,51): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariables01rec.fsx(63,37,63,50): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
index 4d4e288a5d..c7e86d6047 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.bsl
@@ -11,15 +11,10 @@ E_TwoDifferentTypeVariablesGen00.fsx(62,18,62,42): typecheck error FS0043: The t
 
 E_TwoDifferentTypeVariablesGen00.fsx(63,45,63,55): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariablesGen00.fsx(64,56,64,57): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
@@ -36,15 +31,10 @@ E_TwoDifferentTypeVariablesGen00.fsx(65,18,65,42): typecheck error FS0043: The t
 
 E_TwoDifferentTypeVariablesGen00.fsx(66,45,66,59): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariablesGen00.fsx(67,55,67,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
@@ -55,15 +45,10 @@ E_TwoDifferentTypeVariablesGen00.fsx(67,18,67,42): typecheck error FS0043: The t
 
 E_TwoDifferentTypeVariablesGen00.fsx(68,45,68,58): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariablesGen00.fsx(69,55,69,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type 'int'.
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx
index b4c54e0eaa..304f668142 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00.fsx
@@ -67,23 +67,3 @@ module M0Rec =
     let rec      gD1<'a,'b> (x:'a) (y:'b) = C1.M<_>(x,y) = One       // expect: type error
     let rec     gD13<'a,'b> (x:'a) (y:'b) = C13.M<_>(x,y)            // expect: ambiguity error (and note: both would instantiate 'a or 'b)
     let rec      gD3<'a,'b> (x:'a) (y:'b) = C3.M<_>(x,y)  = Three    // expect: error
-
-//<Expects spans="(60,52-60,53)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
-//<Expects spans="(60,18-60,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
-//<Expects spans="(60,18-60,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
-//<Expects spans="(61,52-61,53)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type 'int'\.</Expects>
-//<Expects spans="(61,18-61,42)" status="error" id="FS0043">The type ''b' does not match the type 'int'</Expects>
-//<Expects status="error" span="(63,45-63,55)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects spans="(63,56-63,57)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
-//<Expects spans="(63,18-63,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
-//<Expects spans="(63,18-63,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
-//<Expects spans="(64,54-64,55)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
-//<Expects spans="(64,56-64,57)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type 'int'\.</Expects>
-//<Expects spans="(64,18-64,42)" status="error" id="FS0043">The type ''a' does not match the type 'int'</Expects>
-//<Expects status="error" span="(66,45-66,59)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects spans="(66,55-66,56)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'a has been constrained to be type ''b'\.</Expects>
-//<Expects spans="(66,18-66,42)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'\.</Expects>
-//<Expects spans="(66,18-66,42)" status="error" id="FS0043">The type ''b' does not match the type ''b0'</Expects>
-//<Expects status="error" span="(68,45-68,58)" id="FS0041">A unique overload for method 'M' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: static member C13\.M : x:'a \* y:'a -> One, static member C13\.M : x:'a \* y:int -> Three$</Expects>
-//<Expects spans="(68,55-68,56)" status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type 'int'\.</Expects>
-//<Expects spans="(68,18-68,42)" status="error" id="FS0043">The type ''b' does not match the type 'int'</Expects>
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
index b07a943366..e1ce253e98 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoEqualTypeVariables02.bsl
@@ -1,84 +1,51 @@
 
 E_TwoEqualTypeVariables02.fsx(61,33,61,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C12.M : x:'a * y:'a -> One
-
  - static member C12.M : x:'a * y:'b -> Two
 
 E_TwoEqualTypeVariables02.fsx(62,33,62,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C14.M : x:'a * y:'a -> One
-
  - static member C14.M : x:'a * y:C -> Four
 
 E_TwoEqualTypeVariables02.fsx(63,33,63,43): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C24.M : x:'a * y:'b -> Two
-
  - static member C24.M : x:'a * y:C -> Four
 
 E_TwoEqualTypeVariables02.fsx(64,33,64,44): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C123.M : x:'a * y:'a -> One
-
  - static member C123.M : x:'a * y:'b -> Two
-
  - static member C123.M : x:'a * y:int -> Three
 
 E_TwoEqualTypeVariables02.fsx(65,33,65,45): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C1234.M : x:'a * y:'a -> One
-
  - static member C1234.M : x:'a * y:'b -> Two
-
  - static member C1234.M : x:'a * y:C -> Four
-
  - static member C1234.M : x:'a * y:int -> Three
 
 E_TwoEqualTypeVariables02.fsx(66,33,66,46): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C14.M : x:'a * y:'a -> One
-
  - static member C14.M : x:'a * y:C -> Four
diff --git a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
index fdb19e54d0..d206b5b662 100644
--- a/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoEqualYypeVariables02rec.bsl
@@ -1,84 +1,51 @@
 
 E_TwoEqualYypeVariables02rec.fsx(60,37,60,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C12.M : x:'a * y:'a -> One
-
  - static member C12.M : x:'a * y:'b -> Two
 
 E_TwoEqualYypeVariables02rec.fsx(61,37,61,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C14.M : x:'a * y:'a -> One
-
  - static member C14.M : x:'a * y:C -> Four
 
 E_TwoEqualYypeVariables02rec.fsx(62,37,62,47): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C24.M : x:'a * y:'b -> Two
-
  - static member C24.M : x:'a * y:C -> Four
 
 E_TwoEqualYypeVariables02rec.fsx(63,37,63,48): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C123.M : x:'a * y:'a -> One
-
  - static member C123.M : x:'a * y:'b -> Two
-
  - static member C123.M : x:'a * y:int -> Three
 
 E_TwoEqualYypeVariables02rec.fsx(64,37,64,49): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C1234.M : x:'a * y:'a -> One
-
  - static member C1234.M : x:'a * y:'b -> Two
-
  - static member C1234.M : x:'a * y:C -> Four
-
  - static member C1234.M : x:'a * y:int -> Three
 
 E_TwoEqualYypeVariables02rec.fsx(65,37,65,50): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'a
 
-
-
 Candidates:
  - static member C14.M : x:'a * y:'a -> One
-
  - static member C14.M : x:'a * y:C -> Four
diff --git a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
index ddaf35a08d..c007332c62 100644
--- a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
+++ b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
@@ -1,5 +1,5 @@
 
-E_LessThanDotOpenParen001.fsx(18,71,18,75): typecheck error FS0193: A type parameter is missing a constraint 'when ( ^T or  ^?8045) : (static member ( + ) :  ^T *  ^?8045 ->  ^?8046)'
+E_LessThanDotOpenParen001.fsx(18,71,18,75): typecheck error FS0193: A type parameter is missing a constraint 'when ( ^T or  ^?8151) : (static member ( + ) :  ^T *  ^?8151 ->  ^?8152)'
 
 E_LessThanDotOpenParen001.fsx(18,73,18,75): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'S has been constrained to be type 'int'.
 
@@ -9,36 +9,26 @@ E_LessThanDotOpenParen001.fsx(18,19,18,67): typecheck error FS0670: This code is
 
 E_LessThanDotOpenParen001.fsx(31,12,31,15): typecheck error FS0043: No overloads match for method 'op_PlusPlusPlus'.
 
+Known return type:  ^?8227
 
+Known type parameters: < (string -> int) , TestType<int,string> >
 
 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)
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
 
 E_LessThanDotOpenParen001.fsx(33,10,33,45): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
 
-
-
 Known types of arguments: (string -> int) * TestType<int,string>
 
-
-
 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)
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
 
 E_LessThanDotOpenParen001.fsx(34,44,34,54): typecheck error FS0001: This expression was expected to have type
@@ -48,19 +38,11 @@ but here has type
 
 E_LessThanDotOpenParen001.fsx(34,10,34,68): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
 
-
-
 Known types of arguments: (int -> 'a) * TestType<int,string>
 
-
-
 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)
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
-
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
index 1af0a83c7a..45c1cf3535 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
@@ -1,9 +1,4 @@
 
-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
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
index ac9de0f12a..d95b136a7c 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass03.bsl
@@ -1,26 +1,16 @@
 
 E_Clashing_Values_in_AbstractClass03.fsx(16,18,16,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: int
 
-
-
 Candidates:
  - abstract member D.M : 'T -> int
-
  - abstract member D.M : 'U -> string
 
 E_Clashing_Values_in_AbstractClass03.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: int
 
-
-
 Candidates:
  - abstract member D.M : 'T -> int
-
  - abstract member D.M : 'U -> string
diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
index a4114d2793..77e2d6c7e3 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass04.bsl
@@ -1,26 +1,16 @@
 
 E_Clashing_Values_in_AbstractClass04.fsx(16,18,16,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: int
 
-
-
 Candidates:
  - abstract member D.M : 'T -> int
-
  - abstract member D.M : 'U -> string
 
 E_Clashing_Values_in_AbstractClass04.fsx(17,18,17,25): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: int
 
-
-
 Candidates:
  - abstract member D.M : 'T -> int
-
  - abstract member D.M : 'U -> string
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
index 2a4c76ed72..099199f7ef 100644
--- a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
@@ -1,103 +1,56 @@
 
 neg_System.Convert.ToString.OverloadList.fsx(1,1,1,31): typecheck error FS0041: No overloads match for method 'ToString'.
 
-
-
 Known types of arguments: char * int
 
-
-
 Available overloads:
  - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: bool, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: byte, toBase: int) : string
-
  - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: int, toBase: int) : string
-
  - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: int16, toBase: int) : string
-
  - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: int64, toBase: int) : string
-
  - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string
 
 neg_System.Convert.ToString.OverloadList.fsx(2,1,2,47): typecheck error FS0041: No overloads match for method 'ToString'.
 
-
-
-Known types of arguments: provider: char * value: int
-
-
+Known types of arguments: provider:char * value:int
 
 Available overloads:
  - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: bool, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string
 
 neg_System.Convert.ToString.OverloadList.fsx(3,1,3,48): typecheck error FS0041: A unique overload for method 'ToString' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
-Known types of arguments: provider: 'a when 'a : null * value: int
-
-
+Known types of arguments: provider:'a0 * value:int when 'a0 : null
 
 Candidates:
  - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
-
  - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
index 66cf990edd..20a96ac297 100644
--- a/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_System.Threading.Tasks.Task.Run.OverloadList.bsl
@@ -1,78 +1,48 @@
 
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(5,11,5,35): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: (unit -> Task<int>)
 
-
-
 Candidates:
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
-
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
 
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(6,11,6,44): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: Func<Task<int>>
 
-
-
 Candidates:
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
-
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
 
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(7,11,7,47): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: Func<Task<int>>
 
-
-
 Candidates:
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
-
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
 
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(8,21,8,57): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: Func<Task<int>>
 
-
-
 Candidates:
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
-
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
 
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(9,11,9,50): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: Func<Task<int>>
 
-
-
 Candidates:
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
-
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
 
 neg_System.Threading.Tasks.Task.Run.OverloadList.fsx(10,11,10,52): typecheck error FS0041: A unique overload for method 'Run' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: Func<Task<int>>
 
-
-
 Candidates:
  - Task.Run<'TResult>(function: Func<'TResult>) : Task<'TResult>
-
  - Task.Run<'TResult>(function: Func<Task<'TResult>>) : Task<'TResult>
diff --git a/tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.bsl b/tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.bsl
index edb000e24b..8567bfa105 100644
--- a/tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_generic_known_argument_types.bsl
@@ -1,13 +1,8 @@
 
 neg_generic_known_argument_types.fsx(9,16,9,49): typecheck error FS0041: A unique overload for method 'Foo' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments:  ^fa * 'fb * 'a * argD:'c when  ^fa : (member X :  ^fa *  ^b ->  ^b) and  ^b : (member BBBB :  ^b -> unit)
 
-
-
 Candidates:
  - static member A.Foo : argA1:'a * argB1:('a -> 'b) * argC1:('a -> 'b) * argD:('a -> 'b) * argZ1:'zzz -> 'b
-
  - static member A.Foo : argA2:'a * argB2:('a -> 'b) * argC2:('b -> 'c) * argD:('c -> 'd) * argZ2:'zzz -> 'd
diff --git a/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl b/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
index 02832060e8..6edae4fc4b 100644
--- a/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
@@ -3,13 +3,8 @@ neg_interface_generics.fsx(14,1,18,2): typecheck error FS0505: The member or obj
 
 neg_interface_generics.fsx(20,9,20,27): typecheck error FS0041: No overloads match for method 'Foo'.
 
-
-
 Known types of arguments: string * XmlReader
 
-
-
 Available overloads:
  - abstract member IFoo.Foo : t:Type * r:TextReader -> obj * 't
-
  - abstract member IFoo.Foo : t:string * r:TextReader -> obj * 't
diff --git a/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl b/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl
index 512d36df81..3631950cc5 100644
--- a/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl
@@ -1,49 +1,26 @@
 
 neg_known_return_type_and_known_type_arguments.fsx(90,24,90,28): typecheck error FS0001: No overloads match for method 'Zero'.
 
-
-
 Known return type: MonoidSample
 
-
-
 Known type parameters: < MonoidSample , Zero >
 
-
-
 Available overloads:
  - static member Zero.Zero :  ^t * Default1 ->  ^t when  ^t : (static member get_Zero : ->  ^t)
-
  - static member Zero.Zero :  ^t * Default1 -> ('a1 -> 'a1) when  ^t : null and  ^t : struct
-
  - static member Zero.Zero :  ^t * Default2 ->  ^t when (FromInt32 or  ^t) : (static member FromInt32 :  ^t * FromInt32 -> int32 ->  ^t)
-
  - static member Zero.Zero :  ^t * Default2 -> ('a1 -> 'a1) when  ^t : null and  ^t : struct
-
  - static member Zero.Zero :  ^t * Default3 ->  ^t when  ^t : (static member get_Empty : ->  ^t)
-
  - static member Zero.Zero : 'a array * Zero -> 'a array
-
  - static member Zero.Zero : 'a list * Zero -> 'a list
-
  - static member Zero.Zero : 'a option * Zero -> 'a option
-
  - static member Zero.Zero : ('T ->  ^Monoid) * Zero -> ('T ->  ^Monoid) when (Zero or  ^Monoid) : (static member Zero :  ^Monoid * Zero ->  ^Monoid)
-
  - static member Zero.Zero : Async< ^a> * Zero -> Async< ^a> when (Zero or  ^a) : (static member Zero :  ^a * Zero ->  ^a)
-
  - static member Zero.Zero : Lazy< ^a> * Zero -> Lazy< ^a> when (Zero or  ^a) : (static member Zero :  ^a * Zero ->  ^a)
-
  - static member Zero.Zero : Map<'a,'b> * Zero -> Map<'a,'b> when 'a : comparison
-
  - static member Zero.Zero : ResizeArray<'a> * Zero -> ResizeArray<'a>
-
  - static member Zero.Zero : Set<'a> * Zero -> Set<'a> when 'a : comparison
-
  - static member Zero.Zero : System.TimeSpan * Zero -> System.TimeSpan
-
  - static member Zero.Zero : seq<'a> * Zero -> seq<'a>
-
  - static member Zero.Zero : string * Zero -> string
-
  - static member Zero.Zero : unit * Zero -> unit

From 8b102a04baf1648c203d5dd3ac5c77dbfd60cda4 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 16 Jan 2020 23:47:50 +0100
Subject: [PATCH 60/96] simplify handling of TraitConstraintInfo

---
 src/fsharp/CompileOps.fs | 45 ++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 86d61e5c3a..f1f0f9bd01 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -766,28 +766,24 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
 #endif
 
       | UnresolvedOverloading(denv, callerArgs, failure, m) ->
-          let nl = System.Environment.NewLine
-          let cx =
+          
+          let knownReturnType, genericParameterTypes =
               match failure with
-              | NoOverloadsFound (cx=cx)
-              | PossibleCandidates (cx=cx) -> cx
+              | NoOverloadsFound (cx=Some cx)
+              | PossibleCandidates (cx=Some cx) -> cx.ReturnType, cx.ArgTys
+              | _ -> None, []
+         
+          let argsMessage, returnType, genericParametersMessage =
+              
+              let retTy =
+                  knownReturnType
+                  |> Option.defaultValue (TType.TType_var (Typar.NewUnlinked()))
               
-          let retTy =
-              cx 
-              |> Option.map (fun cx -> cx.ReturnType)
-              |> Option.flatten
-              |> Option.defaultValue (TType.TType_var (Typar.NewUnlinked()))
-          
-          let genericParameters =
-              cx 
-              |> Option.map (fun cx -> cx.ArgTys)
-              |> Option.defaultValue List.empty
-
-          let argsMessage, returnType, genericParameters =
               let argRepr = 
                   callerArgs.ArgumentNamesAndTypes
                   |> List.map (fun (name,tTy) -> tTy, {ArgReprInfo.Name = name |> Option.map (fun name -> Ident(name, range.Zero)); ArgReprInfo.Attribs = []})
-              let argsL,retTyL,genParamTysL = NicePrint.prettyLayoutsOfUnresolvedOverloading denv argRepr retTy genericParameters
+                  
+              let argsL,retTyL,genParamTysL = NicePrint.prettyLayoutsOfUnresolvedOverloading denv argRepr retTy genericParameterTypes
               match callerArgs.ArgumentNamesAndTypes with
               | [] -> None, Layout.showL retTyL, Layout.showL genParamTysL
               | items ->
@@ -801,22 +797,17 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
                   , Layout.showL genParamTysL
 
           let knownReturnType =
-              match cx with 
-              | None -> None
-              | Some cx ->
-              match cx.ReturnType with
+              match knownReturnType with
               | None -> None
               | Some _ -> Some (FSComp.SR.csNoOverloadsFoundReturnType returnType)
 
           let genericParametersMessage =
-              match cx with 
-              | None -> None
-              | Some cx ->
-              match cx.ArgTys  with
+              match genericParameterTypes with
               | [] -> None
-              | [_] -> Some (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixSingular genericParameters)
-              | _ -> Some (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixPlural genericParameters)
+              | [_] -> Some (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixSingular genericParametersMessage)
+              | _ -> Some (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixPlural genericParametersMessage)
 
+          let nl = System.Environment.NewLine
           let formatOverloads (overloads: OverloadInformation list) =
               overloads
               |> List.map (fun overload -> overload.OverloadMethodInfo denv m)

From 8543f8014c5c3e28c8e80fb837476cee83176cc6 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Fri, 17 Jan 2020 06:10:50 +0100
Subject: [PATCH 61/96] naming couple of fields and turning a property to a
 methods as it triggers an assert in debugger when inspecting variables

---
 src/fsharp/ConstraintSolver.fs  | 4 ++--
 src/fsharp/ConstraintSolver.fsi | 4 ++--
 src/fsharp/MethodCalls.fs       | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index ef4ed54167..0a743c9778 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -207,7 +207,7 @@ exception ConstraintSolverInfiniteTypes of displayEnv: DisplayEnv * contextInfo:
 
 exception ConstraintSolverTypesNotInEqualityRelation of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
 
-exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argT: TType * paramT: TType * range * range
+exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argT: TType * paramT: TType * callRange: range * parameterRange: range
 
 exception ConstraintSolverMissingConstraint of displayEnv: DisplayEnv * Tast.Typar * Tast.TyparConstraint * range  * range 
 
@@ -219,7 +219,7 @@ exception ErrorFromApplyingDefault of tcGlobals: TcGlobals * displayEnv: Display
 
 exception ErrorFromAddingTypeEquation of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actual: TType * expected: TType * exn * range
 
-exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * ContextInfo * range
+exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actual: TType * expected: TType * exn * ContextInfo * parameterRange: range
 
 exception ErrorFromAddingConstraint of displayEnv: DisplayEnv * exn * range
 
diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 9bab84318b..48546018e2 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -112,14 +112,14 @@ type OverloadResolutionFailure =
 exception ConstraintSolverTupleDiffLengths              of displayEnv: DisplayEnv * TType list * TType list * range * range
 exception ConstraintSolverInfiniteTypes                 of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
 exception ConstraintSolverTypesNotInEqualityRelation    of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
-exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argT: TType * paramT: TType * range * range
+exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argT: TType * paramT: TType * callRange: range * parameterRange: range
 exception ConstraintSolverMissingConstraint             of displayEnv: DisplayEnv * Typar * TyparConstraint * range * range
 exception ConstraintSolverError                         of string * range * range
 exception ConstraintSolverRelatedInformation            of string option * range * exn
 
 exception ErrorFromApplyingDefault              of tcGlobals: TcGlobals * displayEnv: DisplayEnv * Typar * TType * exn * range
 exception ErrorFromAddingTypeEquation           of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actual: TType * expected: TType * exn * range
-exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * TType * TType * exn * ContextInfo * range
+exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actual: TType * expected: TType * exn * ContextInfo * parameterRange: range
 exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn * range
 exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
 exception UnresolvedOverloading                 of displayEnv: DisplayEnv * callerArgs: CallerArgs<Expr> * failure: OverloadResolutionFailure * range
diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 0c719bad00..7a716f3c04 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -544,7 +544,8 @@ type CalledMeth<'T>
 
     member x.ParamArrayCallerArgs = x.ArgSets |> List.tryPick (fun argSet -> if Option.isSome argSet.ParamArrayCalledArgOpt then Some argSet.ParamArrayCallerArgs else None )
 
-    member x.GetParamArrayElementType() = 
+    member x.GetParamArrayElementType () =
+        // turned into a method to avoid assert to run while inspecting CalledMeth in debugger
         assert (x.UsesParamArrayConversion)
         x.ParamArrayCalledArgOpt.Value.CalledArgumentType |> destArrayTy x.amap.g 
 

From c5739e781b7dc5c1fa835c1204a1c7121c6228d2 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Fri, 17 Jan 2020 06:11:24 +0100
Subject: [PATCH 62/96] comments in the assembling of overload resolution error
 message

---
 src/fsharp/CompileOps.fs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index f1f0f9bd01..2182e7405a 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -767,12 +767,15 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
 
       | UnresolvedOverloading(denv, callerArgs, failure, m) ->
           
+          // extract eventual information (return type and type parameters)
+          // from ConstraintTraitInfo
           let knownReturnType, genericParameterTypes =
               match failure with
               | NoOverloadsFound (cx=Some cx)
               | PossibleCandidates (cx=Some cx) -> cx.ReturnType, cx.ArgTys
               | _ -> None, []
          
+          // prepare message parts (known arguments, known return type, known generic parameters)
           let argsMessage, returnType, genericParametersMessage =
               
               let retTy =
@@ -784,6 +787,7 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
                   |> List.map (fun (name,tTy) -> tTy, {ArgReprInfo.Name = name |> Option.map (fun name -> Ident(name, range.Zero)); ArgReprInfo.Attribs = []})
                   
               let argsL,retTyL,genParamTysL = NicePrint.prettyLayoutsOfUnresolvedOverloading denv argRepr retTy genericParameterTypes
+              
               match callerArgs.ArgumentNamesAndTypes with
               | [] -> None, Layout.showL retTyL, Layout.showL genParamTysL
               | items ->
@@ -815,6 +819,7 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
               |> List.map FSComp.SR.formatDashItem
               |> String.concat nl
          
+          // assemble final message composing the parts
           let msg =
               let optionalParts =
                 [knownReturnType; genericParametersMessage; argsMessage]

From ade30f5ea79b6c99f164a6575379df7a378daef3 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sun, 19 Jan 2020 13:09:49 +0100
Subject: [PATCH 63/96] Add information about which argument doesn't match Add
 couple of tests Updating bunch of baselines

---
 src/fsharp/CompileOps.fs                      |  15 +-
 src/fsharp/ConstraintSolver.fs                |  33 +-
 src/fsharp/ConstraintSolver.fsi               |   3 +-
 src/fsharp/FSComp.txt                         |   2 +
 src/fsharp/MethodCalls.fs                     |   5 +-
 .../E_RigidTypeAnnotation03.bsl               |  40 +-
 .../E_TwoDifferentTypeVariablesGen00rec.bsl   |  15 -
 .../E_LessThanDotOpenParen001.bsl             |  30 +-
 tests/fsharp/test-framework.fs                |   4 +-
 tests/fsharp/tests.fs                         |  29 +-
 ...g_System.Convert.ToString.OverloadList.bsl |  72 +-
 ...ing.Graphics.DrawRectangleOverloadList.bsl |  16 +
 ...ing.Graphics.DrawRectangleOverloadList.fsx |  10 +
 .../overloads/neg_interface_generics.bsl      |   4 +-
 ...n_return_type_and_known_type_arguments.bsl |  36 +-
 .../overloads/neg_many_many_overloads.bsl     | 844 ++++++------------
 .../overloads/neg_tupled_arguments.bsl        |  18 +
 .../overloads/neg_tupled_arguments.fsx        |  14 +
 tests/fsharp/typecheck/sigs/neg06.bsl         |   5 -
 tests/fsharp/typecheck/sigs/neg106.bsl        |  66 +-
 tests/fsharp/typecheck/sigs/neg106.vsbsl      |  66 +-
 tests/fsharp/typecheck/sigs/neg20.bsl         |  42 +-
 tests/fsharp/typecheck/sigs/neg45.bsl         |  15 -
 tests/fsharp/typecheck/sigs/neg61.bsl         |   9 +-
 tests/fsharp/typecheck/sigs/neg_byref_13.bsl  |   2 +-
 .../Source/Optimizations/Inlining/env.lst     |   2 +-
 26 files changed, 508 insertions(+), 889 deletions(-)
 create mode 100644 tests/fsharp/typecheck/overloads/neg_System.Drawing.Graphics.DrawRectangleOverloadList.bsl
 create mode 100644 tests/fsharp/typecheck/overloads/neg_System.Drawing.Graphics.DrawRectangleOverloadList.fsx
 create mode 100644 tests/fsharp/typecheck/overloads/neg_tupled_arguments.bsl
 create mode 100644 tests/fsharp/typecheck/overloads/neg_tupled_arguments.fsx

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 2182e7405a..4d20bce524 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -811,10 +811,23 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
               | [_] -> Some (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixSingular genericParametersMessage)
               | _ -> Some (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixPlural genericParametersMessage)
 
+          let overloadMethodInfo displayEnv m (x: OverloadInformation) =
+              let paramInfo =
+                  match x.error with
+                  | :? ArgDoesNotMatchError as x ->
+                      let nameOrOneBasedIndexMessage =
+                          x.calledArg.NameOpt
+                          |> Option.map (fun n -> FSComp.SR.csOverloadCandidateNamedArgumentTypeMismatch n.idText)
+                          |> Option.defaultValue (FSComp.SR.csOverloadCandidateIndexedArgumentTypeMismatch ((snd x.calledArg.Position) + 1))
+                      sprintf " // %s" nameOrOneBasedIndexMessage
+                  | _ -> ""
+                  
+              (NicePrint.stringOfMethInfo x.amap m displayEnv x.methodSlot.Method) + paramInfo
+              
           let nl = System.Environment.NewLine
           let formatOverloads (overloads: OverloadInformation list) =
               overloads
-              |> List.map (fun overload -> overload.OverloadMethodInfo denv m)
+              |> List.map (overloadMethodInfo denv m)
               |> List.sort
               |> List.map FSComp.SR.formatDashItem
               |> String.concat nl
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 0a743c9778..4a9d90c799 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -190,7 +190,6 @@ type OverloadInformation =
         amap : ImportMap
         error: exn
     }
-    member x.OverloadMethodInfo displayEnv m = NicePrint.stringOfMethInfo x.amap m displayEnv x.methodSlot.Method
 
 /// Cases for overload resolution failure that exists in the implementation of the compiler.
 type OverloadResolutionFailure =
@@ -523,6 +522,11 @@ exception AbortForFailedOverloadResolution
 let inline TryD_IgnoreAbortForFailedOverloadResolution f1 f2 =
     TryD f1 (function AbortForFailedOverloadResolution -> CompleteD | exn -> f2 exn)
 
+exception LocallyAbortOperationThatFailsToResolveOverload
+
+/// used to provide detail about non matched argument in overload resolution error message
+exception ArgDoesNotMatchError of error: ErrorsFromAddingSubsumptionConstraint * calledMeth: CalledMeth<Expr> * calledArg: CalledArg * callerArg: CallerArg<Expr>
+
 /// Represents a very local condition where we prefer to report errors before stripping type abbreviations.
 exception LocallyAbortOperationThatLosesAbbrevs 
 
@@ -2180,7 +2184,6 @@ and SolveTypeRequiresDefaultConstructor (csenv: ConstraintSolverEnv) ndeep m2 tr
                     CompleteD
                 | _ -> 
                     ErrorD (ConstraintSolverError(FSComp.SR.csGenericConstructRequiresPublicDefaultConstructor(NicePrint.minimalStringOfType denv origTy), m, m2))
-
 // Parameterized compatibility relation between member signatures.  The real work
 // is done by "equateTypes" and "subsumeTypes" and "subsumeArg"
 and CanMemberSigsMatchUpToCheck 
@@ -2280,7 +2283,7 @@ and CanMemberSigsMatchUpToCheck
 //
 // "ty2 casts to ty1"
 // "a value of type ty2 can be used where a value of type ty1 is expected"
-and private SolveTypeSubsumesTypeWithReport (csenv: ConstraintSolverEnv) ndeep m trace cxsln ty1 ty2 =
+and private SolveTypeSubsumesTypeWithWrappedContextualReport (csenv: ConstraintSolverEnv) ndeep m trace cxsln ty1 ty2 wrapper =
     TryD_IgnoreAbortForFailedOverloadResolution
         (fun () -> SolveTypeSubsumesTypeKeepAbbrevs csenv ndeep m trace cxsln ty1 ty2)
         (fun res ->
@@ -2288,10 +2291,13 @@ and private SolveTypeSubsumesTypeWithReport (csenv: ConstraintSolverEnv) ndeep m
             | ContextInfo.RuntimeTypeTest isOperator ->
                 // test if we can cast other way around
                 match CollectThenUndo (fun newTrace -> SolveTypeSubsumesTypeKeepAbbrevs csenv ndeep m (OptionalTrace.WithTrace newTrace) cxsln ty2 ty1) with 
-                | OkResult _ -> ErrorD (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, ContextInfo.DowncastUsedInsteadOfUpcast isOperator, m))
-                | _ -> ErrorD (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, ContextInfo.NoContext, m))
-            | _ -> ErrorD (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, csenv.eContextInfo, m)))
+                | OkResult _ -> ErrorD (wrapper (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, ContextInfo.DowncastUsedInsteadOfUpcast isOperator, m)))
+                | _ -> ErrorD (wrapper (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, ContextInfo.NoContext, m)))
+            | _ -> ErrorD (wrapper (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, csenv.eContextInfo, m))))
 
+and private SolveTypeSubsumesTypeWithReport (csenv: ConstraintSolverEnv) ndeep m trace cxsln ty1 ty2 =
+        SolveTypeSubsumesTypeWithWrappedContextualReport (csenv) ndeep m trace cxsln ty1 ty2 id
+        
 // ty1: actual
 // ty2: expected
 and private SolveTypeEqualsTypeWithReport (csenv: ConstraintSolverEnv) ndeep  m trace cxsln actual expected = 
@@ -2324,9 +2330,9 @@ and MustUnify csenv ndeep trace cxsln ty1 ty2 =
 and MustUnifyInsideUndo csenv ndeep trace cxsln ty1 ty2 = 
     SolveTypeEqualsTypeWithReport csenv ndeep csenv.m (WithTrace trace) cxsln ty1 ty2
 
-and ArgsMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln isConstraint calledArg callerArg = 
+and ArgsMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln isConstraint calledMeth calledArg callerArg = 
     let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg
-    SolveTypeSubsumesTypeWithReport csenv ndeep callerArg.Range (WithTrace trace) cxsln calledArgTy callerArg.ArgumentType 
+    SolveTypeSubsumesTypeWithWrappedContextualReport csenv ndeep callerArg.Range (WithTrace trace) cxsln calledArgTy callerArg.ArgumentType (fun e -> ArgDoesNotMatchError(e :?> _, calledMeth, calledArg, callerArg)) 
 
 and TypesMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln m calledArgTy callerArgTy = 
     SolveTypeSubsumesTypeWithReport csenv ndeep m trace cxsln calledArgTy callerArgTy 
@@ -2499,7 +2505,7 @@ and ResolveOverloading
           // Exact match rule.
           //
           // See what candidates we have based on current inferred type information 
-          // and _exact_ matches of argument types. 
+          // and _exact_ matches of argument types.
           match candidates |> FilterEachThenUndo (fun newTrace calledMeth -> 
                      let cxsln = Option.map (fun traitInfo -> (traitInfo, MemberConstraintSolutionOfMethInfo csenv.SolverState m calledMeth.Method calledMeth.CalledTyArgs)) cx
                      CanMemberSigsMatchUpToCheck 
@@ -2525,7 +2531,7 @@ and ResolveOverloading
                                    alwaysCheckReturn
                                    (MustUnifyInsideUndo csenv ndeep newTrace cxsln) 
                                    (TypesMustSubsumeOrConvertInsideUndo csenv ndeep (WithTrace newTrace) cxsln m)
-                                   (ArgsMustSubsumeOrConvertInsideUndo csenv ndeep newTrace cxsln cx.IsSome) 
+                                   (ArgsMustSubsumeOrConvertInsideUndo csenv ndeep newTrace cxsln cx.IsSome candidate) 
                                    reqdRetTyOpt 
                                    candidate)
 
@@ -2561,11 +2567,12 @@ and ResolveOverloading
                                              alwaysCheckReturn
                                              (MustUnifyInsideUndo csenv ndeep newTrace cxsln) 
                                              (TypesMustSubsumeOrConvertInsideUndo csenv ndeep (WithTrace newTrace) cxsln m)
-                                             (ArgsMustSubsumeOrConvertInsideUndo csenv ndeep newTrace cxsln cx.IsSome) 
+                                             (ArgsMustSubsumeOrConvertInsideUndo csenv ndeep newTrace cxsln cx.IsSome calledMeth) 
                                              reqdRetTyOpt 
                                              calledMeth) with 
                             | OkResult _ -> None
-                            | ErrorResult(_, exn) -> Some {methodSlot = calledMeth; amap = amap; error = exn })
+                            | ErrorResult(_warnings, exn) ->
+                                Some {methodSlot = calledMeth; amap = amap; error = exn })
 
                 None, ErrorD (failOverloading (NoOverloadsFound (methodName, errors, cx))), NoTrace
 
@@ -2635,7 +2642,7 @@ and ResolveOverloading
                     // Prefer methods with more precise param array arg type
                     let c = 
                         if candidate.UsesParamArrayConversion && other.UsesParamArrayConversion then
-                            compareTypes (candidate.GetParamArrayElementType()) (other.GetParamArrayElementType())
+                            compareTypes candidate.ParamArrayElementType other.ParamArrayElementType
                         else
                             0
                     if c <> 0 then c else
diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 48546018e2..9cd24eddb3 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -98,7 +98,6 @@ type OverloadInformation =
         amap : ImportMap
         error: exn
     }
-    member OverloadMethodInfo : displayEnv: DisplayEnv -> m: range -> string
 
 /// Cases for overload resolution failure that exists in the implementation of the compiler.
 type OverloadResolutionFailure =
@@ -124,7 +123,7 @@ exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn
 exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
 exception UnresolvedOverloading                 of displayEnv: DisplayEnv * callerArgs: CallerArgs<Expr> * failure: OverloadResolutionFailure * range
 exception NonRigidTypar                         of displayEnv: DisplayEnv * string option * range * TType * TType * range
-
+exception ArgDoesNotMatchError                  of error: ErrorsFromAddingSubsumptionConstraint * calledMeth: CalledMeth<Expr> * calledArg: CalledArg * callerArg: CallerArg<Expr>
 /// A function that denotes captured tcVal, Used in constraint solver and elsewhere to get appropriate expressions for a ValRef.
 type TcValF = (ValRef -> ValUseFlag -> TType list -> range -> Expr * TType)
 
diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index 7963fa9012..2f26477c61 100644
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -370,6 +370,8 @@ csNoOverloadsFoundReturnType,"Known return type: %s"
 csMethodIsOverloaded,"A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed."
 csCandidates,"Candidates:\n%s"
 csAvailableOverloads,"Available overloads:\n%s"
+csOverloadCandidateNamedArgumentTypeMismatch,"Argument '%s' doesn't match"
+csOverloadCandidateIndexedArgumentTypeMismatch,"Argument at index %d doesn't match"
 512,parsDoCannotHaveVisibilityDeclarations,"Accessibility modifiers are not permitted on 'do' bindings, but '%s' was given."
 513,parsEofInHashIf,"End of file in #if section begun at or after here"
 514,parsEofInString,"End of file in string begun at or before here"
diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 7a716f3c04..e239552e4a 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -350,7 +350,7 @@ type CalledMeth<'T>
 
     let fullCurriedCalledArgs = MakeCalledArgs infoReader.amap m minfo calledTyArgs
     do assert (fullCurriedCalledArgs.Length = fullCurriedCalledArgs.Length)
-
+ 
     let argSetInfos = 
         (callerArgs.CurriedCallerArgs, fullCurriedCalledArgs) 
         ||> List.map2 (fun (unnamedCallerArgs, namedCallerArgs) fullCalledArgs -> 
@@ -544,8 +544,7 @@ type CalledMeth<'T>
 
     member x.ParamArrayCallerArgs = x.ArgSets |> List.tryPick (fun argSet -> if Option.isSome argSet.ParamArrayCalledArgOpt then Some argSet.ParamArrayCallerArgs else None )
 
-    member x.GetParamArrayElementType () =
-        // turned into a method to avoid assert to run while inspecting CalledMeth in debugger
+    member x.ParamArrayElementType = 
         assert (x.UsesParamArrayConversion)
         x.ParamArrayCalledArgOpt.Value.CalledArgumentType |> destArrayTy x.amap.g 
 
diff --git a/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
index fcf7ffa0ca..050ab182d7 100644
--- a/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
+++ b/tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl
@@ -9,11 +9,11 @@ E_RigidTypeAnnotation03.fsx(17,9,17,25): typecheck error FS0041: No overloads ma
 Known type of argument: sbyte
 
 Available overloads:
- - static member T.M : a:byte -> int
- - static member T.M : a:decimal<Kg> -> int
- - static member T.M : a:float -> int
- - static member T.M : a:float32<Kg> -> int
- - static member T.M : a:string -> int
+ - static member T.M : a:byte -> int // Argument 'a' doesn't match
+ - static member T.M : a:decimal<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:float -> int // Argument 'a' doesn't match
+ - static member T.M : a:float32<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:string -> int // Argument 'a' doesn't match
 
 E_RigidTypeAnnotation03.fsx(18,13,18,19): typecheck error FS0001: This expression was expected to have type
     'float32'    
@@ -25,11 +25,11 @@ E_RigidTypeAnnotation03.fsx(18,9,18,30): typecheck error FS0041: No overloads ma
 Known type of argument: float32
 
 Available overloads:
- - static member T.M : a:byte -> int
- - static member T.M : a:decimal<Kg> -> int
- - static member T.M : a:float -> int
- - static member T.M : a:float32<Kg> -> int
- - static member T.M : a:string -> int
+ - static member T.M : a:byte -> int // Argument 'a' doesn't match
+ - static member T.M : a:decimal<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:float -> int // Argument 'a' doesn't match
+ - static member T.M : a:float32<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:string -> int // Argument 'a' doesn't match
 
 E_RigidTypeAnnotation03.fsx(19,13,19,20): typecheck error FS0001: This expression was expected to have type
     'float32<'u>'    
@@ -47,11 +47,11 @@ E_RigidTypeAnnotation03.fsx(20,9,20,39): typecheck error FS0041: No overloads ma
 Known type of argument: decimal<N s ^ 2>
 
 Available overloads:
- - static member T.M : a:byte -> int
- - static member T.M : a:decimal<Kg> -> int
- - static member T.M : a:float -> int
- - static member T.M : a:float32<Kg> -> int
- - static member T.M : a:string -> int
+ - static member T.M : a:byte -> int // Argument 'a' doesn't match
+ - static member T.M : a:decimal<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:float -> int // Argument 'a' doesn't match
+ - static member T.M : a:float32<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:string -> int // Argument 'a' doesn't match
 
 E_RigidTypeAnnotation03.fsx(21,14,21,18): typecheck error FS0001: This expression was expected to have type
     'char'    
@@ -63,8 +63,8 @@ E_RigidTypeAnnotation03.fsx(21,9,21,27): typecheck error FS0041: No overloads ma
 Known type of argument: char
 
 Available overloads:
- - static member T.M : a:byte -> int
- - static member T.M : a:decimal<Kg> -> int
- - static member T.M : a:float -> int
- - static member T.M : a:float32<Kg> -> int
- - static member T.M : a:string -> int
+ - static member T.M : a:byte -> int // Argument 'a' doesn't match
+ - static member T.M : a:decimal<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:float -> int // Argument 'a' doesn't match
+ - static member T.M : a:float32<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:string -> int // Argument 'a' doesn't match
diff --git a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
index 0909f25a99..d1d42d2fa4 100644
--- a/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
+++ b/tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl
@@ -11,15 +11,10 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(62,18,62,42): typecheck error FS0043: Th
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(63,45,63,55): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(64,56,64,57): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
@@ -36,15 +31,10 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(65,18,65,42): typecheck error FS0043: Th
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(66,45,66,59): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(67,55,67,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
@@ -55,15 +45,10 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(67,18,67,42): typecheck error FS0043: Th
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(68,45,68,58): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(69,55,69,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type 'int'.
diff --git a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
index c007332c62..daa6060cb8 100644
--- a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
+++ b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
@@ -14,22 +14,22 @@ Known return type:  ^?8227
 Known type parameters: < (string -> int) , TestType<int,string> >
 
 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)
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
+ - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:(int -> 'T) * b:TestType<'T,int> ->  ^a when  ^T1 : (static member ( + ) :  ^T1 *  ^T1 ->  ^a) // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
 
 E_LessThanDotOpenParen001.fsx(33,10,33,45): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
 
 Known types of arguments: (string -> int) * TestType<int,string>
 
 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)
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
+ - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:(int -> 'T) * b:TestType<'T,int> ->  ^a when  ^T1 : (static member ( + ) :  ^T1 *  ^T1 ->  ^a) // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
 
 E_LessThanDotOpenParen001.fsx(34,44,34,54): typecheck error FS0001: This expression was expected to have type
     'int'    
@@ -41,8 +41,8 @@ E_LessThanDotOpenParen001.fsx(34,10,34,68): typecheck error FS0041: No overloads
 Known types of arguments: (int -> 'a) * TestType<int,string>
 
 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)
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T
- - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T
+ - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:(int -> 'T) * b:TestType<'T,int> ->  ^a when  ^T1 : (static member ( + ) :  ^T1 *  ^T1 ->  ^a) // Argument 'b' doesn't match
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T // Argument 'a' doesn't match
+ - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
diff --git a/tests/fsharp/test-framework.fs b/tests/fsharp/test-framework.fs
index 15fe1e98bf..2a10f5bcbb 100644
--- a/tests/fsharp/test-framework.fs
+++ b/tests/fsharp/test-framework.fs
@@ -485,7 +485,9 @@ let diff normalize path1 path2 =
     let append s = result.AppendLine s |> ignore
     let cwd = Directory.GetCurrentDirectory()
 
-    if not <| File.Exists(path1) then failwithf "Invalid path %s" path1
+    if not <| File.Exists(path1) then
+        // creating empty baseline file as this is likely someone initializing a new test
+        File.WriteAllText(path1, String.Empty) 
     if not <| File.Exists(path2) then failwithf "Invalid path %s" path2
 
     let lines1 = File.ReadAllLines(path1)
diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index 45445bdb92..9f53b3d370 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -2948,31 +2948,32 @@ module GeneratedSignatureTests =
     let ``measures-GENERATED_SIGNATURE`` () = singleTestBuildAndRun "core/measures" GENERATED_SIGNATURE
 #endif
 
-#if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
 module OverloadResolution =
     module ``fsharpqa migrated tests`` = 
         let [<Test>] ``Conformance\Expressions\SyntacticSugar (E_Slices01.fs)`` () = singleNegTest (testConfig "conformance/expressions/syntacticsugar") "E_Slices01"
         let [<Test>] ``Conformance\Expressions\Type-relatedExpressions (E_RigidTypeAnnotation03.fsx)`` () = singleNegTest (testConfig "conformance/expressions/type-relatedexpressions") "E_RigidTypeAnnotation03"
-        let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_OneTypeVariable03.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_OneTypeVariable03"
-        let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_OneTypeVariable03rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_OneTypeVariable03rec"
-        let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoDifferentTypeVariablesGen00.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariablesGen00"
-        let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoDifferentTypeVariables01.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariables01"
-        let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoDifferentTypeVariables01rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariables01rec"
-        let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoDifferentTypeVariablesGen00rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariablesGen00rec"
-        let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoEqualTypeVariables02.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoEqualTypeVariables02"
-        let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_TwoEqualYypeVariables02rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoEqualYypeVariables02rec"
-        let [<Test>] ``Conformance\InferenceProcedures\TypeInference (E_LeftToRightOverloadResolution01.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_LeftToRightOverloadResolution01"
-        let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass01.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass01"
-        let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass03.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass03"
-        let [<Test>] ``Conformance\InferenceProcedures\WellFormednessChecking (E_Clashing_Values_in_AbstractClass04.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass04"
+        let [<Test>] ``Conformance\Inference (E_OneTypeVariable03.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_OneTypeVariable03"
+        let [<Test>] ``Conformance\Inference (E_OneTypeVariable03rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_OneTypeVariable03rec"
+        let [<Test>] ``Conformance\Inference (E_TwoDifferentTypeVariablesGen00.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariablesGen00"
+        let [<Test>] ``Conformance\Inference (E_TwoDifferentTypeVariables01.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariables01"
+        let [<Test>] ``Conformance\Inference (E_TwoDifferentTypeVariables01rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariables01rec"
+        let [<Test>] ``Conformance\Inference (E_TwoDifferentTypeVariablesGen00rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoDifferentTypeVariablesGen00rec"
+        let [<Test>] ``Conformance\Inference (E_TwoEqualTypeVariables02.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoEqualTypeVariables02"
+        let [<Test>] ``Conformance\Inference (E_TwoEqualYypeVariables02rec.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_TwoEqualYypeVariables02rec"
+        let [<Test>] ``Conformance\Inference (E_LeftToRightOverloadResolution01.fs)`` () = singleNegTest (testConfig "conformance/inference") "E_LeftToRightOverloadResolution01"
+        let [<Test>] ``Conformance\WellFormedness (E_Clashing_Values_in_AbstractClass01.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass01"
+        let [<Test>] ``Conformance\WellFormedness (E_Clashing_Values_in_AbstractClass03.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass03"
+        let [<Test>] ``Conformance\WellFormedness (E_Clashing_Values_in_AbstractClass04.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass04"
         let [<Test>] ``Conformance\LexicalAnalysis\SymbolicOperators (E_LessThanDotOpenParen001.fs)`` () = singleNegTest (testConfig "conformance/lexicalanalysis") "E_LessThanDotOpenParen001"
     
     module ``error messages using BCL``=
         let [<Test>] ``neg_System.Convert.ToString.OverloadList``() = singleNegTest (testConfig "typecheck/overloads") "neg_System.Convert.ToString.OverloadList"
         let [<Test>] ``neg_System.Threading.Tasks.Task.Run.OverloadList``() = singleNegTest (testConfig "typecheck/overloads") "neg_System.Threading.Tasks.Task.Run.OverloadList"
+        let [<Test>] ``neg_System.Drawing.Graphics.DrawRectangleOverloadList.fsx``() = singleNegTest (testConfig "typecheck/overloads") "neg_System.Drawing.Graphics.DrawRectangleOverloadList"
+
     module ``ad hoc code overload error messages``=
         let [<Test>] ``neg_many_many_overloads`` () = singleNegTest (testConfig "typecheck/overloads") "neg_many_many_overloads"
         let [<Test>] ``neg_interface_generics`` () = singleNegTest (testConfig "typecheck/overloads") "neg_interface_generics"
         let [<Test>] ``neg_known_return_type_and_known_type_arguments`` () = singleNegTest (testConfig "typecheck/overloads") "neg_known_return_type_and_known_type_arguments"
         let [<Test>] ``neg_generic_known_argument_types`` () = singleNegTest (testConfig "typecheck/overloads") "neg_generic_known_argument_types"
-#endif
\ No newline at end of file
+        let [<Test>] ``neg_tupled_arguments`` () = singleNegTest (testConfig "typecheck/overloads") "neg_tupled_arguments"
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
index 099199f7ef..1eb33e50b6 100644
--- a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl
@@ -4,48 +4,48 @@ neg_System.Convert.ToString.OverloadList.fsx(1,1,1,31): typecheck error FS0041:
 Known types of arguments: char * int
 
 Available overloads:
- - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: bool, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: byte, toBase: int) : string
- - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: int, toBase: int) : string
- - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: int16, toBase: int) : string
- - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: int64, toBase: int) : string
- - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: bool, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: byte, toBase: int) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string // Argument 'provider' doesn't match
+ - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: int, toBase: int) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: int16, toBase: int) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: int64, toBase: int) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string // Argument 'provider' doesn't match
+ - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
 
 neg_System.Convert.ToString.OverloadList.fsx(2,1,2,47): typecheck error FS0041: No overloads match for method 'ToString'.
 
 Known types of arguments: provider:char * value:int
 
 Available overloads:
- - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: bool, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string
- - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string
+ - System.Convert.ToString(value: System.DateTime, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: bool, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: byte, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: char, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: decimal, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: float, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: float32, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string // Argument 'provider' doesn't match
+ - System.Convert.ToString(value: int16, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: int64, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string // Argument 'provider' doesn't match
+ - System.Convert.ToString(value: sbyte, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: string, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
+ - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string // Argument 'value' doesn't match
 
 neg_System.Convert.ToString.OverloadList.fsx(3,1,3,48): typecheck error FS0041: A unique overload for method 'ToString' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Drawing.Graphics.DrawRectangleOverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Drawing.Graphics.DrawRectangleOverloadList.bsl
new file mode 100644
index 0000000000..cfa6d36b91
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_System.Drawing.Graphics.DrawRectangleOverloadList.bsl
@@ -0,0 +1,16 @@
+
+neg_System.Drawing.Graphics.DrawRectangleOverloadList.fsx(9,1,9,31): typecheck error FS0041: No overloads match for method 'DrawRectangle'.
+
+Known types of arguments: Pen * float32 * float32 * float32 * int
+
+Available overloads:
+ - Graphics.DrawRectangle(pen: Pen, x: float32, y: float32, width: float32, height: float32) : unit // Argument 'height' doesn't match
+ - Graphics.DrawRectangle(pen: Pen, x: int, y: int, width: int, height: int) : unit // Argument 'x' doesn't match
+
+neg_System.Drawing.Graphics.DrawRectangleOverloadList.fsx(10,1,10,32): typecheck error FS0041: No overloads match for method 'DrawRectangle'.
+
+Known types of arguments: Pen * int * float32 * float32 * decimal
+
+Available overloads:
+ - Graphics.DrawRectangle(pen: Pen, x: float32, y: float32, width: float32, height: float32) : unit // Argument 'x' doesn't match
+ - Graphics.DrawRectangle(pen: Pen, x: int, y: int, width: int, height: int) : unit // Argument 'y' doesn't match
diff --git a/tests/fsharp/typecheck/overloads/neg_System.Drawing.Graphics.DrawRectangleOverloadList.fsx b/tests/fsharp/typecheck/overloads/neg_System.Drawing.Graphics.DrawRectangleOverloadList.fsx
new file mode 100644
index 0000000000..e006948166
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_System.Drawing.Graphics.DrawRectangleOverloadList.fsx
@@ -0,0 +1,10 @@
+open System.Drawing
+let g : Graphics = null
+let p : Pen = null
+let x = 1.f
+let y = 1.f
+let w = 1.f
+let h = 1
+
+g.DrawRectangle(p, x, y, w, h)
+g.DrawRectangle(p, 4, y, w, 5m)
\ No newline at end of file
diff --git a/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl b/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
index 6edae4fc4b..98c6321641 100644
--- a/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_interface_generics.bsl
@@ -6,5 +6,5 @@ neg_interface_generics.fsx(20,9,20,27): typecheck error FS0041: No overloads mat
 Known types of arguments: string * XmlReader
 
 Available overloads:
- - abstract member IFoo.Foo : t:Type * r:TextReader -> obj * 't
- - abstract member IFoo.Foo : t:string * r:TextReader -> obj * 't
+ - abstract member IFoo.Foo : t:Type * r:TextReader -> obj * 't // Argument 't' doesn't match
+ - abstract member IFoo.Foo : t:string * r:TextReader -> obj * 't // Argument 'r' doesn't match
diff --git a/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl b/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl
index 3631950cc5..6c9ef4772e 100644
--- a/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_known_return_type_and_known_type_arguments.bsl
@@ -6,21 +6,21 @@ Known return type: MonoidSample
 Known type parameters: < MonoidSample , Zero >
 
 Available overloads:
- - static member Zero.Zero :  ^t * Default1 ->  ^t when  ^t : (static member get_Zero : ->  ^t)
- - static member Zero.Zero :  ^t * Default1 -> ('a1 -> 'a1) when  ^t : null and  ^t : struct
- - static member Zero.Zero :  ^t * Default2 ->  ^t when (FromInt32 or  ^t) : (static member FromInt32 :  ^t * FromInt32 -> int32 ->  ^t)
- - static member Zero.Zero :  ^t * Default2 -> ('a1 -> 'a1) when  ^t : null and  ^t : struct
- - static member Zero.Zero :  ^t * Default3 ->  ^t when  ^t : (static member get_Empty : ->  ^t)
- - static member Zero.Zero : 'a array * Zero -> 'a array
- - static member Zero.Zero : 'a list * Zero -> 'a list
- - static member Zero.Zero : 'a option * Zero -> 'a option
- - static member Zero.Zero : ('T ->  ^Monoid) * Zero -> ('T ->  ^Monoid) when (Zero or  ^Monoid) : (static member Zero :  ^Monoid * Zero ->  ^Monoid)
- - static member Zero.Zero : Async< ^a> * Zero -> Async< ^a> when (Zero or  ^a) : (static member Zero :  ^a * Zero ->  ^a)
- - static member Zero.Zero : Lazy< ^a> * Zero -> Lazy< ^a> when (Zero or  ^a) : (static member Zero :  ^a * Zero ->  ^a)
- - static member Zero.Zero : Map<'a,'b> * Zero -> Map<'a,'b> when 'a : comparison
- - static member Zero.Zero : ResizeArray<'a> * Zero -> ResizeArray<'a>
- - static member Zero.Zero : Set<'a> * Zero -> Set<'a> when 'a : comparison
- - static member Zero.Zero : System.TimeSpan * Zero -> System.TimeSpan
- - static member Zero.Zero : seq<'a> * Zero -> seq<'a>
- - static member Zero.Zero : string * Zero -> string
- - static member Zero.Zero : unit * Zero -> unit
+ - static member Zero.Zero :  ^t * Default1 ->  ^t when  ^t : (static member get_Zero : ->  ^t) // Argument at index 1 doesn't match
+ - static member Zero.Zero :  ^t * Default1 -> ('a1 -> 'a1) when  ^t : null and  ^t : struct // Argument at index 1 doesn't match
+ - static member Zero.Zero :  ^t * Default2 ->  ^t when (FromInt32 or  ^t) : (static member FromInt32 :  ^t * FromInt32 -> int32 ->  ^t) // Argument at index 1 doesn't match
+ - static member Zero.Zero :  ^t * Default2 -> ('a1 -> 'a1) when  ^t : null and  ^t : struct // Argument at index 1 doesn't match
+ - static member Zero.Zero :  ^t * Default3 ->  ^t when  ^t : (static member get_Empty : ->  ^t) // Argument at index 1 doesn't match
+ - static member Zero.Zero : 'a array * Zero -> 'a array // Argument at index 1 doesn't match
+ - static member Zero.Zero : 'a list * Zero -> 'a list // Argument at index 1 doesn't match
+ - static member Zero.Zero : 'a option * Zero -> 'a option // Argument at index 1 doesn't match
+ - static member Zero.Zero : ('T ->  ^Monoid) * Zero -> ('T ->  ^Monoid) when (Zero or  ^Monoid) : (static member Zero :  ^Monoid * Zero ->  ^Monoid) // Argument at index 1 doesn't match
+ - static member Zero.Zero : Async< ^a> * Zero -> Async< ^a> when (Zero or  ^a) : (static member Zero :  ^a * Zero ->  ^a) // Argument at index 1 doesn't match
+ - static member Zero.Zero : Lazy< ^a> * Zero -> Lazy< ^a> when (Zero or  ^a) : (static member Zero :  ^a * Zero ->  ^a) // Argument at index 1 doesn't match
+ - static member Zero.Zero : Map<'a,'b> * Zero -> Map<'a,'b> when 'a : comparison // Argument at index 1 doesn't match
+ - static member Zero.Zero : ResizeArray<'a> * Zero -> ResizeArray<'a> // Argument at index 1 doesn't match
+ - static member Zero.Zero : Set<'a> * Zero -> Set<'a> when 'a : comparison // Argument at index 1 doesn't match
+ - static member Zero.Zero : System.TimeSpan * Zero -> System.TimeSpan // Argument at index 1 doesn't match
+ - static member Zero.Zero : seq<'a> * Zero -> seq<'a> // Argument at index 1 doesn't match
+ - static member Zero.Zero : string * Zero -> string // Argument at index 1 doesn't match
+ - static member Zero.Zero : unit * Zero -> unit // Argument at index 1 doesn't match
diff --git a/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl b/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
index a4fd73d0d7..d9e944906e 100644
--- a/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
+++ b/tests/fsharp/typecheck/overloads/neg_many_many_overloads.bsl
@@ -1,684 +1,348 @@
 
 neg_many_many_overloads.fsx(123,1,123,13): typecheck error FS0041: A unique overload for method 'A' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: 'a0 when 'a0 : null
 
-
-
 Candidates:
  - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime>
-
  - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task>
-
  - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal>
-
  - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float>
-
  - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32>
-
  - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16>
-
  - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32>
-
  - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64>
-
  - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8>
-
  - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string>
-
  - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16>
-
  - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32>
-
  - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64>
-
  - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8>
-
  - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime>
-
  - static member Class.A : a:HashSet<Task> -> HashSet<Task>
-
  - static member Class.A : a:HashSet<decimal> -> HashSet<decimal>
-
  - static member Class.A : a:HashSet<float32> -> HashSet<float32>
-
  - static member Class.A : a:HashSet<float> -> HashSet<float>
-
  - static member Class.A : a:HashSet<int16> -> HashSet<int16>
-
  - static member Class.A : a:HashSet<int32> -> HashSet<int32>
-
  - static member Class.A : a:HashSet<int64> -> HashSet<int64>
-
  - static member Class.A : a:HashSet<int8> -> HashSet<int8>
-
  - static member Class.A : a:HashSet<string> -> HashSet<string>
-
  - static member Class.A : a:HashSet<uint16> -> HashSet<uint16>
-
  - static member Class.A : a:HashSet<uint32> -> HashSet<uint32>
-
  - static member Class.A : a:HashSet<uint64> -> HashSet<uint64>
-
  - static member Class.A : a:HashSet<uint8> -> HashSet<uint8>
-
  - static member Class.A : a:List<DateTime> -> List<DateTime>
-
  - static member Class.A : a:List<Task> -> List<Task>
-
  - static member Class.A : a:List<decimal> -> List<decimal>
-
  - static member Class.A : a:List<float32> -> List<float32>
-
  - static member Class.A : a:List<float> -> List<float>
-
  - static member Class.A : a:List<int16> -> List<int16>
-
  - static member Class.A : a:List<int32> -> List<int32>
-
  - static member Class.A : a:List<int64> -> List<int64>
-
  - static member Class.A : a:List<int8> -> List<int8>
-
  - static member Class.A : a:List<string> -> List<string>
-
  - static member Class.A : a:List<uint16> -> List<uint16>
-
  - static member Class.A : a:List<uint32> -> List<uint32>
-
  - static member Class.A : a:List<uint64> -> List<uint64>
-
  - static member Class.A : a:List<uint8> -> List<uint8>
-
  - static member Class.A : a:Queue<DateTime> -> Queue<DateTime>
-
  - static member Class.A : a:Queue<Task> -> Queue<Task>
-
  - static member Class.A : a:Queue<decimal> -> Queue<decimal>
-
  - static member Class.A : a:Queue<float32> -> Queue<float32>
-
  - static member Class.A : a:Queue<float> -> Queue<float>
-
  - static member Class.A : a:Queue<int16> -> Queue<int16>
-
  - static member Class.A : a:Queue<int32> -> Queue<int32>
-
  - static member Class.A : a:Queue<int64> -> Queue<int64>
-
  - static member Class.A : a:Queue<int8> -> Queue<int8>
-
  - static member Class.A : a:Queue<string> -> Queue<string>
-
  - static member Class.A : a:Queue<uint16> -> Queue<uint16>
-
  - static member Class.A : a:Queue<uint32> -> Queue<uint32>
-
  - static member Class.A : a:Queue<uint64> -> Queue<uint64>
-
  - static member Class.A : a:Queue<uint8> -> Queue<uint8>
-
  - static member Class.A : a:Task -> Task
-
  - static member Class.A : a:Task<DateTime> -> Task<DateTime>
-
  - static member Class.A : a:Task<Task> -> Task<Task>
-
  - static member Class.A : a:Task<decimal> -> Task<decimal>
-
  - static member Class.A : a:Task<float32> -> Task<float32>
-
  - static member Class.A : a:Task<float> -> Task<float>
-
  - static member Class.A : a:Task<int16> -> Task<int16>
-
  - static member Class.A : a:Task<int32> -> Task<int32>
-
  - static member Class.A : a:Task<int64> -> Task<int64>
-
  - static member Class.A : a:Task<int8> -> Task<int8>
-
  - static member Class.A : a:Task<string> -> Task<string>
-
  - static member Class.A : a:Task<uint16> -> Task<uint16>
-
  - static member Class.A : a:Task<uint32> -> Task<uint32>
-
  - static member Class.A : a:Task<uint64> -> Task<uint64>
-
  - static member Class.A : a:Task<uint8> -> Task<uint8>
-
  - static member Class.A : a:string -> string
 
 neg_many_many_overloads.fsx(124,1,124,34): typecheck error FS0041: No overloads match for method 'A'.
 
-
-
 Known type of argument: Type
 
-
-
 Available overloads:
- - static member Class.A : a:DateTime -> DateTime
-
- - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime>
-
- - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task>
-
- - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal>
-
- - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float>
-
- - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32>
-
- - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16>
-
- - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32>
-
- - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64>
-
- - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8>
-
- - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string>
-
- - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16>
-
- - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32>
-
- - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64>
-
- - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8>
-
- - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime>
-
- - static member Class.A : a:HashSet<Task> -> HashSet<Task>
-
- - static member Class.A : a:HashSet<decimal> -> HashSet<decimal>
-
- - static member Class.A : a:HashSet<float32> -> HashSet<float32>
-
- - static member Class.A : a:HashSet<float> -> HashSet<float>
-
- - static member Class.A : a:HashSet<int16> -> HashSet<int16>
-
- - static member Class.A : a:HashSet<int32> -> HashSet<int32>
-
- - static member Class.A : a:HashSet<int64> -> HashSet<int64>
-
- - static member Class.A : a:HashSet<int8> -> HashSet<int8>
-
- - static member Class.A : a:HashSet<string> -> HashSet<string>
-
- - static member Class.A : a:HashSet<uint16> -> HashSet<uint16>
-
- - static member Class.A : a:HashSet<uint32> -> HashSet<uint32>
-
- - static member Class.A : a:HashSet<uint64> -> HashSet<uint64>
-
- - static member Class.A : a:HashSet<uint8> -> HashSet<uint8>
-
- - static member Class.A : a:List<DateTime> -> List<DateTime>
-
- - static member Class.A : a:List<Task> -> List<Task>
-
- - static member Class.A : a:List<decimal> -> List<decimal>
-
- - static member Class.A : a:List<float32> -> List<float32>
-
- - static member Class.A : a:List<float> -> List<float>
-
- - static member Class.A : a:List<int16> -> List<int16>
-
- - static member Class.A : a:List<int32> -> List<int32>
-
- - static member Class.A : a:List<int64> -> List<int64>
-
- - static member Class.A : a:List<int8> -> List<int8>
-
- - static member Class.A : a:List<string> -> List<string>
-
- - static member Class.A : a:List<uint16> -> List<uint16>
-
- - static member Class.A : a:List<uint32> -> List<uint32>
-
- - static member Class.A : a:List<uint64> -> List<uint64>
-
- - static member Class.A : a:List<uint8> -> List<uint8>
-
- - static member Class.A : a:Queue<DateTime> -> Queue<DateTime>
-
- - static member Class.A : a:Queue<Task> -> Queue<Task>
-
- - static member Class.A : a:Queue<decimal> -> Queue<decimal>
-
- - static member Class.A : a:Queue<float32> -> Queue<float32>
-
- - static member Class.A : a:Queue<float> -> Queue<float>
-
- - static member Class.A : a:Queue<int16> -> Queue<int16>
-
- - static member Class.A : a:Queue<int32> -> Queue<int32>
-
- - static member Class.A : a:Queue<int64> -> Queue<int64>
-
- - static member Class.A : a:Queue<int8> -> Queue<int8>
-
- - static member Class.A : a:Queue<string> -> Queue<string>
-
- - static member Class.A : a:Queue<uint16> -> Queue<uint16>
-
- - static member Class.A : a:Queue<uint32> -> Queue<uint32>
-
- - static member Class.A : a:Queue<uint64> -> Queue<uint64>
-
- - static member Class.A : a:Queue<uint8> -> Queue<uint8>
-
- - static member Class.A : a:Task -> Task
-
- - static member Class.A : a:Task<DateTime> -> Task<DateTime>
-
- - static member Class.A : a:Task<Task> -> Task<Task>
-
- - static member Class.A : a:Task<decimal> -> Task<decimal>
-
- - static member Class.A : a:Task<float32> -> Task<float32>
-
- - static member Class.A : a:Task<float> -> Task<float>
-
- - static member Class.A : a:Task<int16> -> Task<int16>
-
- - static member Class.A : a:Task<int32> -> Task<int32>
-
- - static member Class.A : a:Task<int64> -> Task<int64>
-
- - static member Class.A : a:Task<int8> -> Task<int8>
-
- - static member Class.A : a:Task<string> -> Task<string>
-
- - static member Class.A : a:Task<uint16> -> Task<uint16>
-
- - static member Class.A : a:Task<uint32> -> Task<uint32>
-
- - static member Class.A : a:Task<uint64> -> Task<uint64>
-
- - static member Class.A : a:Task<uint8> -> Task<uint8>
-
- - static member Class.A : a:decimal -> decimal
-
- - static member Class.A : a:float -> float
-
- - static member Class.A : a:float32 -> float32
-
- - static member Class.A : a:int16 -> int16
-
- - static member Class.A : a:int32 -> int32
-
- - static member Class.A : a:int64 -> int64
-
- - static member Class.A : a:int8 -> int8
-
- - static member Class.A : a:string -> string
-
- - static member Class.A : a:uint16 -> uint16
-
- - static member Class.A : a:uint32 -> uint32
-
- - static member Class.A : a:uint64 -> uint64
-
- - static member Class.A : a:uint8 -> uint8
+ - static member Class.A : a:DateTime -> DateTime // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<Task> -> HashSet<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<decimal> -> HashSet<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<float32> -> HashSet<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<float> -> HashSet<float> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int16> -> HashSet<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int32> -> HashSet<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int64> -> HashSet<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int8> -> HashSet<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<string> -> HashSet<string> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint16> -> HashSet<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint32> -> HashSet<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint64> -> HashSet<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint8> -> HashSet<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:List<DateTime> -> List<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:List<Task> -> List<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:List<decimal> -> List<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:List<float32> -> List<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:List<float> -> List<float> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int16> -> List<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int32> -> List<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int64> -> List<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int8> -> List<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:List<string> -> List<string> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint16> -> List<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint32> -> List<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint64> -> List<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint8> -> List<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<DateTime> -> Queue<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<Task> -> Queue<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<decimal> -> Queue<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<float32> -> Queue<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<float> -> Queue<float> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int16> -> Queue<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int32> -> Queue<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int64> -> Queue<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int8> -> Queue<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<string> -> Queue<string> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint16> -> Queue<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint32> -> Queue<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint64> -> Queue<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint8> -> Queue<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:Task -> Task // Argument 'a' doesn't match
+ - static member Class.A : a:Task<DateTime> -> Task<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<Task> -> Task<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<decimal> -> Task<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<float32> -> Task<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<float> -> Task<float> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int16> -> Task<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int32> -> Task<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int64> -> Task<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int8> -> Task<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<string> -> Task<string> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint16> -> Task<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint32> -> Task<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint64> -> Task<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint8> -> Task<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:decimal -> decimal // Argument 'a' doesn't match
+ - static member Class.A : a:float -> float // Argument 'a' doesn't match
+ - static member Class.A : a:float32 -> float32 // Argument 'a' doesn't match
+ - static member Class.A : a:int16 -> int16 // Argument 'a' doesn't match
+ - static member Class.A : a:int32 -> int32 // Argument 'a' doesn't match
+ - static member Class.A : a:int64 -> int64 // Argument 'a' doesn't match
+ - static member Class.A : a:int8 -> int8 // Argument 'a' doesn't match
+ - static member Class.A : a:string -> string // Argument 'a' doesn't match
+ - static member Class.A : a:uint16 -> uint16 // Argument 'a' doesn't match
+ - static member Class.A : a:uint32 -> uint32 // Argument 'a' doesn't match
+ - static member Class.A : a:uint64 -> uint64 // Argument 'a' doesn't match
+ - static member Class.A : a:uint8 -> uint8 // Argument 'a' doesn't match
 
 neg_many_many_overloads.fsx(125,1,125,25): typecheck error FS0041: No overloads match for method 'A'.
 
-
-
 Known type of argument: Guid
 
-
-
 Available overloads:
- - static member Class.A : a:DateTime -> DateTime
-
- - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime>
-
- - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task>
-
- - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal>
-
- - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float>
-
- - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32>
-
- - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16>
-
- - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32>
-
- - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64>
-
- - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8>
-
- - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string>
-
- - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16>
-
- - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32>
-
- - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64>
-
- - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8>
-
- - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime>
-
- - static member Class.A : a:HashSet<Task> -> HashSet<Task>
-
- - static member Class.A : a:HashSet<decimal> -> HashSet<decimal>
-
- - static member Class.A : a:HashSet<float32> -> HashSet<float32>
-
- - static member Class.A : a:HashSet<float> -> HashSet<float>
-
- - static member Class.A : a:HashSet<int16> -> HashSet<int16>
-
- - static member Class.A : a:HashSet<int32> -> HashSet<int32>
-
- - static member Class.A : a:HashSet<int64> -> HashSet<int64>
-
- - static member Class.A : a:HashSet<int8> -> HashSet<int8>
-
- - static member Class.A : a:HashSet<string> -> HashSet<string>
-
- - static member Class.A : a:HashSet<uint16> -> HashSet<uint16>
-
- - static member Class.A : a:HashSet<uint32> -> HashSet<uint32>
-
- - static member Class.A : a:HashSet<uint64> -> HashSet<uint64>
-
- - static member Class.A : a:HashSet<uint8> -> HashSet<uint8>
-
- - static member Class.A : a:List<DateTime> -> List<DateTime>
-
- - static member Class.A : a:List<Task> -> List<Task>
-
- - static member Class.A : a:List<decimal> -> List<decimal>
-
- - static member Class.A : a:List<float32> -> List<float32>
-
- - static member Class.A : a:List<float> -> List<float>
-
- - static member Class.A : a:List<int16> -> List<int16>
-
- - static member Class.A : a:List<int32> -> List<int32>
-
- - static member Class.A : a:List<int64> -> List<int64>
-
- - static member Class.A : a:List<int8> -> List<int8>
-
- - static member Class.A : a:List<string> -> List<string>
-
- - static member Class.A : a:List<uint16> -> List<uint16>
-
- - static member Class.A : a:List<uint32> -> List<uint32>
-
- - static member Class.A : a:List<uint64> -> List<uint64>
-
- - static member Class.A : a:List<uint8> -> List<uint8>
-
- - static member Class.A : a:Queue<DateTime> -> Queue<DateTime>
-
- - static member Class.A : a:Queue<Task> -> Queue<Task>
-
- - static member Class.A : a:Queue<decimal> -> Queue<decimal>
-
- - static member Class.A : a:Queue<float32> -> Queue<float32>
-
- - static member Class.A : a:Queue<float> -> Queue<float>
-
- - static member Class.A : a:Queue<int16> -> Queue<int16>
-
- - static member Class.A : a:Queue<int32> -> Queue<int32>
-
- - static member Class.A : a:Queue<int64> -> Queue<int64>
-
- - static member Class.A : a:Queue<int8> -> Queue<int8>
-
- - static member Class.A : a:Queue<string> -> Queue<string>
-
- - static member Class.A : a:Queue<uint16> -> Queue<uint16>
-
- - static member Class.A : a:Queue<uint32> -> Queue<uint32>
-
- - static member Class.A : a:Queue<uint64> -> Queue<uint64>
-
- - static member Class.A : a:Queue<uint8> -> Queue<uint8>
-
- - static member Class.A : a:Task -> Task
-
- - static member Class.A : a:Task<DateTime> -> Task<DateTime>
-
- - static member Class.A : a:Task<Task> -> Task<Task>
-
- - static member Class.A : a:Task<decimal> -> Task<decimal>
-
- - static member Class.A : a:Task<float32> -> Task<float32>
-
- - static member Class.A : a:Task<float> -> Task<float>
-
- - static member Class.A : a:Task<int16> -> Task<int16>
-
- - static member Class.A : a:Task<int32> -> Task<int32>
-
- - static member Class.A : a:Task<int64> -> Task<int64>
-
- - static member Class.A : a:Task<int8> -> Task<int8>
-
- - static member Class.A : a:Task<string> -> Task<string>
-
- - static member Class.A : a:Task<uint16> -> Task<uint16>
-
- - static member Class.A : a:Task<uint32> -> Task<uint32>
-
- - static member Class.A : a:Task<uint64> -> Task<uint64>
-
- - static member Class.A : a:Task<uint8> -> Task<uint8>
-
- - static member Class.A : a:decimal -> decimal
-
- - static member Class.A : a:float -> float
-
- - static member Class.A : a:float32 -> float32
-
- - static member Class.A : a:int16 -> int16
-
- - static member Class.A : a:int32 -> int32
-
- - static member Class.A : a:int64 -> int64
-
- - static member Class.A : a:int8 -> int8
-
- - static member Class.A : a:string -> string
-
- - static member Class.A : a:uint16 -> uint16
-
- - static member Class.A : a:uint32 -> uint32
-
- - static member Class.A : a:uint64 -> uint64
-
- - static member Class.A : a:uint8 -> uint8
-
-neg_many_many_overloads.fsx(126,1,126,48): typecheck error FS0041: No overloads match for method 'A'.
-
-
-
-Known type of argument: DayOfWeek
+ - static member Class.A : a:DateTime -> DateTime // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<Task> -> HashSet<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<decimal> -> HashSet<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<float32> -> HashSet<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<float> -> HashSet<float> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int16> -> HashSet<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int32> -> HashSet<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int64> -> HashSet<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int8> -> HashSet<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<string> -> HashSet<string> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint16> -> HashSet<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint32> -> HashSet<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint64> -> HashSet<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint8> -> HashSet<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:List<DateTime> -> List<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:List<Task> -> List<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:List<decimal> -> List<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:List<float32> -> List<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:List<float> -> List<float> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int16> -> List<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int32> -> List<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int64> -> List<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int8> -> List<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:List<string> -> List<string> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint16> -> List<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint32> -> List<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint64> -> List<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint8> -> List<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<DateTime> -> Queue<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<Task> -> Queue<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<decimal> -> Queue<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<float32> -> Queue<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<float> -> Queue<float> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int16> -> Queue<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int32> -> Queue<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int64> -> Queue<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int8> -> Queue<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<string> -> Queue<string> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint16> -> Queue<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint32> -> Queue<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint64> -> Queue<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint8> -> Queue<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:Task -> Task // Argument 'a' doesn't match
+ - static member Class.A : a:Task<DateTime> -> Task<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<Task> -> Task<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<decimal> -> Task<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<float32> -> Task<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<float> -> Task<float> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int16> -> Task<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int32> -> Task<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int64> -> Task<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int8> -> Task<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<string> -> Task<string> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint16> -> Task<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint32> -> Task<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint64> -> Task<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint8> -> Task<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:decimal -> decimal // Argument 'a' doesn't match
+ - static member Class.A : a:float -> float // Argument 'a' doesn't match
+ - static member Class.A : a:float32 -> float32 // Argument 'a' doesn't match
+ - static member Class.A : a:int16 -> int16 // Argument 'a' doesn't match
+ - static member Class.A : a:int32 -> int32 // Argument 'a' doesn't match
+ - static member Class.A : a:int64 -> int64 // Argument 'a' doesn't match
+ - static member Class.A : a:int8 -> int8 // Argument 'a' doesn't match
+ - static member Class.A : a:string -> string // Argument 'a' doesn't match
+ - static member Class.A : a:uint16 -> uint16 // Argument 'a' doesn't match
+ - static member Class.A : a:uint32 -> uint32 // Argument 'a' doesn't match
+ - static member Class.A : a:uint64 -> uint64 // Argument 'a' doesn't match
+ - static member Class.A : a:uint8 -> uint8 // Argument 'a' doesn't match
 
+neg_many_many_overloads.fsx(126,1,126,48): typecheck error FS0041: No overloads match for method 'A'.
 
+Known type of argument: DayOfWeek
 
 Available overloads:
- - static member Class.A : a:DateTime -> DateTime
-
- - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime>
-
- - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task>
-
- - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal>
-
- - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float>
-
- - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32>
-
- - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16>
-
- - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32>
-
- - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64>
-
- - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8>
-
- - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string>
-
- - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16>
-
- - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32>
-
- - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64>
-
- - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8>
-
- - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime>
-
- - static member Class.A : a:HashSet<Task> -> HashSet<Task>
-
- - static member Class.A : a:HashSet<decimal> -> HashSet<decimal>
-
- - static member Class.A : a:HashSet<float32> -> HashSet<float32>
-
- - static member Class.A : a:HashSet<float> -> HashSet<float>
-
- - static member Class.A : a:HashSet<int16> -> HashSet<int16>
-
- - static member Class.A : a:HashSet<int32> -> HashSet<int32>
-
- - static member Class.A : a:HashSet<int64> -> HashSet<int64>
-
- - static member Class.A : a:HashSet<int8> -> HashSet<int8>
-
- - static member Class.A : a:HashSet<string> -> HashSet<string>
-
- - static member Class.A : a:HashSet<uint16> -> HashSet<uint16>
-
- - static member Class.A : a:HashSet<uint32> -> HashSet<uint32>
-
- - static member Class.A : a:HashSet<uint64> -> HashSet<uint64>
-
- - static member Class.A : a:HashSet<uint8> -> HashSet<uint8>
-
- - static member Class.A : a:List<DateTime> -> List<DateTime>
-
- - static member Class.A : a:List<Task> -> List<Task>
-
- - static member Class.A : a:List<decimal> -> List<decimal>
-
- - static member Class.A : a:List<float32> -> List<float32>
-
- - static member Class.A : a:List<float> -> List<float>
-
- - static member Class.A : a:List<int16> -> List<int16>
-
- - static member Class.A : a:List<int32> -> List<int32>
-
- - static member Class.A : a:List<int64> -> List<int64>
-
- - static member Class.A : a:List<int8> -> List<int8>
-
- - static member Class.A : a:List<string> -> List<string>
-
- - static member Class.A : a:List<uint16> -> List<uint16>
-
- - static member Class.A : a:List<uint32> -> List<uint32>
-
- - static member Class.A : a:List<uint64> -> List<uint64>
-
- - static member Class.A : a:List<uint8> -> List<uint8>
-
- - static member Class.A : a:Queue<DateTime> -> Queue<DateTime>
-
- - static member Class.A : a:Queue<Task> -> Queue<Task>
-
- - static member Class.A : a:Queue<decimal> -> Queue<decimal>
-
- - static member Class.A : a:Queue<float32> -> Queue<float32>
-
- - static member Class.A : a:Queue<float> -> Queue<float>
-
- - static member Class.A : a:Queue<int16> -> Queue<int16>
-
- - static member Class.A : a:Queue<int32> -> Queue<int32>
-
- - static member Class.A : a:Queue<int64> -> Queue<int64>
-
- - static member Class.A : a:Queue<int8> -> Queue<int8>
-
- - static member Class.A : a:Queue<string> -> Queue<string>
-
- - static member Class.A : a:Queue<uint16> -> Queue<uint16>
-
- - static member Class.A : a:Queue<uint32> -> Queue<uint32>
-
- - static member Class.A : a:Queue<uint64> -> Queue<uint64>
-
- - static member Class.A : a:Queue<uint8> -> Queue<uint8>
-
- - static member Class.A : a:Task -> Task
-
- - static member Class.A : a:Task<DateTime> -> Task<DateTime>
-
- - static member Class.A : a:Task<Task> -> Task<Task>
-
- - static member Class.A : a:Task<decimal> -> Task<decimal>
-
- - static member Class.A : a:Task<float32> -> Task<float32>
-
- - static member Class.A : a:Task<float> -> Task<float>
-
- - static member Class.A : a:Task<int16> -> Task<int16>
-
- - static member Class.A : a:Task<int32> -> Task<int32>
-
- - static member Class.A : a:Task<int64> -> Task<int64>
-
- - static member Class.A : a:Task<int8> -> Task<int8>
-
- - static member Class.A : a:Task<string> -> Task<string>
-
- - static member Class.A : a:Task<uint16> -> Task<uint16>
-
- - static member Class.A : a:Task<uint32> -> Task<uint32>
-
- - static member Class.A : a:Task<uint64> -> Task<uint64>
-
- - static member Class.A : a:Task<uint8> -> Task<uint8>
-
- - static member Class.A : a:decimal -> decimal
-
- - static member Class.A : a:float -> float
-
- - static member Class.A : a:float32 -> float32
-
- - static member Class.A : a:int16 -> int16
-
- - static member Class.A : a:int32 -> int32
-
- - static member Class.A : a:int64 -> int64
-
- - static member Class.A : a:int8 -> int8
-
- - static member Class.A : a:string -> string
-
- - static member Class.A : a:uint16 -> uint16
-
- - static member Class.A : a:uint32 -> uint32
-
- - static member Class.A : a:uint64 -> uint64
-
- - static member Class.A : a:uint8 -> uint8
+ - static member Class.A : a:DateTime -> DateTime // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<DateTime,DateTime> -> Dictionary<DateTime,DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<Task,Task> -> Dictionary<Task,Task> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<decimal,decimal> -> Dictionary<decimal,decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<float,float> -> Dictionary<float,float> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<float32,float32> -> Dictionary<float32,float32> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int16,int16> -> Dictionary<int16,int16> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int32,int32> -> Dictionary<int32,int32> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int64,int64> -> Dictionary<int64,int64> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<int8,int8> -> Dictionary<int8,int8> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<string,string> -> Dictionary<string,string> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint16,uint16> -> Dictionary<uint16,uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint32,uint32> -> Dictionary<uint32,uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint64,uint64> -> Dictionary<uint64,uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:Dictionary<uint8,uint8> -> Dictionary<uint8,uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<DateTime> -> HashSet<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<Task> -> HashSet<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<decimal> -> HashSet<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<float32> -> HashSet<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<float> -> HashSet<float> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int16> -> HashSet<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int32> -> HashSet<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int64> -> HashSet<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<int8> -> HashSet<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<string> -> HashSet<string> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint16> -> HashSet<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint32> -> HashSet<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint64> -> HashSet<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:HashSet<uint8> -> HashSet<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:List<DateTime> -> List<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:List<Task> -> List<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:List<decimal> -> List<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:List<float32> -> List<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:List<float> -> List<float> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int16> -> List<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int32> -> List<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int64> -> List<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:List<int8> -> List<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:List<string> -> List<string> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint16> -> List<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint32> -> List<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint64> -> List<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:List<uint8> -> List<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<DateTime> -> Queue<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<Task> -> Queue<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<decimal> -> Queue<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<float32> -> Queue<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<float> -> Queue<float> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int16> -> Queue<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int32> -> Queue<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int64> -> Queue<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<int8> -> Queue<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<string> -> Queue<string> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint16> -> Queue<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint32> -> Queue<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint64> -> Queue<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:Queue<uint8> -> Queue<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:Task -> Task // Argument 'a' doesn't match
+ - static member Class.A : a:Task<DateTime> -> Task<DateTime> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<Task> -> Task<Task> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<decimal> -> Task<decimal> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<float32> -> Task<float32> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<float> -> Task<float> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int16> -> Task<int16> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int32> -> Task<int32> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int64> -> Task<int64> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<int8> -> Task<int8> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<string> -> Task<string> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint16> -> Task<uint16> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint32> -> Task<uint32> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint64> -> Task<uint64> // Argument 'a' doesn't match
+ - static member Class.A : a:Task<uint8> -> Task<uint8> // Argument 'a' doesn't match
+ - static member Class.A : a:decimal -> decimal // Argument 'a' doesn't match
+ - static member Class.A : a:float -> float // Argument 'a' doesn't match
+ - static member Class.A : a:float32 -> float32 // Argument 'a' doesn't match
+ - static member Class.A : a:int16 -> int16 // Argument 'a' doesn't match
+ - static member Class.A : a:int32 -> int32 // Argument 'a' doesn't match
+ - static member Class.A : a:int64 -> int64 // Argument 'a' doesn't match
+ - static member Class.A : a:int8 -> int8 // Argument 'a' doesn't match
+ - static member Class.A : a:string -> string // Argument 'a' doesn't match
+ - static member Class.A : a:uint16 -> uint16 // Argument 'a' doesn't match
+ - static member Class.A : a:uint32 -> uint32 // Argument 'a' doesn't match
+ - static member Class.A : a:uint64 -> uint64 // Argument 'a' doesn't match
+ - static member Class.A : a:uint8 -> uint8 // Argument 'a' doesn't match
diff --git a/tests/fsharp/typecheck/overloads/neg_tupled_arguments.bsl b/tests/fsharp/typecheck/overloads/neg_tupled_arguments.bsl
new file mode 100644
index 0000000000..363c182bf3
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_tupled_arguments.bsl
@@ -0,0 +1,18 @@
+
+neg_tupled_arguments.fsx(6,9,6,31): typecheck error FS0041: No overloads match for method 'A'.
+
+Known types of arguments: (int * (int * string) * int) * int
+
+Available overloads:
+ - static member A.A : ('a0 * ('a1 * int) * 'a2) * ('a3 * ('a4 * 'a5)) -> 'a0 * 'a1 * int * 'a2 * 'a3 * 'a4 * 'a5 // Argument at index 1 doesn't match
+ - static member A.A : ('a0 * ('a1 * int) * 'a2) * e:'a3 -> 'a0 * 'a1 * int * 'a2 * 'a3 // Argument at index 1 doesn't match
+
+neg_tupled_arguments.fsx(7,9,7,28): typecheck error FS0503: A member or object constructor 'A' taking 4 arguments is not accessible from this code location. All accessible versions of method 'A' take 2 arguments.
+
+neg_tupled_arguments.fsx(14,9,14,40): typecheck error FS0041: No overloads match for method 'B'.
+
+Known types of arguments: int * int * (int * (int * int * int * (int * int))) * int * int
+
+Available overloads:
+ - static member B.B : a:'a0 * b:'a1 * ('a2 * ('a3 * 'a4 * 'a5 * ('a6 * decimal))) * i:'a7 * j:'a8 -> 'a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5 * 'a6 * decimal * 'a7 * 'a8 // Argument at index 3 doesn't match
+ - static member B.B : a:'a0 * b:'a1 * ('a2 * ('a3 * 'a4 * 'a5 * ('a6 * string))) * i:'a7 * j:'a8 -> 'a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5 * 'a6 * string * 'a7 * 'a8 // Argument at index 3 doesn't match
diff --git a/tests/fsharp/typecheck/overloads/neg_tupled_arguments.fsx b/tests/fsharp/typecheck/overloads/neg_tupled_arguments.fsx
new file mode 100644
index 0000000000..53fc7e76d7
--- /dev/null
+++ b/tests/fsharp/typecheck/overloads/neg_tupled_arguments.fsx
@@ -0,0 +1,14 @@
+type A() =
+    static member A ((a,(b,(c:int)),d),e) = a,b,c,d,e
+    static member A ((a,(b,(c:int)),d),(e,(f,g))) = a,b,c,d,e,f,g
+    ;;
+    
+let a = A.A ((1,(2,("")),4),5);;
+let a = A.A("a",("",1),1,1);;
+
+
+type B =
+    static member B (a,b,(c,(d,e,f,(g,h:string))),i,j)         = a,b,c,d,e,f,g,h,i,j
+    static member B (a,b,(c,(d,e,f,(g,h:decimal))),i,j)         = a,b,c,d,e,f,g,h,i,j
+;;
+let b = B.B(1,2,(3,(4,5,6,(7,8))),9,10);;
diff --git a/tests/fsharp/typecheck/sigs/neg06.bsl b/tests/fsharp/typecheck/sigs/neg06.bsl
index 4f095970fc..59553cc99b 100644
--- a/tests/fsharp/typecheck/sigs/neg06.bsl
+++ b/tests/fsharp/typecheck/sigs/neg06.bsl
@@ -140,15 +140,10 @@ neg06.fs(375,9,375,10): typecheck error FS1197: The parameter 'x' was inferred t
 
 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.
 
-
-
 Known type of argument: '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.
diff --git a/tests/fsharp/typecheck/sigs/neg106.bsl b/tests/fsharp/typecheck/sigs/neg106.bsl
index 3d00ac07ce..373bf01fe9 100644
--- a/tests/fsharp/typecheck/sigs/neg106.bsl
+++ b/tests/fsharp/typecheck/sigs/neg106.bsl
@@ -3,51 +3,31 @@ neg106.fs(8,59,8,61): typecheck error FS3230: A value defined in a module must b
 
 neg106.fs(13,18,13,72): typecheck error FS0041: No overloads match for method 'CompareExchange'.
 
-
-
 Known types of arguments: 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
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32 // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int64>, value: int64, comparand: int64) : int64 // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<obj>, value: obj, comparand: obj) : obj // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange<'T when 'T : not struct>(location1: byref<'T>, value: 'T, comparand: 'T) : 'T // Argument 'location1' doesn't match
 
 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'.
 
-
-
 Known types of arguments: 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
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32 // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int64>, value: int64, comparand: int64) : int64 // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<obj>, value: obj, comparand: obj) : obj // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange<'T when 'T : not struct>(location1: byref<'T>, value: 'T, comparand: 'T) : 'T // Argument 'location1' doesn't match
 
 neg106.fs(23,35,23,39): typecheck error FS0001: Type mismatch. Expecting a
     'byref<int>'    
@@ -63,29 +43,19 @@ 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'.
 
-
-
 Known types of arguments: 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
+ - static member C.M : a:int * x:byref<int> -> unit // Argument 'a' doesn't match
+ - static member C.M : a:string * x:byref<int> -> unit // Argument 'x' doesn't match
 
 neg106.fs(41,19,41,31): typecheck error FS0041: No overloads match for method 'M'.
 
-
-
 Known types of arguments: 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
+ - static member C.M : a:int * x:byref<int> -> unit // Argument 'x' doesn't match
+ - static member C.M : a:string * x:byref<int> -> unit // Argument 'a' doesn't match
 
 neg106.fs(49,22,49,26): typecheck error FS0001: Type mismatch. Expecting a
     'byref<int>'    
diff --git a/tests/fsharp/typecheck/sigs/neg106.vsbsl b/tests/fsharp/typecheck/sigs/neg106.vsbsl
index 3d00ac07ce..373bf01fe9 100644
--- a/tests/fsharp/typecheck/sigs/neg106.vsbsl
+++ b/tests/fsharp/typecheck/sigs/neg106.vsbsl
@@ -3,51 +3,31 @@ neg106.fs(8,59,8,61): typecheck error FS3230: A value defined in a module must b
 
 neg106.fs(13,18,13,72): typecheck error FS0041: No overloads match for method 'CompareExchange'.
 
-
-
 Known types of arguments: 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
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32 // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int64>, value: int64, comparand: int64) : int64 // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<obj>, value: obj, comparand: obj) : obj // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange<'T when 'T : not struct>(location1: byref<'T>, value: 'T, comparand: 'T) : 'T // Argument 'location1' doesn't match
 
 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'.
 
-
-
 Known types of arguments: 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
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float32>, value: float32, comparand: float32) : float32 // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<float>, value: float, comparand: float) : float // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int64>, value: int64, comparand: int64) : int64 // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<nativeint>, value: nativeint, comparand: nativeint) : nativeint // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange(location1: byref<obj>, value: obj, comparand: obj) : obj // Argument 'location1' doesn't match
+ - System.Threading.Interlocked.CompareExchange<'T when 'T : not struct>(location1: byref<'T>, value: 'T, comparand: 'T) : 'T // Argument 'location1' doesn't match
 
 neg106.fs(23,35,23,39): typecheck error FS0001: Type mismatch. Expecting a
     'byref<int>'    
@@ -63,29 +43,19 @@ 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'.
 
-
-
 Known types of arguments: 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
+ - static member C.M : a:int * x:byref<int> -> unit // Argument 'a' doesn't match
+ - static member C.M : a:string * x:byref<int> -> unit // Argument 'x' doesn't match
 
 neg106.fs(41,19,41,31): typecheck error FS0041: No overloads match for method 'M'.
 
-
-
 Known types of arguments: 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
+ - static member C.M : a:int * x:byref<int> -> unit // Argument 'x' doesn't match
+ - static member C.M : a:string * x:byref<int> -> unit // Argument 'a' doesn't match
 
 neg106.fs(49,22,49,26): typecheck error FS0001: Type mismatch. Expecting a
     'byref<int>'    
diff --git a/tests/fsharp/typecheck/sigs/neg20.bsl b/tests/fsharp/typecheck/sigs/neg20.bsl
index c7fc162c29..4227ab0719 100644
--- a/tests/fsharp/typecheck/sigs/neg20.bsl
+++ b/tests/fsharp/typecheck/sigs/neg20.bsl
@@ -161,16 +161,11 @@ but here has type
 
 neg20.fs(131,5,131,24): typecheck error FS0041: No overloads match for method 'OM3'.
 
-
-
 Known types of arguments: string * obj
 
-
-
 Available overloads:
- - static member C.OM3 : x:'b * y:'b -> int
-
- - static member C.OM3 : x:'b * y:int -> int
+ - static member C.OM3 : x:'b * y:'b -> int // Argument 'y' doesn't match
+ - static member C.OM3 : x:'b * y:int -> int // Argument 'y' doesn't match
 
 neg20.fs(152,13,152,23): typecheck error FS0033: The type 'Test.BadNumberOfGenericParameters.C<_>' expects 1 type argument(s) but is given 2
 
@@ -202,16 +197,11 @@ neg20.fs(167,13,167,31): typecheck error FS0502: The member or object constructo
 
 neg20.fs(182,14,182,31): typecheck error FS0041: No overloads match for method 'M'.
 
-
-
 Known types of arguments: string * obj
 
-
-
 Available overloads:
- - static member C2.M : fmt:string * [<System.ParamArray>] args:int [] -> string
-
- - static member C2.M : fmt:string * [<System.ParamArray>] args:int [] -> string
+ - static member C2.M : fmt:string * [<System.ParamArray>] args:int [] -> string // Argument 'args' doesn't match
+ - static member C2.M : fmt:string * [<System.ParamArray>] args:int [] -> string // Argument at index 1 doesn't match
 
 neg20.fs(183,29,183,34): typecheck error FS0001: This expression was expected to have type
     'int'    
@@ -260,16 +250,11 @@ but here has type
 
 neg20.fs(188,14,188,31): typecheck error FS0041: No overloads match for method 'M'.
 
-
-
 Known types of arguments: string * obj
 
-
-
 Available overloads:
- - static member C3.M : fmt:string * [<System.ParamArray>] args:string [] -> string
-
- - static member C3.M : fmt:string * [<System.ParamArray>] args:string [] -> string
+ - static member C3.M : fmt:string * [<System.ParamArray>] args:string [] -> string // Argument 'args' doesn't match
+ - static member C3.M : fmt:string * [<System.ParamArray>] args:string [] -> string // Argument at index 1 doesn't match
 
 neg20.fs(189,29,189,34): typecheck error FS0001: This expression was expected to have type
     'string'    
@@ -394,30 +379,19 @@ neg20.fs(322,8,322,18): typecheck error FS3132: This type definition may not hav
 
 neg20.fs(335,11,335,24): typecheck error FS0041: A unique overload for method 'String' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
-Known type of argument: 'a
-
-
+Known type of argument: 'a0
 
 Candidates:
  - System.String(value: char []) : System.String
-
  - System.String(value: nativeptr<char>) : System.String
-
  - System.String(value: nativeptr<sbyte>) : System.String
 
 neg20.fs(336,11,336,22): typecheck error FS0041: A unique overload for method 'Guid' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
-Known type of argument: 'a
-
-
+Known type of argument: 'a0
 
 Candidates:
  - System.Guid(b: byte []) : System.Guid
-
  - System.Guid(g: string) : System.Guid
 
 neg20.fs(355,19,355,38): typecheck error FS1124: Multiple types exist called 'OverloadedClassName', taking different numbers of generic parameters. Provide a type instantiation to disambiguate the type resolution, e.g. 'OverloadedClassName<_>'.
diff --git a/tests/fsharp/typecheck/sigs/neg45.bsl b/tests/fsharp/typecheck/sigs/neg45.bsl
index c338d61611..a7bf6e9454 100644
--- a/tests/fsharp/typecheck/sigs/neg45.bsl
+++ b/tests/fsharp/typecheck/sigs/neg45.bsl
@@ -55,41 +55,26 @@ neg45.fs(81,35,81,40): typecheck error FS0001: A type parameter is missing a con
 
 neg45.fs(89,26,89,40): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: R1
 
-
-
 Candidates:
  - member D.M : 'a -> 'b
-
  - member D.M : 'a -> 'b
 
 neg45.fs(97,26,97,55): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: (R1 * R1)
 
-
-
 Candidates:
  - member D.M : 'a -> 'b
-
  - member D.M : 'a -> 'b
 
 neg45.fs(104,26,104,31): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known type of argument: int
 
-
-
 Candidates:
  - member D.M : 'a -> 'b
-
  - member D.M : 'a -> 'b
 
 neg45.fs(105,24,105,25): typecheck error FS0025: Incomplete pattern matches on this expression. For example, the value '0' may indicate a case not covered by the pattern(s).
diff --git a/tests/fsharp/typecheck/sigs/neg61.bsl b/tests/fsharp/typecheck/sigs/neg61.bsl
index a6a49132d3..2811c3198e 100644
--- a/tests/fsharp/typecheck/sigs/neg61.bsl
+++ b/tests/fsharp/typecheck/sigs/neg61.bsl
@@ -85,16 +85,11 @@ neg61.fs(171,13,171,18): typecheck error FS3099: 'sumBy' is used with an incorre
 
 neg61.fs(174,22,174,23): typecheck error FS0041: No overloads match for method 'Source'.
 
-
-
 Known type of argument: int
 
-
-
 Available overloads:
- - member Linq.QueryBuilder.Source : source:System.Collections.Generic.IEnumerable<'T> -> Linq.QuerySource<'T,System.Collections.IEnumerable>
-
- - member Linq.QueryBuilder.Source : source:System.Linq.IQueryable<'T> -> Linq.QuerySource<'T,'Q>
+ - member Linq.QueryBuilder.Source : source:System.Collections.Generic.IEnumerable<'T> -> Linq.QuerySource<'T,System.Collections.IEnumerable> // Argument 'source' doesn't match
+ - member Linq.QueryBuilder.Source : source:System.Linq.IQueryable<'T> -> Linq.QuerySource<'T,'Q> // Argument 'source' doesn't match
 
 neg61.fs(180,19,180,31): typecheck error FS3153: Arguments to query operators may require parentheses, e.g. 'where (x > y)' or 'groupBy (x.Length / 10)'
 
diff --git a/tests/fsharp/typecheck/sigs/neg_byref_13.bsl b/tests/fsharp/typecheck/sigs/neg_byref_13.bsl
index 985177e979..af1356864f 100644
--- a/tests/fsharp/typecheck/sigs/neg_byref_13.bsl
+++ b/tests/fsharp/typecheck/sigs/neg_byref_13.bsl
@@ -5,4 +5,4 @@ neg_byref_13.fs(3,12,3,13): typecheck error FS3300: The parameter 'x' has an inv
 
 neg_byref_13.fs(3,5,3,10): typecheck error FS3301: The function or method has an invalid return type 'M5'. This is not permitted by the rules of Common IL.
 
-neg_byref_13.fs(3,20,3,21): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL.
\ No newline at end of file
+neg_byref_13.fs(3,20,3,21): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL.
diff --git a/tests/fsharpqa/Source/Optimizations/Inlining/env.lst b/tests/fsharpqa/Source/Optimizations/Inlining/env.lst
index 8d8d11c5d5..9c95c7c654 100644
--- a/tests/fsharpqa/Source/Optimizations/Inlining/env.lst
+++ b/tests/fsharpqa/Source/Optimizations/Inlining/env.lst
@@ -1,3 +1,3 @@
-#NoMT	SOURCE=Match01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match01.dll"	# Match01.fs
+NoMT	SOURCE=Match01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match01.dll"	# Match01.fs
 NoMT	SOURCE=Match02.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match02.dll"	# Match02.fs
 NoMT	SOURCE=StructUnion01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd StructUnion01.dll"	# StructUnion01.fs

From 207a58401b67a0feb0a9dcd752981a83e5c1d244 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sun, 19 Jan 2020 17:44:28 +0100
Subject: [PATCH 64/96] minor updates to testguide and devguide

---
 DEVGUIDE.md                                   |  2 +-
 tests/fsharp/readme.md                        |  6 ++--
 .../fsharp/update.base.line.with.actuals.fsx  | 36 -------------------
 tests/scripts/update-baselines.fsx            | 14 +++++---
 4 files changed, 13 insertions(+), 45 deletions(-)
 delete mode 100644 tests/fsharp/update.base.line.with.actuals.fsx

diff --git a/DEVGUIDE.md b/DEVGUIDE.md
index 5c6f51c3c8..712ac7eb5f 100644
--- a/DEVGUIDE.md
+++ b/DEVGUIDE.md
@@ -45,7 +45,7 @@ Building is simple:
 
 Desktop tests can be run with:
 
-    build.cmd -test
+    build.cmd -test -c Release
 
 After you build the first time you can open and use this solution in Visual Studio:
 
diff --git a/tests/fsharp/readme.md b/tests/fsharp/readme.md
index c12bf5a5e4..f4e4af1e49 100644
--- a/tests/fsharp/readme.md
+++ b/tests/fsharp/readme.md
@@ -2,7 +2,7 @@
 
 ## Layout
 
-The tests are NUNIT test cases..  They test a very wide range of compiler, interactive and FSharp.Core scenarios.
+The tests are NUNIT test cases. They test a very wide range of compiler, interactive and FSharp.Core scenarios.
 
 The bulk of the test cases are enumerated in tests.fs, these are the old cambridge test suite.  They build on a test-suite ported from windows batch files.  They run the compiler and fsi as seperate processes, when built for the coreclr it runs the coreclr versions using dotnet.exe 
 
@@ -60,8 +60,6 @@ let changeX() =
 
 When a test is run, .err/.vserr output files are created and compared to their matching .bsl files.
 
-When many tests fail due to a change being worked on, the [update.base.line.with.actuals.fsx](update.base.line.with.actuals.fsx) script helps updating the .bsl against the actuals.
-
-After editing the folder list, evaluating the script should replace the .bsl files with actual .err/.vserr, after which the same test is supposed to pass.
+Refer to [Test Guide](../../TESTGUIDE.md#baselines) to know more about how to update them.
 
 Tests are organized under modules as functions bearing NUnit `[<Test>]` attribute and can be run from an IDE or the command line (see the [Test Guide](../../TESTGUIDE.md)).
diff --git a/tests/fsharp/update.base.line.with.actuals.fsx b/tests/fsharp/update.base.line.with.actuals.fsx
deleted file mode 100644
index bba6154b63..0000000000
--- a/tests/fsharp/update.base.line.with.actuals.fsx
+++ /dev/null
@@ -1,36 +0,0 @@
-open System.IO
-
-// this script is usefull for tests using a .bsl file (baseline) containing expected compiler output
-// which is matched against .vserr or .err file aside once the test has run
-// the script replaces all the .bsl/.bslpp with either .err or .vserr
-
-let directories =
-    [
-      "typecheck/sigs"
-      "typecheck/overloads"
-      "conformance/expressions/syntacticsugar"
-      "conformance/expressions/type-relatedexpressions"
-      "typecheck/sigs"
-      "conformance/inference"
-      "conformance/wellformedness"
-      "typeProviders/negTests"
-      "conformance/lexicalanalysis"
-    ]
-    |> List.map (fun d -> Path.Combine(__SOURCE_DIRECTORY__, d) |> DirectoryInfo)
-
-let extensionPatterns = ["*.err"; "*.vserr"]
-for d in directories do
-    for p in extensionPatterns do 
-        for errFile in d.GetFiles p do
-            let baseLineFile = FileInfo(Path.ChangeExtension(errFile.FullName, "bsl"))
-            let baseLineFilePreProcess = FileInfo(Path.ChangeExtension(errFile.FullName, "bslpp"))
-            if not baseLineFile.Exists then () else
-            try
-                if File.ReadAllText(errFile.FullName) <> File.ReadAllText(baseLineFile.FullName) then
-                    let expectedFile =
-                        if baseLineFilePreProcess.Exists then baseLineFilePreProcess
-                        else baseLineFile
-
-                    printfn "%s not matching, replacing with %s" expectedFile.FullName errFile.FullName
-                    errFile.CopyTo(expectedFile.FullName, true) |> ignore
-            with e -> printfn "error, proceeding...\n%A" e
\ No newline at end of file
diff --git a/tests/scripts/update-baselines.fsx b/tests/scripts/update-baselines.fsx
index 389517a9c3..3659bbbcda 100644
--- a/tests/scripts/update-baselines.fsx
+++ b/tests/scripts/update-baselines.fsx
@@ -53,11 +53,17 @@ let fsdiff actualFile expectedFile =
 
 let directories =
     [
-      "../fsharp/typecheck/sigs"
-      "../fsharp/typeProviders/negTests"
-      "../fsharpqa/Source"
+      "typecheck/sigs"
+      "typecheck/overloads"
+      "conformance/expressions/syntacticsugar"
+      "conformance/expressions/type-relatedexpressions"
+      "typecheck/sigs"
+      "conformance/inference"
+      "conformance/wellformedness"
+      "typeProviders/negTests"
+      "conformance/lexicalanalysis"
     ]
-    |> List.map (fun d -> Path.Combine(__SOURCE_DIRECTORY__, d) |> DirectoryInfo)
+    |> List.map (fun d -> Path.Combine(__SOURCE_DIRECTORY__, ".." , "fsharp",d) |> DirectoryInfo)
 
 let extensionPatterns = ["*.bsl"; "*.vsbsl"; "*.il.bsl"]
 for d in directories do

From 7ca85afc2b9ce4b75909ae19ad0aa8c977025622 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sun, 19 Jan 2020 18:47:35 +0100
Subject: [PATCH 65/96] fix PrimitiveConstraints.``Invalid object constructor``
 test

---
 tests/fsharp/Compiler/CompilerAssert.fs       | 31 +++++++++++++++++++
 .../ConstraintSolver/PrimitiveConstraints.fs  | 18 ++---------
 .../constructors/neg_invalid_constructor.bsl  | 22 +++++++++++++
 .../constructors/neg_invalid_constructor.fs   |  7 +++++
 4 files changed, 62 insertions(+), 16 deletions(-)
 create mode 100644 tests/fsharp/typecheck/constructors/neg_invalid_constructor.bsl
 create mode 100644 tests/fsharp/typecheck/constructors/neg_invalid_constructor.fs

diff --git a/tests/fsharp/Compiler/CompilerAssert.fs b/tests/fsharp/Compiler/CompilerAssert.fs
index f38a105287..6eea519afd 100644
--- a/tests/fsharp/Compiler/CompilerAssert.fs
+++ b/tests/fsharp/Compiler/CompilerAssert.fs
@@ -415,6 +415,37 @@ let main argv = 0"""
 
             Assert.IsEmpty(typeCheckResults.Errors, sprintf "Type Check errors: %A" typeCheckResults.Errors)
 
+    static member TypeCheckWithErrorsAndOptionsAgainstBaseLine options (sourceFile: string) =
+        lock gate <| fun () ->
+            let absoluteSourceFile = System.IO.Path.Combine(__SOURCE_DIRECTORY__, "..", sourceFile)
+            let parseResults, fileAnswer =
+                checker.ParseAndCheckFileInProject(
+                    sourceFile,
+                    0,
+                    SourceText.ofString (File.ReadAllText absoluteSourceFile),
+                    { defaultProjectOptions with OtherOptions = Array.append options defaultProjectOptions.OtherOptions; SourceFiles = [|sourceFile|] })
+                |> Async.RunSynchronously
+
+            Assert.IsEmpty(parseResults.Errors, sprintf "Parse errors: %A" parseResults.Errors)
+
+            match fileAnswer with
+            | FSharpCheckFileAnswer.Aborted _ -> Assert.Fail("Type Checker Aborted")
+            | FSharpCheckFileAnswer.Succeeded(typeCheckResults) ->
+
+            let errorsExpectedBaseLine =
+                let bslFile = Path.ChangeExtension(absoluteSourceFile, "bsl")
+                if not (File.Exists bslFile) then
+                    // new test likely initialized, create empty baseline file
+                    File.WriteAllText(bslFile, "")
+                File.ReadAllText(Path.ChangeExtension(absoluteSourceFile, "bsl"))
+            let errorsActual =
+                typeCheckResults.Errors
+                |> Array.map (sprintf "%A")
+                |> String.concat "\n" 
+            File.WriteAllText(Path.ChangeExtension(absoluteSourceFile,"err"), errorsActual)
+
+            Assert.AreEqual(errorsExpectedBaseLine.Replace("\r\n","\n"), errorsActual.Replace("\r\n","\n"))
+
     static member TypeCheckWithErrorsAndOptionsAndAdjust options libAdjust (source: string) expectedTypeErrors =
         lock gate <| fun () ->
             let errors =
diff --git a/tests/fsharp/Compiler/ConstraintSolver/PrimitiveConstraints.fs b/tests/fsharp/Compiler/ConstraintSolver/PrimitiveConstraints.fs
index 0b61ffbb96..1a77b4431e 100644
--- a/tests/fsharp/Compiler/ConstraintSolver/PrimitiveConstraints.fs
+++ b/tests/fsharp/Compiler/ConstraintSolver/PrimitiveConstraints.fs
@@ -91,19 +91,5 @@ runTest
     /// This suggestion was resolved as by design,
     /// so the test makes sure, we're emitting error message about 'not being a valid object construction expression'
     let ``Invalid object constructor``() = // Regression test for FSharp1.0:4189
-        CompilerAssert.TypeCheckWithErrorsAndOptions
-            [| "--test:ErrorRanges" |]
-            """
-type ImmutableStack<'a> private(items: 'a list) = 
-   
-    member this.Push item = ImmutableStack(item::items)
-    member this.Pop = match items with | [] -> failwith "No elements in stack" | x::xs -> x,ImmutableStack(xs)
-    
-    // Notice type annotation is commented out, which results in an error
-    new(col (*: seq<'a>*)) = ImmutableStack(List.ofSeq col)
-
-            """
-            [| FSharpErrorSeverity.Error, 41, (4, 29, 4, 56), "A unique overload for method 'ImmutableStack`1' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: new : col:'b -> ImmutableStack<'a>, private new : items:'a list -> ImmutableStack<'a>"
-               FSharpErrorSeverity.Error, 41, (5, 93, 5, 111), "A unique overload for method 'ImmutableStack`1' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: new : col:'b -> ImmutableStack<'a>, private new : items:'a list -> ImmutableStack<'a>"
-               FSharpErrorSeverity.Error, 41, (8, 30, 8, 60), "A unique overload for method 'ImmutableStack`1' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: new : col:'b -> ImmutableStack<'a> when 'b :> seq<'c>, private new : items:'a list -> ImmutableStack<'a>"
-               FSharpErrorSeverity.Error, 696, (8, 30, 8, 60), "This is not a valid object construction expression. Explicit object constructors must either call an alternate constructor or initialize all fields of the object and specify a call to a super class constructor." |]
\ No newline at end of file
+        CompilerAssert.TypeCheckWithErrorsAndOptionsAgainstBaseLine [| "--test:ErrorRanges" |] "typecheck/constructors/neg_invalid_constructor.fs"
+            
\ No newline at end of file
diff --git a/tests/fsharp/typecheck/constructors/neg_invalid_constructor.bsl b/tests/fsharp/typecheck/constructors/neg_invalid_constructor.bsl
new file mode 100644
index 0000000000..3b2777c150
--- /dev/null
+++ b/tests/fsharp/typecheck/constructors/neg_invalid_constructor.bsl
@@ -0,0 +1,22 @@
+typecheck/constructors/neg_invalid_constructor.fs (3,29)-(3,56) typecheck error A unique overload for method 'ImmutableStack`1' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: 'a list
+
+Candidates:
+ - new : col:'b -> ImmutableStack<'a>
+ - private new : items:'a list -> ImmutableStack<'a>
+typecheck/constructors/neg_invalid_constructor.fs (4,93)-(4,111) typecheck error A unique overload for method 'ImmutableStack`1' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: 'a list
+
+Candidates:
+ - new : col:'b -> ImmutableStack<'a>
+ - private new : items:'a list -> ImmutableStack<'a>
+typecheck/constructors/neg_invalid_constructor.fs (7,30)-(7,60) typecheck error A unique overload for method 'ImmutableStack`1' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: 'a list
+
+Candidates:
+ - new : col:'b -> ImmutableStack<'a> when 'b :> seq<'c>
+ - private new : items:'a list -> ImmutableStack<'a>
+typecheck/constructors/neg_invalid_constructor.fs (7,30)-(7,60) typecheck error This is not a valid object construction expression. Explicit object constructors must either call an alternate constructor or initialize all fields of the object and specify a call to a super class constructor.
\ No newline at end of file
diff --git a/tests/fsharp/typecheck/constructors/neg_invalid_constructor.fs b/tests/fsharp/typecheck/constructors/neg_invalid_constructor.fs
new file mode 100644
index 0000000000..02be510295
--- /dev/null
+++ b/tests/fsharp/typecheck/constructors/neg_invalid_constructor.fs
@@ -0,0 +1,7 @@
+type ImmutableStack<'a> private(items: 'a list) = 
+   
+    member this.Push item = ImmutableStack(item::items)
+    member this.Pop = match items with | [] -> failwith "No elements in stack" | x::xs -> x,ImmutableStack(xs)
+    
+    // Notice type annotation is commented out, which results in an error
+    new(col (*: seq<'a>*)) = ImmutableStack(List.ofSeq col)

From 723a293a919a6d1dcbf90f7cdd2a4b8572a86379 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sun, 19 Jan 2020 19:06:49 +0100
Subject: [PATCH 66/96] fix(?) salsa tests

---
 .../Tests.LanguageService.ErrorList.fs                 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
index a90387f461..8be23a9116 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
@@ -212,8 +212,8 @@ let g (t : T) = t.Count()
 Argument given: float
 
 Available overloads:
- - new : bool -> X
- - new : int -> X""" ]
+ - new : bool -> X // Argument at index 1 doesn't match
+ - new : int -> X // Argument at index 1 doesn't match""" ]
 
         CheckErrorList content (assertExpectedErrorMessages expectedMessages)
             
@@ -294,7 +294,7 @@ let x =
         """
         let expectedMessages = [ """A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-Argument given: 'a when 'a : null
+Known type of argument: 'a0 when 'a0 : null
 
 Candidates:
  - System.Console.WriteLine(buffer: char []) : unit
@@ -317,9 +317,7 @@ b.Do(1, 1)
         """
         let expectedMessages = [ """A unique overload for method 'Do' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-Arguments given:
- - int
- - int
+Known types of arguments: int * int
 
 Candidates:
  - member A.Do : a:int * b:'T -> unit

From f0be1bbe9d8d44983c832182f433454aa0933e9f Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sun, 19 Jan 2020 19:07:54 +0100
Subject: [PATCH 67/96] minimize diff

---
 tests/scripts/update-baselines.fsx | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/scripts/update-baselines.fsx b/tests/scripts/update-baselines.fsx
index 3659bbbcda..06e9c13ef8 100644
--- a/tests/scripts/update-baselines.fsx
+++ b/tests/scripts/update-baselines.fsx
@@ -53,17 +53,11 @@ let fsdiff actualFile expectedFile =
 
 let directories =
     [
-      "typecheck/sigs"
-      "typecheck/overloads"
-      "conformance/expressions/syntacticsugar"
-      "conformance/expressions/type-relatedexpressions"
-      "typecheck/sigs"
-      "conformance/inference"
-      "conformance/wellformedness"
-      "typeProviders/negTests"
-      "conformance/lexicalanalysis"
+      "fsharp/typecheck/sigs"
+      "fsharp/typecheck/overloads"
+      "fsharpqa/Source"
     ]
-    |> List.map (fun d -> Path.Combine(__SOURCE_DIRECTORY__, ".." , "fsharp",d) |> DirectoryInfo)
+    |> List.map (fun d -> Path.Combine(__SOURCE_DIRECTORY__, ".." , d) |> DirectoryInfo)
 
 let extensionPatterns = ["*.bsl"; "*.vsbsl"; "*.il.bsl"]
 for d in directories do

From 373f0f3a5f9ca41bac821bb98e459faf3695e4a7 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <smoothdeveloper@users.noreply.github.com>
Date: Sun, 19 Jan 2020 19:52:52 +0100
Subject: [PATCH 68/96] put back tests under !FSHARP_SUITE_DRIVES_CORECLR_TESTS

---
 tests/fsharp/tests.fs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index 9f53b3d370..d1e11aa8d1 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -2948,6 +2948,7 @@ module GeneratedSignatureTests =
     let ``measures-GENERATED_SIGNATURE`` () = singleTestBuildAndRun "core/measures" GENERATED_SIGNATURE
 #endif
 
+#if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
 module OverloadResolution =
     module ``fsharpqa migrated tests`` = 
         let [<Test>] ``Conformance\Expressions\SyntacticSugar (E_Slices01.fs)`` () = singleNegTest (testConfig "conformance/expressions/syntacticsugar") "E_Slices01"
@@ -2977,3 +2978,4 @@ module OverloadResolution =
         let [<Test>] ``neg_known_return_type_and_known_type_arguments`` () = singleNegTest (testConfig "typecheck/overloads") "neg_known_return_type_and_known_type_arguments"
         let [<Test>] ``neg_generic_known_argument_types`` () = singleNegTest (testConfig "typecheck/overloads") "neg_generic_known_argument_types"
         let [<Test>] ``neg_tupled_arguments`` () = singleNegTest (testConfig "typecheck/overloads") "neg_tupled_arguments"
+#endif

From 4c7d5255b981255a6799c3e3ff6df42865cdcc3f Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sun, 19 Jan 2020 20:27:06 +0100
Subject: [PATCH 69/96] missing updated message

---
 .../LegacyLanguageService/Tests.LanguageService.ErrorList.fs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
index 8be23a9116..a308bec56a 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
@@ -209,7 +209,7 @@ let g (t : T) = t.Count()
 
         let expectedMessages = [ """No overloads match for method 'X'.
 
-Argument given: float
+Known type of argument: float
 
 Available overloads:
  - new : bool -> X // Argument at index 1 doesn't match

From 5408e4fa4a2c823235fb16a783c5f83c804f8f5d Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sun, 19 Jan 2020 20:40:40 +0100
Subject: [PATCH 70/96] minor adjustments to TESTGUIDE.md

---
 TESTGUIDE.md | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/TESTGUIDE.md b/TESTGUIDE.md
index f658b443c1..2fbe89b718 100644
--- a/TESTGUIDE.md
+++ b/TESTGUIDE.md
@@ -4,11 +4,17 @@
 
 To run tests, use variations such as the following, depending on which test suite and build configuration you want:
 
-    build.cmd test
-    build.cmd net40 test
-    build.cmd coreclr test
-    build.cmd vs test
-    build.cmd all test
+    ./build -testAll -c Release
+    ./build -test -c Release
+    ./build -testCambridge  -c Release
+    ./build -testCompiler  -c Release
+    ./build -testDependencyManager -c Release
+    ./build -testDesktop -c Release
+    ./build -testCoreClr -c Release
+    ./build -testFSharpCore -c Release
+    ./build -testFSharpQA -c Release
+    ./build -testScripting -c Release
+    ./build -testVs -c Release
 
 You can also submit pull requests to https://github.com/dotnet/fsharp and run the tests via continuous integration. Most people do wholesale testing that way.
 
@@ -48,7 +54,7 @@ There are also negative tests checking code expected to fail compilation. See no
 
 The FSharpQA suite relies on [Perl](http://www.perl.org/get.html), StrawberryPerl package from nuget is used automatically by the test suite.
 
-These tests use the `RunAll.pl` framework to execute, however the easiest way to run them is via the `build.cmd` script, see [usage examples](https://github.com/Microsoft/visualfsharp/blob/master/build.cmd#L31).
+These tests use the `RunAll.pl` framework to execute, however the easiest way to run them is via the `./build` script, see [usage examples](https://github.com/Microsoft/visualfsharp/blob/master/build.cmd#L31).
 
 Tests are grouped in folders per area. Each folder contains a number of source code files and a single `env.lst` file. The `env.lst` file defines a series of test cases, one per line.
 
@@ -66,7 +72,7 @@ For the FSharpQA suite, the list of test areas and their associated "tags" is st
 
 Tags are in the left column, paths to to corresponding test folders are in the right column.  If no tags are specified, all tests will be run.
 
-If you want to re-run a particular test area, the easiest way to do so is to set a temporary tag for that area in test.lst (e.g. "RERUN") and then pass that as an argument to `build.cmd`: `build.cmd test-net40-fsharpqa include RERUN`.
+If you want to re-run a particular test area, the easiest way to do so is to set a temporary tag for that area in test.lst (e.g. "RERUN") and adjust `ttags` [run.fsharpqa.test.fsx script](tests/fsharpqa/run.fsharpqa.test.fsx) and run it.
 
 ### FSharp.Compiler.UnitTests, FSharp.Core.UnitTests, VisualFSharp.UnitTests
 

From e8dc47b1703cc400e6a29073315515af0c8db39b Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Mon, 20 Jan 2020 00:38:55 +0100
Subject: [PATCH 71/96] return type was missing prettifying in
 prettyLayoutsOfUnresolvedOverloading

---
 src/fsharp/NicePrint.fs                        |  2 ++
 .../E_LessThanDotOpenParen001.bsl              | 18 +++++++++---------
 .../E_LessThanDotOpenParen001.fsx              |  5 -----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs
index 4a93881db3..3cc100da7b 100644
--- a/src/fsharp/NicePrint.fs
+++ b/src/fsharp/NicePrint.fs
@@ -1156,6 +1156,7 @@ module private PrintTypes =
                 yield 2uy, ty
             ]
           let typesWithDiscrimants,typarsAndCxs = PrettyTypes.PrettifyDiscriminantAndTypePairs denv.g typesWithDiscrimants
+          let retTy = typesWithDiscrimants |> List.find (function (0uy, _) -> true | _ -> false) |> snd
           let argInfos = 
             typesWithDiscrimants 
             |> List.choose (function (1uy,ty) -> Some ty | _ -> None)
@@ -1164,6 +1165,7 @@ module private PrintTypes =
           let genParamTys = 
             typesWithDiscrimants
             |> List.choose (function (2uy,ty) -> Some ty | _ -> None)
+          
           argInfos, retTy, genParamTys, typarsAndCxs
 
         let env = SimplifyTypes.CollectInfo true (List.collect (List.map fst) [argInfos]) cxs
diff --git a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
index daa6060cb8..3a78a46340 100644
--- a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
+++ b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
@@ -1,15 +1,15 @@
 
-E_LessThanDotOpenParen001.fsx(18,71,18,75): typecheck error FS0193: A type parameter is missing a constraint 'when ( ^T or  ^?8151) : (static member ( + ) :  ^T *  ^?8151 ->  ^?8152)'
+E_LessThanDotOpenParen001.fsx(13,71,13,75): typecheck error FS0193: A type parameter is missing a constraint 'when ( ^T or  ^?8151) : (static member ( + ) :  ^T *  ^?8151 ->  ^?8152)'
 
-E_LessThanDotOpenParen001.fsx(18,73,18,75): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'S has been constrained to be type 'int'.
+E_LessThanDotOpenParen001.fsx(13,73,13,75): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'S has been constrained to be type 'int'.
 
-E_LessThanDotOpenParen001.fsx(18,27,18,30): typecheck error FS1198: The generic member '( +++ )' has been used at a non-uniform instantiation prior to this program point. Consider reordering the members so this member occurs first. Alternatively, specify the full type of the member explicitly, including argument types, return type and any additional generic parameters and constraints.
+E_LessThanDotOpenParen001.fsx(13,27,13,30): typecheck error FS1198: The generic member '( +++ )' has been used at a non-uniform instantiation prior to this program point. Consider reordering the members so this member occurs first. Alternatively, specify the full type of the member explicitly, including argument types, return type and any additional generic parameters and constraints.
 
-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(13,19,13,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'.
+E_LessThanDotOpenParen001.fsx(26,12,26,15): typecheck error FS0043: No overloads match for method 'op_PlusPlusPlus'.
 
-Known return type:  ^?8227
+Known return type:  ^a
 
 Known type parameters: < (string -> int) , TestType<int,string> >
 
@@ -20,7 +20,7 @@ Available overloads:
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T // Argument 'a' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
 
-E_LessThanDotOpenParen001.fsx(33,10,33,45): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
+E_LessThanDotOpenParen001.fsx(28,10,28,45): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
 
 Known types of arguments: (string -> int) * TestType<int,string>
 
@@ -31,12 +31,12 @@ Available overloads:
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T // Argument 'a' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
 
-E_LessThanDotOpenParen001.fsx(34,44,34,54): typecheck error FS0001: This expression was expected to have type
+E_LessThanDotOpenParen001.fsx(29,44,29,54): typecheck error FS0001: This expression was expected to have type
     'int'    
 but here has type
     'string'    
 
-E_LessThanDotOpenParen001.fsx(34,10,34,68): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
+E_LessThanDotOpenParen001.fsx(29,10,29,68): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
 
 Known types of arguments: (int -> 'a) * TestType<int,string>
 
diff --git a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx
index b7c161c562..e1580ef288 100644
--- a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx
+++ b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx
@@ -2,11 +2,6 @@
 // Regression test for FSHARP1.0:4805
 // We are not really after the actual error messages here (some of them have been omitted), rather we
 // want to verify we do not crash!
-//<Expects status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'S has been constrained to be type 'int'</Expects>
-//<Expects status="error" id="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</Expects>
-//<Expects status="error" id="FS0043">No overloads match for method 'op_PlusPlusPlus'\. The available overloads are shown below\.</Expects>
-//<Expects status="error" id="FS0041">No overloads match for method 'op_PlusPlusPlus'\. The available overloads are shown below\.</Expects>
-//<Expects status="error" id="FS0041">No overloads match for method 'op_PlusPlusPlus'\. The available overloads are shown below\.</Expects>
  
 type public TestType<'T,'S>() =
     

From 99097a66383ed25f311f0598b8ffc86bc7586987 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 22 Jan 2020 08:25:44 +0100
Subject: [PATCH 72/96] address code review nits / minimize diff / add comment
 on PrettifyDiscriminantAndTypePairs

---
 TESTGUIDE.md                    | 22 +++++++--------
 src/fsharp/ConstraintSolver.fs  | 14 ++++-----
 src/fsharp/ConstraintSolver.fsi |  8 +++---
 src/fsharp/MethodCalls.fs       |  5 ++--
 src/fsharp/NicePrint.fs         | 50 ++++++++++++++++++---------------
 src/fsharp/TastOps.fs           |  1 +
 src/fsharp/TastOps.fsi          |  3 ++
 src/fsharp/TypeChecker.fs       |  4 +--
 8 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/TESTGUIDE.md b/TESTGUIDE.md
index 2fbe89b718..2a29e52d3c 100644
--- a/TESTGUIDE.md
+++ b/TESTGUIDE.md
@@ -4,17 +4,17 @@
 
 To run tests, use variations such as the following, depending on which test suite and build configuration you want:
 
-    ./build -testAll -c Release
-    ./build -test -c Release
-    ./build -testCambridge  -c Release
-    ./build -testCompiler  -c Release
-    ./build -testDependencyManager -c Release
-    ./build -testDesktop -c Release
-    ./build -testCoreClr -c Release
-    ./build -testFSharpCore -c Release
-    ./build -testFSharpQA -c Release
-    ./build -testScripting -c Release
-    ./build -testVs -c Release
+    .\build -testAll -c Release
+    .\build -test -c Release
+    .\build -testCambridge  -c Release
+    .\build -testCompiler  -c Release
+    .\build -testDependencyManager -c Release
+    .\build -testDesktop -c Release
+    .\build -testCoreClr -c Release
+    .\build -testFSharpCore -c Release
+    .\build -testFSharpQA -c Release
+    .\build -testScripting -c Release
+    .\build -testVs -c Release
 
 You can also submit pull requests to https://github.com/dotnet/fsharp and run the tests via continuous integration. Most people do wholesale testing that way.
 
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 4a9d90c799..e03b1a05aa 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -183,7 +183,6 @@ type ContextInfo =
     | SequenceExpression of TType
 
 /// Captures relevant information for a particular failed overload resolution.
-[<Struct>]
 type OverloadInformation = 
     {
         methodSlot: CalledMeth<Expr>
@@ -206,7 +205,7 @@ exception ConstraintSolverInfiniteTypes of displayEnv: DisplayEnv * contextInfo:
 
 exception ConstraintSolverTypesNotInEqualityRelation of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
 
-exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argT: TType * paramT: TType * callRange: range * parameterRange: range
+exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argTy: TType * paramTy: TType * callRange: range * parameterRange: range
 
 exception ConstraintSolverMissingConstraint of displayEnv: DisplayEnv * Tast.Typar * Tast.TyparConstraint * range  * range 
 
@@ -216,9 +215,9 @@ exception ConstraintSolverRelatedInformation of string option * range * exn
 
 exception ErrorFromApplyingDefault of tcGlobals: TcGlobals * displayEnv: DisplayEnv * Tast.Typar * TType * exn * range
 
-exception ErrorFromAddingTypeEquation of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actual: TType * expected: TType * exn * range
+exception ErrorFromAddingTypeEquation of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actualTy: TType * expectedTy: TType * exn * range
 
-exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actual: TType * expected: TType * exn * ContextInfo * parameterRange: range
+exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actualTy: TType * expectedTy: TType * exn * ContextInfo * parameterRange: range
 
 exception ErrorFromAddingConstraint of displayEnv: DisplayEnv * exn * range
 
@@ -1539,8 +1538,8 @@ and SolveMemberConstraint (csenv: ConstraintSolverEnv) ignoreUnresolvedOverload
                     |> List.choose (fun minfo ->
                           if minfo.IsCurried then None else
                           let callerArgs = 
-                            { Unnamed = List.singleton (argtys |> List.map (fun argty -> CallerArg(argty, m, false, dummyExpr)))
-                              Named = List.singleton List.empty }
+                            { Unnamed = [ (argtys |> List.map (fun argty -> CallerArg(argty, m, false, dummyExpr))) ]
+                              Named = [ [ ] ] }
                           let minst = FreshenMethInfo m minfo
                           let objtys = minfo.GetObjArgTypes(amap, m, minst)
                           Some(CalledMeth<Expr>(csenv.InfoReader, None, false, FreshenMethInfo, m, AccessibleFromEverywhere, minfo, minst, minst, None, objtys, callerArgs, false, false, None)))
@@ -2184,6 +2183,7 @@ and SolveTypeRequiresDefaultConstructor (csenv: ConstraintSolverEnv) ndeep m2 tr
                     CompleteD
                 | _ -> 
                     ErrorD (ConstraintSolverError(FSComp.SR.csGenericConstructRequiresPublicDefaultConstructor(NicePrint.minimalStringOfType denv origTy), m, m2))
+                    
 // Parameterized compatibility relation between member signatures.  The real work
 // is done by "equateTypes" and "subsumeTypes" and "subsumeArg"
 and CanMemberSigsMatchUpToCheck 
@@ -2505,7 +2505,7 @@ and ResolveOverloading
           // Exact match rule.
           //
           // See what candidates we have based on current inferred type information 
-          // and _exact_ matches of argument types.
+          // and _exact_ matches of argument types. 
           match candidates |> FilterEachThenUndo (fun newTrace calledMeth -> 
                      let cxsln = Option.map (fun traitInfo -> (traitInfo, MemberConstraintSolutionOfMethInfo csenv.SolverState m calledMeth.Method calledMeth.CalledTyArgs)) cx
                      CanMemberSigsMatchUpToCheck 
diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 9cd24eddb3..22d2f60398 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -91,7 +91,6 @@ type ContextInfo =
     | SequenceExpression of TType
 
 /// Captures relevant information for a particular failed overload resolution.
-[<Struct>]
 type OverloadInformation = 
     {
         methodSlot: CalledMeth<Expr>
@@ -111,18 +110,19 @@ type OverloadResolutionFailure =
 exception ConstraintSolverTupleDiffLengths              of displayEnv: DisplayEnv * TType list * TType list * range * range
 exception ConstraintSolverInfiniteTypes                 of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
 exception ConstraintSolverTypesNotInEqualityRelation    of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
-exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argT: TType * paramT: TType * callRange: range * parameterRange: range
+exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argTy: TType * paramTy: TType * callRange: range * parameterRange: range
 exception ConstraintSolverMissingConstraint             of displayEnv: DisplayEnv * Typar * TyparConstraint * range * range
 exception ConstraintSolverError                         of string * range * range
 exception ConstraintSolverRelatedInformation            of string option * range * exn
 
 exception ErrorFromApplyingDefault              of tcGlobals: TcGlobals * displayEnv: DisplayEnv * Typar * TType * exn * range
-exception ErrorFromAddingTypeEquation           of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actual: TType * expected: TType * exn * range
-exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actual: TType * expected: TType * exn * ContextInfo * parameterRange: range
+exception ErrorFromAddingTypeEquation           of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actualTy: TType * expectedTy: TType * exn * range
+exception ErrorsFromAddingSubsumptionConstraint of tcGlobals: TcGlobals * displayEnv: DisplayEnv * actualTy: TType * expectedTy: TType * exn * ContextInfo * parameterRange: range
 exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn * range
 exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
 exception UnresolvedOverloading                 of displayEnv: DisplayEnv * callerArgs: CallerArgs<Expr> * failure: OverloadResolutionFailure * range
 exception NonRigidTypar                         of displayEnv: DisplayEnv * string option * range * TType * TType * range
+
 exception ArgDoesNotMatchError                  of error: ErrorsFromAddingSubsumptionConstraint * calledMeth: CalledMeth<Expr> * calledArg: CalledArg * callerArg: CallerArg<Expr>
 /// A function that denotes captured tcVal, Used in constraint solver and elsewhere to get appropriate expressions for a ValRef.
 type TcValF = (ValRef -> ValUseFlag -> TType list -> range -> Expr * TType)
diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index e239552e4a..442c923e0b 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -114,14 +114,15 @@ type CallerNamedArg<'T> =
     member x.CallerArg = (let (CallerNamedArg(_, a)) = x in a)
 
 /// Represents the list of unnamed / named arguments at method call site
-// todo: figure out / document why we are using list²
+/// remark: The usage of list list is due to tupling and currying of arguments,
+/// stemming from SynValInfo in the AST.
 [<Struct>]
 type CallerArgs<'T> = 
     { 
         Unnamed: CallerArg<'T> list list
         Named: CallerNamedArg<'T> list list 
     }
-    static member Empty : CallerArgs<'T> = { Unnamed = List.empty; Named = List.empty }
+    static member Empty : CallerArgs<'T> = { Unnamed = []; Named = [] }
     member x.CallerArgCounts = (List.length x.Unnamed, List.length x.Named)
     member x.CurriedCallerArgs = List.zip x.Unnamed x.Named
     member x.LayoutArgumentTypes denv =
diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs
index 3cc100da7b..56b458fa6b 100644
--- a/src/fsharp/NicePrint.fs
+++ b/src/fsharp/NicePrint.fs
@@ -1147,32 +1147,36 @@ module private PrintTypes =
         let retTy = instType typarInst retTy
         let argInfos = prettyArgInfos denv typarInst argInfos
         let argInfos,retTy,genParamTys, cxs =
-          let typesWithDiscrimants =
-            [
-              yield 0uy,retTy 
-              for ty,_ in argInfos do
-                yield 1uy, ty
-              for ty in genParamTys do
-                yield 2uy, ty
-            ]
-          let typesWithDiscrimants,typarsAndCxs = PrettyTypes.PrettifyDiscriminantAndTypePairs denv.g typesWithDiscrimants
-          let retTy = typesWithDiscrimants |> List.find (function (0uy, _) -> true | _ -> false) |> snd
-          let argInfos = 
-            typesWithDiscrimants 
-            |> List.choose (function (1uy,ty) -> Some ty | _ -> None)
-            |> List.zip argInfos 
-            |> List.map (fun ((_,argInfo),tTy) -> tTy, argInfo)
-          let genParamTys = 
-            typesWithDiscrimants
-            |> List.choose (function (2uy,ty) -> Some ty | _ -> None)
-          
-          argInfos, retTy, genParamTys, typarsAndCxs
+            // using 0, 1, 2 as discriminant for return, arguments and generic parameters
+            // respectively, in order to easily retrieve each of the types with their
+            // expected quality below.
+            let typesWithDiscrimants =
+                [
+                    yield 0,retTy 
+                    for ty,_ in argInfos do
+                        yield 1, ty
+                    for ty in genParamTys do
+                        yield 2, ty
+                ]
+            let typesWithDiscrimants,typarsAndCxs = PrettyTypes.PrettifyDiscriminantAndTypePairs denv.g typesWithDiscrimants
+            let retTy = typesWithDiscrimants |> List.find (function (0, _) -> true | _ -> false) |> snd
+            let argInfos = 
+                typesWithDiscrimants 
+                |> List.choose (function (1,ty) -> Some ty | _ -> None)
+                |> List.zip argInfos 
+                |> List.map (fun ((_,argInfo),tTy) -> tTy, argInfo)
+            let genParamTys = 
+                typesWithDiscrimants
+                |> List.choose (function (2,ty) -> Some ty | _ -> None)
+              
+            argInfos, retTy, genParamTys, typarsAndCxs
 
         let env = SimplifyTypes.CollectInfo true (List.collect (List.map fst) [argInfos]) cxs
         let cxsL = layoutConstraintsWithInfo denv env env.postfixConstraints
-        List.foldBack (---) (layoutArgInfos denv env [argInfos]) cxsL
-        , layoutReturnType denv env retTy
-        , layoutGenericParameterTypes denv env genParamTys
+
+        (List.foldBack (---) (layoutArgInfos denv env [argInfos]) cxsL,
+            layoutReturnType denv env retTy,
+            layoutGenericParameterTypes denv env genParamTys)
 
     let prettyLayoutOfType denv ty = 
         let ty, cxs = PrettyTypes.PrettifyType denv.g ty
diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs
index b97c518d23..761acf38b8 100644
--- a/src/fsharp/TastOps.fs
+++ b/src/fsharp/TastOps.fs
@@ -2510,6 +2510,7 @@ module PrettyTypes =
     let PrettifyType g x = PrettifyThings g id id x
     let PrettifyTypePair g x = PrettifyThings g (fun f -> foldPair (f, f)) (fun f -> mapPair (f, f)) x
     let PrettifyTypes g x = PrettifyThings g List.fold List.map x
+    
     let PrettifyDiscriminantAndTypePairs g x = 
       let tys, cxs = (PrettifyThings g List.fold List.map (x |> List.map snd))
       List.zip (List.map fst x) tys, cxs
diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi
index b3bca57a74..cd89fea5e0 100755
--- a/src/fsharp/TastOps.fsi
+++ b/src/fsharp/TastOps.fsi
@@ -932,6 +932,9 @@ module PrettyTypes =
 
     val PrettifyTypes : TcGlobals -> TTypes -> TTypes * TyparConstraintsWithTypars
     
+    /// same as PrettifyTypes, but allows passing the types along with a discriminant value
+    /// useful to prettify many types that need to be sorted out after prettifying operation
+    /// took place.
     val PrettifyDiscriminantAndTypePairs : TcGlobals -> ('Discriminant * TType) list -> ('Discriminant * TType) list * TyparConstraintsWithTypars
 
     val PrettifyInst : TcGlobals -> TyparInst -> TyparInst * TyparConstraintsWithTypars
diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
index c129b51244..2cf45098b9 100755
--- a/src/fsharp/TypeChecker.fs
+++ b/src/fsharp/TypeChecker.fs
@@ -10380,8 +10380,8 @@ and TcMethodApplication
     
     // STEP 3. Resolve overloading 
     /// Select the called method that's the result of overload resolution
-    let finalCalledMeth =
-      
+    let finalCalledMeth = 
+
         let callerArgs = { Unnamed = unnamedCurriedCallerArgs ; Named = namedCurriedCallerArgs }
 
         let postArgumentTypeCheckingCalledMethGroup = 

From 99c1230e0cf35080f09eb9c68b5868aa5b52e8e7 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 22 Jan 2020 09:32:49 +0100
Subject: [PATCH 73/96] minimize diff

---
 src/fsharp/ConstraintSolver.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index e03b1a05aa..6cfa4a1b7a 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2183,7 +2183,7 @@ and SolveTypeRequiresDefaultConstructor (csenv: ConstraintSolverEnv) ndeep m2 tr
                     CompleteD
                 | _ -> 
                     ErrorD (ConstraintSolverError(FSComp.SR.csGenericConstructRequiresPublicDefaultConstructor(NicePrint.minimalStringOfType denv origTy), m, m2))
-                    
+
 // Parameterized compatibility relation between member signatures.  The real work
 // is done by "equateTypes" and "subsumeTypes" and "subsumeArg"
 and CanMemberSigsMatchUpToCheck 

From 9f20d8f999826dd0dc2a8bfa1de53cc52bcc9389 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 22 Jan 2020 17:22:05 +0100
Subject: [PATCH 74/96] proposed work around the flaky error message until
 https://github.com/dotnet/fsharp/issues/6725 has a fix

we keep the fsharpqa test around (but removing the overload error messages from what is asserted out of it) in the meantime
---
 .../E_LessThanDotOpenParen001.bsl             | 24 +++-----------
 .../E_LessThanDotOpenParen001.fsx             |  9 ++----
 tests/fsharp/tests.fs                         |  3 ++
 .../E_LessThanDotOpenParen001.fs              | 31 +++++++++++++++++++
 .../LexicalAnalysis/SymbolicOperators/env.lst |  1 +
 5 files changed, 42 insertions(+), 26 deletions(-)
 create mode 100644 tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/E_LessThanDotOpenParen001.fs

diff --git a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
index 3a78a46340..bff8ba48cf 100644
--- a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
+++ b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.bsl
@@ -1,13 +1,5 @@
 
-E_LessThanDotOpenParen001.fsx(13,71,13,75): typecheck error FS0193: A type parameter is missing a constraint 'when ( ^T or  ^?8151) : (static member ( + ) :  ^T *  ^?8151 ->  ^?8152)'
-
-E_LessThanDotOpenParen001.fsx(13,73,13,75): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'S has been constrained to be type 'int'.
-
-E_LessThanDotOpenParen001.fsx(13,27,13,30): typecheck error FS1198: The generic member '( +++ )' has been used at a non-uniform instantiation prior to this program point. Consider reordering the members so this member occurs first. Alternatively, specify the full type of the member explicitly, including argument types, return type and any additional generic parameters and constraints.
-
-E_LessThanDotOpenParen001.fsx(13,19,13,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(26,12,26,15): typecheck error FS0043: No overloads match for method 'op_PlusPlusPlus'.
+E_LessThanDotOpenParen001.fsx(23,12,23,15): typecheck error FS0043: No overloads match for method 'op_PlusPlusPlus'.
 
 Known return type:  ^a
 
@@ -15,34 +7,26 @@ Known type parameters: < (string -> int) , TestType<int,string> >
 
 Available overloads:
  - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
- - static member TestType.( +++ ) : a:(int -> 'T) * b:TestType<'T,int> ->  ^a when  ^T1 : (static member ( + ) :  ^T1 *  ^T1 ->  ^a) // Argument 'a' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T // Argument 'a' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T // Argument 'a' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
 
-E_LessThanDotOpenParen001.fsx(28,10,28,45): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
+E_LessThanDotOpenParen001.fsx(25,10,25,45): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
 
 Known types of arguments: (string -> int) * TestType<int,string>
 
 Available overloads:
  - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
- - static member TestType.( +++ ) : a:(int -> 'T) * b:TestType<'T,int> ->  ^a when  ^T1 : (static member ( + ) :  ^T1 *  ^T1 ->  ^a) // Argument 'a' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T // Argument 'a' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T // Argument 'a' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
 
-E_LessThanDotOpenParen001.fsx(29,44,29,54): typecheck error FS0001: This expression was expected to have type
-    'int'    
-but here has type
-    'string'    
-
-E_LessThanDotOpenParen001.fsx(29,10,29,68): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
+E_LessThanDotOpenParen001.fsx(26,10,26,68): typecheck error FS0041: No overloads match for method 'op_PlusPlusPlus'.
 
-Known types of arguments: (int -> 'a) * TestType<int,string>
+Known types of arguments: (string -> int) * TestType<int,string>
 
 Available overloads:
  - static member TestType.( +++ ) : a:'T * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
- - static member TestType.( +++ ) : a:(int -> 'T) * b:TestType<'T,int> ->  ^a when  ^T1 : (static member ( + ) :  ^T1 *  ^T1 ->  ^a) // Argument 'b' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:'T -> 'T // Argument 'a' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:('T -> 'S) -> 'T // Argument 'a' doesn't match
  - static member TestType.( +++ ) : a:TestType<'T,'S> * b:TestType<'T,'S> -> 'T // Argument 'a' doesn't match
diff --git a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx
index e1580ef288..fa36780197 100644
--- a/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx
+++ b/tests/fsharp/conformance/lexicalanalysis/E_LessThanDotOpenParen001.fsx
@@ -1,8 +1,3 @@
-// #Regression #Conformance #LexicalAnalysis #Operators 
-// Regression test for FSHARP1.0:4805
-// We are not really after the actual error messages here (some of them have been omitted), rather we
-// want to verify we do not crash!
- 
 type public TestType<'T,'S>() =
     
     member public s.Value with get() = Unchecked.defaultof<'T>
@@ -10,7 +5,9 @@ type public TestType<'T,'S>() =
     static member public (+++) (a : TestType<'T,'S>, b : 'T) = b
     static member public (+++) (a : 'T, b : TestType<'T,'S>) = a
     static member public (+++) (a : TestType<'T,'S>, b : 'T -> 'S) = a.Value
-    static member public (+++) (a : 'S -> 'T, b : TestType<'T,'S>) = (a 17) + b.Value
+    
+    // this is triggering https://github.com/dotnet/fsharp/issues/6725 and make the error reported by compiler flaky
+    //static member public (+++) (a : 'S -> 'T, b : TestType<'T,'S>) = (a 17) + b.Value 
 
 let inline (+++) (a : ^a) (b : ^b) = ((^a or ^b): (static member (+++): ^a * ^b -> ^c) (a,b) )
 
diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index d1e11aa8d1..b909209554 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -2965,6 +2965,9 @@ module OverloadResolution =
         let [<Test>] ``Conformance\WellFormedness (E_Clashing_Values_in_AbstractClass01.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass01"
         let [<Test>] ``Conformance\WellFormedness (E_Clashing_Values_in_AbstractClass03.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass03"
         let [<Test>] ``Conformance\WellFormedness (E_Clashing_Values_in_AbstractClass04.fs)`` () = singleNegTest (testConfig "conformance/wellformedness") "E_Clashing_Values_in_AbstractClass04"
+        // note: this test still exist in fsharpqa to assert the compiler doesn't crash
+        // the part of the code generating a flaky error due to https://github.com/dotnet/fsharp/issues/6725
+        // is elided here to focus on overload resolution error messages
         let [<Test>] ``Conformance\LexicalAnalysis\SymbolicOperators (E_LessThanDotOpenParen001.fs)`` () = singleNegTest (testConfig "conformance/lexicalanalysis") "E_LessThanDotOpenParen001"
     
     module ``error messages using BCL``=
diff --git a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/E_LessThanDotOpenParen001.fs b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/E_LessThanDotOpenParen001.fs
new file mode 100644
index 0000000000..a8cf50ea24
--- /dev/null
+++ b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/E_LessThanDotOpenParen001.fs
@@ -0,0 +1,31 @@
+// #Regression #Conformance #LexicalAnalysis #Operators 
+// Regression test for FSHARP1.0:4805
+// We are not really after the actual error messages here (some of them have been omitted), rather we
+// want to verify we do not crash!
+//<Expects status="warning" id="FS0064">This construct causes code to be less generic than indicated by the type annotations\. The type variable 'S has been constrained to be type 'int'</Expects>
+//<Expects status="error" id="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</Expects>
+
+type public TestType<'T,'S>() =
+    
+    member public s.Value with get() = Unchecked.defaultof<'T>
+    static member public (+++) (a : TestType<'T,'S>, b : TestType<'T,'S>) = a.Value
+    static member public (+++) (a : TestType<'T,'S>, b : 'T) = b
+    static member public (+++) (a : 'T, b : TestType<'T,'S>) = a
+    static member public (+++) (a : TestType<'T,'S>, b : 'T -> 'S) = a.Value
+    static member public (+++) (a : 'S -> 'T, b : TestType<'T,'S>) = (a 17) + b.Value
+
+let inline (+++) (a : ^a) (b : ^b) = ((^a or ^b): (static member (+++): ^a * ^b -> ^c) (a,b) )
+
+let tt0 = TestType<int, string>()
+let tt1 = TestType<int, string>()
+
+let f (x : string) = 18
+
+let a0 = tt0 +++ tt1
+let a1 = tt0 +++ 11
+let a2 =  12 +++ tt1
+let a3 = tt0 +++ (fun x -> "18")
+let a4 = f +++ tt0
+
+let a5 = TestType<int, string>.(+++)(f, tt0)
+let a6 = TestType<int, string>.(+++)((fun (x : string) -> 18), tt0)
diff --git a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst
index a1066dd6ee..2cd6bea706 100644
--- a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst
+++ b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/SymbolicOperators/env.lst
@@ -1,6 +1,7 @@
 	SOURCE=GreaterThanDotParen01.fs COMPILE_ONLY=1				# GreaterThanDotParen01.fs
 	SOURCE=E_GreaterThanDotParen01.fs COMPILE_ONLY=1			# E_GreaterThanDotParen01.fs
 
+	SOURCE=E_LessThanDotOpenParen001.fs COMPILE_ONLY=1 SCFLAGS=--flaterrors	# E_LessThanDotOpenParen001.fs
 	SOURCE=LessThanDotOpenParen001.fs   COMPILE_ONLY=1			# LessThanDotOpenParen001.fs
 
 	SOURCE=GreaterThanColon001.fs   COMPILE_ONLY=1	# GreaterThanColon001.fs

From 45be9dcf4e279f1482275fd8d20c4063b1a5a50a Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 22 Jan 2020 20:16:25 +0100
Subject: [PATCH 75/96] fixing baselines of new tests from master

---
 tests/fsharp/typecheck/sigs/neg116.bsl | 20 ++++++++--------
 tests/fsharp/typecheck/sigs/neg117.bsl | 20 ++++++++--------
 tests/fsharp/typecheck/sigs/neg119.bsl | 32 +++++++++-----------------
 3 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/tests/fsharp/typecheck/sigs/neg116.bsl b/tests/fsharp/typecheck/sigs/neg116.bsl
index 8bd4930a30..8613d44041 100644
--- a/tests/fsharp/typecheck/sigs/neg116.bsl
+++ b/tests/fsharp/typecheck/sigs/neg116.bsl
@@ -1,12 +1,10 @@
 
-neg116.fs(10,44,10,45): typecheck error FS0043: No overloads match for method 'op_Multiply'. The available overloads are shown below.
-neg116.fs(10,44,10,45): typecheck error FS0043: Possible overload: 'static member Polynomial.( * ) : s:Complex * p:Polynomial -> Polynomial'. Type constraint mismatch. The type 
-    'float'    
-is not compatible with type
-    'Complex'    
-.
-neg116.fs(10,44,10,45): typecheck error FS0043: Possible overload: 'static member Polynomial.( * ) : s:decimal * p:Polynomial -> Polynomial'. Type constraint mismatch. The type 
-    'float'    
-is not compatible with type
-    'decimal'    
-.
+neg116.fs(10,44,10,45): typecheck error FS0043: No overloads match for method 'op_Multiply'.
+
+Known return type:  ^a
+
+Known type parameters: < float , Polynomial >
+
+Available overloads:
+ - static member Polynomial.( * ) : s:Complex * p:Polynomial -> Polynomial // Argument 's' doesn't match
+ - static member Polynomial.( * ) : s:decimal * p:Polynomial -> Polynomial // Argument 's' doesn't match
diff --git a/tests/fsharp/typecheck/sigs/neg117.bsl b/tests/fsharp/typecheck/sigs/neg117.bsl
index 49c2665190..9d0fdfb84e 100644
--- a/tests/fsharp/typecheck/sigs/neg117.bsl
+++ b/tests/fsharp/typecheck/sigs/neg117.bsl
@@ -1,12 +1,10 @@
 
-neg117.fs(79,18,79,59): ilxgen error FS0041: No overloads match for method 'Transform'. The available overloads are shown below.
-neg117.fs(79,18,79,59): ilxgen error FS0041: Possible overload: 'static member Neg117.Superpower.Transformer.Transform :  ^r * Neg117.TargetA.TargetA * Neg117.Superpower.Transformer -> (Neg117.TargetA.TransformerKind ->  ^r) when (Neg117.TargetA.TargetA or  ^r) : (static member Transform :  ^r * Neg117.TargetA.TargetA -> Neg117.TargetA.TransformerKind ->  ^r)'. Type constraint mismatch. The type 
-    'Neg117.TargetA.M1 Microsoft.FSharp.Core.[]'    
-is not compatible with type
-    ''a'    
-.
-neg117.fs(79,18,79,59): ilxgen error FS0041: Possible overload: 'static member Neg117.Superpower.Transformer.Transform :  ^f * Neg117.TargetB.TargetB * Neg117.Superpower.Transformer -> (Neg117.TargetB.TransformerKind ->  ^f) when (Neg117.TargetB.TargetB or  ^f) : (static member Transform :  ^f * Neg117.TargetB.TargetB -> Neg117.TargetB.TransformerKind ->  ^f)'. Type constraint mismatch. The type 
-    'Neg117.TargetA.M1 Microsoft.FSharp.Core.[]'    
-is not compatible with type
-    ''a'    
-.
+neg117.fs(79,18,79,59): ilxgen error FS0041: No overloads match for method 'Transform'.
+
+Known return type: ('a -> Neg117.TargetA.M1 Microsoft.FSharp.Core.[])
+
+Known type parameters: < Neg117.TargetA.M1 Microsoft.FSharp.Core.[] , Microsoft.FSharp.Core.obj , Neg117.Superpower.Transformer >
+
+Available overloads:
+ - static member Neg117.Superpower.Transformer.Transform :  ^f * Neg117.TargetB.TargetB * Neg117.Superpower.Transformer -> (Neg117.TargetB.TransformerKind ->  ^f) when (Neg117.TargetB.TargetB or  ^f) : (static member Transform :  ^f * Neg117.TargetB.TargetB -> Neg117.TargetB.TransformerKind ->  ^f) // Argument at index 1 doesn't match
+ - static member Neg117.Superpower.Transformer.Transform :  ^r * Neg117.TargetA.TargetA * Neg117.Superpower.Transformer -> (Neg117.TargetA.TransformerKind ->  ^r) when (Neg117.TargetA.TargetA or  ^r) : (static member Transform :  ^r * Neg117.TargetA.TargetA -> Neg117.TargetA.TransformerKind ->  ^r) // Argument at index 1 doesn't match
diff --git a/tests/fsharp/typecheck/sigs/neg119.bsl b/tests/fsharp/typecheck/sigs/neg119.bsl
index 9f13a88643..975fc46185 100644
--- a/tests/fsharp/typecheck/sigs/neg119.bsl
+++ b/tests/fsharp/typecheck/sigs/neg119.bsl
@@ -1,22 +1,12 @@
 
-neg119.fs(40,20,40,22): typecheck error FS0071: Type constraint mismatch when applying the default type 'obj' for a type inference variable. No overloads match for method 'Return'. The available overloads are shown below. Consider adding further type constraints
-neg119.fs(40,20,40,22): typecheck error FS0071: Possible overload: 'static member Applicatives.Ap.Return : ('r -> 'a) * Ap:Applicatives.Ap -> (('a -> 'r -> 'a2) -> 'a3 -> 'a -> 'r -> 'a2)'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    ''a -> 'b'    
-.
-neg119.fs(40,20,40,22): typecheck error FS0071: Possible overload: 'static member Applicatives.Ap.Return : System.Tuple<'a> * Ap:Applicatives.Ap -> ('a -> System.Tuple<'a>)'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'System.Tuple<'a>'    
-.
-neg119.fs(40,20,40,22): typecheck error FS0071: Possible overload: 'static member Applicatives.Ap.Return : seq<'a> * Ap:Applicatives.Ap -> ('a -> seq<'a>)'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'seq<'a>'    
-.
-neg119.fs(40,20,40,22): typecheck error FS0071: Possible overload: 'static member Applicatives.Ap.Return : r: ^R * obj -> ('a1 ->  ^R) when  ^R : (static member Return : 'a1 ->  ^R)'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    ''a'    
-.
+neg119.fs(40,20,40,22): typecheck error FS0071: Type constraint mismatch when applying the default type 'obj' for a type inference variable. No overloads match for method 'Return'.
+
+Known return type: ((int -> int -> int) -> obj)
+
+Known type parameters: < obj , Applicatives.Ap >
+
+Available overloads:
+ - static member Applicatives.Ap.Return : ('r -> 'a) * Ap:Applicatives.Ap -> (('a -> 'r -> 'a2) -> 'a3 -> 'a -> 'r -> 'a2) // Argument at index 1 doesn't match
+ - static member Applicatives.Ap.Return : System.Tuple<'a> * Ap:Applicatives.Ap -> ('a -> System.Tuple<'a>) // Argument at index 1 doesn't match
+ - static member Applicatives.Ap.Return : r: ^R * obj -> ('a1 ->  ^R) when  ^R : (static member Return : 'a1 ->  ^R) // Argument 'r' doesn't match
+ - static member Applicatives.Ap.Return : seq<'a> * Ap:Applicatives.Ap -> ('a -> seq<'a>) // Argument at index 1 doesn't match Consider adding further type constraints

From 18cbe3cf7b3929aa6592ae6a9224e0747572d672 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 22 Jan 2020 21:36:09 +0100
Subject: [PATCH 76/96] sisyphus round of baseline update

---
 tests/fsharp/typecheck/sigs/neg120.bsl | 38 ++++++++------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/tests/fsharp/typecheck/sigs/neg120.bsl b/tests/fsharp/typecheck/sigs/neg120.bsl
index 1d7137c417..315d92239b 100644
--- a/tests/fsharp/typecheck/sigs/neg120.bsl
+++ b/tests/fsharp/typecheck/sigs/neg120.bsl
@@ -1,27 +1,13 @@
 
-neg120.fs(95,18,95,21): typecheck error FS0071: Type constraint mismatch when applying the default type 'obj' for a type inference variable. No overloads match for method 'op_GreaterGreaterEquals'. The available overloads are shown below. Consider adding further type constraints
-neg120.fs(95,18,95,21): typecheck error FS0071: Possible overload: 'static member Bind.( >>= ) : source:Id<'T> * f:('T -> Id<'U>) -> Id<'U>'. Type constraint mismatch. The type 
-    'int -> obj'    
-is not compatible with type
-    ''a -> Id<'b>'    
-.
-neg120.fs(95,18,95,21): typecheck error FS0071: Possible overload: 'static member Bind.( >>= ) : source:Async<'T> * f:('T -> Async<'a1>) -> Async<'a1>'. Type constraint mismatch. The type 
-    'Id<int>'    
-is not compatible with type
-    'Async<'a>'    
-.
-neg120.fs(95,18,95,21): typecheck error FS0071: Possible overload: 'static member Bind.( >>= ) : source:'T option * f:('T -> 'U option) -> 'U option'. Type constraint mismatch. The type 
-    'Id<int>'    
-is not compatible with type
-    ''a option'    
-.
-neg120.fs(95,18,95,21): typecheck error FS0071: Possible overload: 'static member Bind.( >>= ) : source:Task<'T> * f:('T -> Task<'U>) -> Task<'U>'. Type constraint mismatch. The type 
-    'Id<int>'    
-is not compatible with type
-    'Task<'a>'    
-.
-neg120.fs(95,18,95,21): typecheck error FS0071: Possible overload: 'static member Bind.( >>= ) : source:Lazy<'T> * f:('T -> Lazy<'U>) -> Lazy<'U>'. Type constraint mismatch. The type 
-    'Id<int>'    
-is not compatible with type
-    'Lazy<'a>'    
-.
+neg120.fs(95,18,95,21): typecheck error FS0071: Type constraint mismatch when applying the default type 'obj' for a type inference variable. No overloads match for method 'op_GreaterGreaterEquals'.
+
+Known return type: obj
+
+Known type parameters: < Id<int> , (int -> obj) >
+
+Available overloads:
+ - static member Bind.( >>= ) : source:'T option * f:('T -> 'U option) -> 'U option // Argument 'source' doesn't match
+ - static member Bind.( >>= ) : source:Async<'T> * f:('T -> Async<'a1>) -> Async<'a1> // Argument 'source' doesn't match
+ - static member Bind.( >>= ) : source:Id<'T> * f:('T -> Id<'U>) -> Id<'U> // Argument 'f' doesn't match
+ - static member Bind.( >>= ) : source:Lazy<'T> * f:('T -> Lazy<'U>) -> Lazy<'U> // Argument 'source' doesn't match
+ - static member Bind.( >>= ) : source:Task<'T> * f:('T -> Task<'U>) -> Task<'U> // Argument 'source' doesn't match Consider adding further type constraints

From c7d8b136739e073067e3dced03a1e9a703462c89 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 22 Jan 2020 22:23:00 +0100
Subject: [PATCH 77/96] removing type which isn't in use and popped back up
 after rebase

---
 src/fsharp/ConstraintSolver.fs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 6cfa4a1b7a..1caef5c60f 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -521,8 +521,6 @@ exception AbortForFailedOverloadResolution
 let inline TryD_IgnoreAbortForFailedOverloadResolution f1 f2 =
     TryD f1 (function AbortForFailedOverloadResolution -> CompleteD | exn -> f2 exn)
 
-exception LocallyAbortOperationThatFailsToResolveOverload
-
 /// used to provide detail about non matched argument in overload resolution error message
 exception ArgDoesNotMatchError of error: ErrorsFromAddingSubsumptionConstraint * calledMeth: CalledMeth<Expr> * calledArg: CalledArg * callerArg: CallerArg<Expr>
 

From 209cc6cad9c5ab33db8b1aa02f2285c4dd57e338 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 23 Jan 2020 22:55:23 +0100
Subject: [PATCH 78/96] minimize diff

---
 src/fsharp/MethodCalls.fs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 442c923e0b..2276f8f5f3 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -353,8 +353,7 @@ type CalledMeth<'T>
     do assert (fullCurriedCalledArgs.Length = fullCurriedCalledArgs.Length)
  
     let argSetInfos = 
-        (callerArgs.CurriedCallerArgs, fullCurriedCalledArgs) 
-        ||> List.map2 (fun (unnamedCallerArgs, namedCallerArgs) fullCalledArgs -> 
+        (callerArgs.CurriedCallerArgs, fullCurriedCalledArgs) ||> List.map2 (fun (unnamedCallerArgs, namedCallerArgs) fullCalledArgs -> 
             // Find the arguments not given by name 
             let unnamedCalledArgs = 
                 fullCalledArgs |> List.filter (fun calledArg -> 

From 1f17d510ce028f82f00534a44279fe85a7ed7fe5 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 23 Jan 2020 23:24:37 +0100
Subject: [PATCH 79/96] tidy inconsistent tuple literal

---
 src/fsharp/NicePrint.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs
index 56b458fa6b..507c7a4525 100644
--- a/src/fsharp/NicePrint.fs
+++ b/src/fsharp/NicePrint.fs
@@ -1152,7 +1152,7 @@ module private PrintTypes =
             // expected quality below.
             let typesWithDiscrimants =
                 [
-                    yield 0,retTy 
+                    yield 0, retTy 
                     for ty,_ in argInfos do
                         yield 1, ty
                     for ty in genParamTys do

From 90defce93168a2e55bb164a4542df114fabce7f5 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 23 Jan 2020 23:40:02 +0100
Subject: [PATCH 80/96] * removing TTrait properties that end up not being used
 * renaming tys and returnTy fields to better match convention (`tys` is used,
 so no underscore prefix) * minimizing diff

---
 src/fsharp/CompileOps.fs |  2 +-
 src/fsharp/tast.fs       | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 4d20bce524..7363937a48 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -772,7 +772,7 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
           let knownReturnType, genericParameterTypes =
               match failure with
               | NoOverloadsFound (cx=Some cx)
-              | PossibleCandidates (cx=Some cx) -> cx.ReturnType, cx.ArgTys
+              | PossibleCandidates (cx=Some cx) -> cx.ReturnType, cx.ArgumentTypes
               | _ -> None, []
          
           // prepare message parts (known arguments, known return type, known generic parameters)
diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs
index e591acedc9..2a0376e130 100644
--- a/src/fsharp/tast.fs
+++ b/src/fsharp/tast.fs
@@ -2407,11 +2407,9 @@ and
     [<NoEquality; NoComparison; StructuredFormatDisplay("{DebugText}")>]
     TraitConstraintInfo = 
 
-    /// TTrait(tys, nm, memFlags, argtys, rty, solution)
-    ///
     /// Indicates the signature of a member constraint. Contains a mutable solution cell
     /// to store the inferred solution of the constraint.
-    | TTrait of _tys: TTypes * memberName: string * _memFlags: MemberFlags * _argTys: TTypes * returnType: TType option * solution: TraitConstraintSln option ref 
+    | TTrait of tys: TTypes * memberName: string * _memFlags: MemberFlags * argTys: TTypes * returnTy: TType option * solution: TraitConstraintSln option ref 
 
     /// Get the member name associated with the member constraint.
     member x.MemberName = (let (TTrait(_, nm, _, _, _, _)) = x in nm)
@@ -2421,16 +2419,15 @@ and
 
     /// Get the return type recorded in the member constraint.
     member x.ReturnType = (let (TTrait(_, _, _, _, ty, _)) = x in ty)
-
+    
     /// Get or set the solution of the member constraint during inference
     member x.Solution 
         with get() = (let (TTrait(_, _, _, _, _, sln)) = x in sln.Value)
         and set v = (let (TTrait(_, _, _, _, _, sln)) = x in sln.Value <- v)
-    member x._Tys = let (TTrait(_tys, _, _, _, _, _)) = x in _tys
-    member x.MemberFlags = let (TTrait(_, _, _memFlags, _, _, _)) = x in _memFlags
-    member x.ArgTys = let (TTrait(_, _, _, _argTys, _, _)) = x in _argTys
+
     [<DebuggerBrowsable(DebuggerBrowsableState.Never)>]
     member x.DebugText = x.ToString()
+
     override x.ToString() = "TTrait(" + x.MemberName + ")"
     
 and 

From d99015fd196c4f8d6ed00c62d0654e0e3291b441 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 23 Jan 2020 23:41:34 +0100
Subject: [PATCH 81/96] minimize diff

---
 src/fsharp/tast.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs
index 2a0376e130..2aeceb3bac 100644
--- a/src/fsharp/tast.fs
+++ b/src/fsharp/tast.fs
@@ -2419,7 +2419,7 @@ and
 
     /// Get the return type recorded in the member constraint.
     member x.ReturnType = (let (TTrait(_, _, _, _, ty, _)) = x in ty)
-    
+
     /// Get or set the solution of the member constraint during inference
     member x.Solution 
         with get() = (let (TTrait(_, _, _, _, _, sln)) = x in sln.Value)

From 3176d37f1717d1f9be96b1862f5409ea72be4369 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 23 Jan 2020 23:48:59 +0100
Subject: [PATCH 82/96] minimize diff

---
 src/fsharp/ConstraintSolver.fsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi
index 22d2f60398..6c76d383c2 100644
--- a/src/fsharp/ConstraintSolver.fsi
+++ b/src/fsharp/ConstraintSolver.fsi
@@ -197,4 +197,4 @@ val ChooseTyparSolutionAndSolve: ConstraintSolverState -> DisplayEnv -> Typar ->
 
 val IsApplicableMethApprox: TcGlobals -> ImportMap -> range -> MethInfo -> TType -> bool
 
-val CanonicalizePartialInferenceProblem:  ConstraintSolverState -> DisplayEnv -> range -> Typars -> unit
+val CanonicalizePartialInferenceProblem:  ConstraintSolverState -> DisplayEnv -> range -> Typars -> unit
\ No newline at end of file

From 97ebec3bd336f4b3b654dded1958d16bacf03f86 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Thu, 23 Jan 2020 23:54:21 +0100
Subject: [PATCH 83/96] minimize diff

---
 src/fsharp/NicePrint.fs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs
index 507c7a4525..c49d892200 100644
--- a/src/fsharp/NicePrint.fs
+++ b/src/fsharp/NicePrint.fs
@@ -1318,6 +1318,7 @@ let layoutConst g ty c = PrintTypes.layoutConst g ty c
 let prettyLayoutOfMemberSig denv x = x |> PrintTypes.prettyLayoutOfMemberSig denv 
 let prettyLayoutOfUncurriedSig denv argInfos tau = PrintTypes.prettyLayoutOfUncurriedSig denv argInfos tau
 let prettyLayoutsOfUnresolvedOverloading denv argInfos retTy genericParameters = PrintTypes.prettyLayoutsOfUnresolvedOverloading denv argInfos retTy genericParameters
+
 //-------------------------------------------------------------------------
 
 /// Printing info objects

From 61478c23507390495b81c25609eb99da979bc2ce Mon Sep 17 00:00:00 2001
From: Gauthier Segay <smoothdeveloper@users.noreply.github.com>
Date: Fri, 24 Jan 2020 08:52:53 +0100
Subject: [PATCH 84/96] link to usage example in same file

---
 TESTGUIDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TESTGUIDE.md b/TESTGUIDE.md
index 2a29e52d3c..f166588309 100644
--- a/TESTGUIDE.md
+++ b/TESTGUIDE.md
@@ -54,7 +54,7 @@ There are also negative tests checking code expected to fail compilation. See no
 
 The FSharpQA suite relies on [Perl](http://www.perl.org/get.html), StrawberryPerl package from nuget is used automatically by the test suite.
 
-These tests use the `RunAll.pl` framework to execute, however the easiest way to run them is via the `./build` script, see [usage examples](https://github.com/Microsoft/visualfsharp/blob/master/build.cmd#L31).
+These tests use the `RunAll.pl` framework to execute, however the easiest way to run them is via the `.\build` script, see [usage examples](#quick-start-running-tests).
 
 Tests are grouped in folders per area. Each folder contains a number of source code files and a single `env.lst` file. The `env.lst` file defines a series of test cases, one per line.
 

From 304f5052c2fae7dab14e846a550d68a4167da0fc Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 29 Jan 2020 19:22:30 +0100
Subject: [PATCH 85/96] revert converting CallerArg single cased DU into Record

---
 src/fsharp/MethodCalls.fs | 6 ++++++
 src/fsharp/TypeChecker.fs | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 2276f8f5f3..ca206c128e 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -45,6 +45,12 @@ open FSharp.Compiler.ExtensionTyping
 ///
 /// The bool indicates if named using a '?', making the caller argument explicit-optional
 type CallerArg<'T> = 
+     /// CallerArg(ty, range, isOpt, exprInfo)
+     | CallerArg of ty: TType * range: range * isOpt: bool * exprInfo: 'T  
+     member x.Type = (let (CallerArg(ty, _, _, _)) = x in ty)
+     member x.Range = (let (CallerArg(_, m, _, _)) = x in m)
+     member x.IsOptional = (let (CallerArg(_, _, isOpt, _)) = x in isOpt)
+     member x.Expr = (let (CallerArg(_, _, _, expr)) = x in expr)
 
     /// CallerArg(ty, range, isOpt, exprInfo)
     | CallerArg of TType * range * bool * 'T  
diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
index 2cf45098b9..47cad2b19d 100755
--- a/src/fsharp/TypeChecker.fs
+++ b/src/fsharp/TypeChecker.fs
@@ -10647,7 +10647,6 @@ and TcMethodNamedArg cenv env (lambdaPropagationInfo, tpenv) (CallerNamedArg(id,
     CallerNamedArg(id, arg'), (lambdaPropagationInfo, tpenv)
 
 and TcMethodArg cenv env (lambdaPropagationInfo, tpenv) (lambdaPropagationInfoForArg, CallerArg(argTy, mArg, isOpt, argExpr)) = 
-
     // Apply the F# 3.1 rule for extracting information for lambdas
     //
     // Before we check the argument, check to see if we can propagate info from a called lambda expression into the arguments of a received lambda

From 4352bada6dc561b3bbaf313d89e41552e3df326a Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 29 Jan 2020 19:34:45 +0100
Subject: [PATCH 86/96] minimize diff

---
 src/fsharp/ConstraintSolver.fs |  4 ++--
 src/fsharp/MethodCalls.fs      | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 1caef5c60f..978a70a0f2 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2328,14 +2328,14 @@ and MustUnify csenv ndeep trace cxsln ty1 ty2 =
 and MustUnifyInsideUndo csenv ndeep trace cxsln ty1 ty2 = 
     SolveTypeEqualsTypeWithReport csenv ndeep csenv.m (WithTrace trace) cxsln ty1 ty2
 
-and ArgsMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln isConstraint calledMeth calledArg callerArg = 
+and ArgsMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln isConstraint calledMeth calledArg (CallerArg(callerArgTy, m, _, _) as callerArg) = 
     let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg
     SolveTypeSubsumesTypeWithWrappedContextualReport csenv ndeep callerArg.Range (WithTrace trace) cxsln calledArgTy callerArg.ArgumentType (fun e -> ArgDoesNotMatchError(e :?> _, calledMeth, calledArg, callerArg)) 
 
 and TypesMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln m calledArgTy callerArgTy = 
     SolveTypeSubsumesTypeWithReport csenv ndeep m trace cxsln calledArgTy callerArgTy 
 
-and ArgsEquivInsideUndo (csenv: ConstraintSolverEnv) isConstraint calledArg callerArg = 
+and ArgsEquivInsideUndo (csenv: ConstraintSolverEnv) isConstraint calledArg (CallerArg(callerArgTy, m, _, _) as callerArg) = 
     let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg
     if typeEquiv csenv.g calledArgTy callerArg.ArgumentType then CompleteD else ErrorD(Error(FSComp.SR.csArgumentTypesDoNotMatch(), callerArg.Range))
 
diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index ca206c128e..2b170301b1 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -45,12 +45,12 @@ open FSharp.Compiler.ExtensionTyping
 ///
 /// The bool indicates if named using a '?', making the caller argument explicit-optional
 type CallerArg<'T> = 
-     /// CallerArg(ty, range, isOpt, exprInfo)
-     | CallerArg of ty: TType * range: range * isOpt: bool * exprInfo: 'T  
-     member x.Type = (let (CallerArg(ty, _, _, _)) = x in ty)
-     member x.Range = (let (CallerArg(_, m, _, _)) = x in m)
-     member x.IsOptional = (let (CallerArg(_, _, isOpt, _)) = x in isOpt)
-     member x.Expr = (let (CallerArg(_, _, _, expr)) = x in expr)
+    /// CallerArg(ty, range, isOpt, exprInfo)
+    | CallerArg of ty: TType * range: range * isOpt: bool * exprInfo: 'T  
+    member x.Type = (let (CallerArg(ty, _, _, _)) = x in ty)
+    member x.Range = (let (CallerArg(_, m, _, _)) = x in m)
+    member x.IsOptional = (let (CallerArg(_, _, isOpt, _)) = x in isOpt)
+    member x.Expr = (let (CallerArg(_, _, _, expr)) = x in expr)
 
     /// CallerArg(ty, range, isOpt, exprInfo)
     | CallerArg of TType * range * bool * 'T  

From f18a20560298f744c824bd4d551b498dc71f90c3 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 29 Jan 2020 20:58:58 +0100
Subject: [PATCH 87/96] minimize diff

---
 src/fsharp/MethodCalls.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 2b170301b1..45917dfafd 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -51,7 +51,7 @@ type CallerArg<'T> =
     member x.Range = (let (CallerArg(_, m, _, _)) = x in m)
     member x.IsOptional = (let (CallerArg(_, _, isOpt, _)) = x in isOpt)
     member x.Expr = (let (CallerArg(_, _, _, expr)) = x in expr)
-
+    
     /// CallerArg(ty, range, isOpt, exprInfo)
     | CallerArg of TType * range * bool * 'T  
 

From 7cf610d711d0ceb5e9cfeb6f1caca741ec989141 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Wed, 29 Jan 2020 21:01:05 +0100
Subject: [PATCH 88/96] minimize diff

---
 src/fsharp/TypeChecker.fs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
index 47cad2b19d..2cf45098b9 100755
--- a/src/fsharp/TypeChecker.fs
+++ b/src/fsharp/TypeChecker.fs
@@ -10647,6 +10647,7 @@ and TcMethodNamedArg cenv env (lambdaPropagationInfo, tpenv) (CallerNamedArg(id,
     CallerNamedArg(id, arg'), (lambdaPropagationInfo, tpenv)
 
 and TcMethodArg cenv env (lambdaPropagationInfo, tpenv) (lambdaPropagationInfoForArg, CallerArg(argTy, mArg, isOpt, argExpr)) = 
+
     // Apply the F# 3.1 rule for extracting information for lambdas
     //
     // Before we check the argument, check to see if we can propagate info from a called lambda expression into the arguments of a received lambda

From 5eff5840068038be1fdecd815a540b65d9207ffc Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sat, 15 Feb 2020 08:47:11 +0100
Subject: [PATCH 89/96] fix rebase glitches

---
 src/fsharp/ConstraintSolver.fs |  8 ++++----
 src/fsharp/MethodCalls.fs      | 18 +++---------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 978a70a0f2..0a9f4665dc 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2329,15 +2329,15 @@ and MustUnifyInsideUndo csenv ndeep trace cxsln ty1 ty2 =
     SolveTypeEqualsTypeWithReport csenv ndeep csenv.m (WithTrace trace) cxsln ty1 ty2
 
 and ArgsMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln isConstraint calledMeth calledArg (CallerArg(callerArgTy, m, _, _) as callerArg) = 
-    let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg
-    SolveTypeSubsumesTypeWithWrappedContextualReport csenv ndeep callerArg.Range (WithTrace trace) cxsln calledArgTy callerArg.ArgumentType (fun e -> ArgDoesNotMatchError(e :?> _, calledMeth, calledArg, callerArg)) 
+    let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint true calledArg callerArg
+    SolveTypeSubsumesTypeWithWrappedContextualReport csenv ndeep  m (WithTrace trace) cxsln calledArgTy callerArgTy (fun e -> ArgDoesNotMatchError(e :?> _, calledMeth, calledArg, callerArg))  
 
 and TypesMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln m calledArgTy callerArgTy = 
     SolveTypeSubsumesTypeWithReport csenv ndeep m trace cxsln calledArgTy callerArgTy 
 
 and ArgsEquivInsideUndo (csenv: ConstraintSolverEnv) isConstraint calledArg (CallerArg(callerArgTy, m, _, _) as callerArg) = 
-    let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg
-    if typeEquiv csenv.g calledArgTy callerArg.ArgumentType then CompleteD else ErrorD(Error(FSComp.SR.csArgumentTypesDoNotMatch(), callerArg.Range))
+    let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint true calledArg callerArg
+    if typeEquiv csenv.g calledArgTy callerArgTy then CompleteD else ErrorD(Error(FSComp.SR.csArgumentTypesDoNotMatch(), m))
 
 and ReportNoCandidatesError (csenv: ConstraintSolverEnv) (nUnnamedCallerArgs, nNamedCallerArgs) methodName ad (calledMethGroup: CalledMeth<_> list) isSequential =
 
diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 45917dfafd..66c306ac38 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -47,20 +47,9 @@ open FSharp.Compiler.ExtensionTyping
 type CallerArg<'T> = 
     /// CallerArg(ty, range, isOpt, exprInfo)
     | CallerArg of ty: TType * range: range * isOpt: bool * exprInfo: 'T  
-    member x.Type = (let (CallerArg(ty, _, _, _)) = x in ty)
-    member x.Range = (let (CallerArg(_, m, _, _)) = x in m)
-    member x.IsOptional = (let (CallerArg(_, _, isOpt, _)) = x in isOpt)
-    member x.Expr = (let (CallerArg(_, _, _, expr)) = x in expr)
-    
-    /// CallerArg(ty, range, isOpt, exprInfo)
-    | CallerArg of TType * range * bool * 'T  
-
     member x.CallerArgumentType = (let (CallerArg(ty, _, _, _)) = x in ty)
-
     member x.Range = (let (CallerArg(_, m, _, _)) = x in m)
-
     member x.IsExplicitOptional = (let (CallerArg(_, _, isOpt, _)) = x in isOpt)
-
     member x.Expr = (let (CallerArg(_, _, _, expr)) = x in expr)
     
 /// Represents the information about an argument in the method being called
@@ -131,11 +120,10 @@ type CallerArgs<'T> =
     static member Empty : CallerArgs<'T> = { Unnamed = []; Named = [] }
     member x.CallerArgCounts = (List.length x.Unnamed, List.length x.Named)
     member x.CurriedCallerArgs = List.zip x.Unnamed x.Named
-    member x.LayoutArgumentTypes denv =
-      [ (x.Unnamed |> List.map (List.map (fun i -> None, NicePrint.layoutType denv i.Type))) |> List.concat // not sure why we end up with a nested list
-        (x.Named |> List.map (List.map (fun i -> Some i.Name, NicePrint.layoutType denv i.CallerArg.Type))) |> List.concat ]
+    member x.ArgumentNamesAndTypes =
+      [ (x.Unnamed |> List.map (List.map (fun i -> None, i.CallerArgumentType))) |> List.concat
+        (x.Named |> List.map (List.map (fun i -> Some i.Name, i.CallerArg.CallerArgumentType))) |> List.concat ]
       |> List.concat
-    
 //-------------------------------------------------------------------------
 // Callsite conversions
 //------------------------------------------------------------------------- 

From 0d99fef27c40da78dd458e5ffe5818f13a4d6297 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sat, 15 Feb 2020 08:57:55 +0100
Subject: [PATCH 90/96] fix rebase glitch

---
 src/fsharp/ConstraintSolver.fs | 2 +-
 src/fsharp/MethodCalls.fs      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 0a9f4665dc..c7293960a9 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2640,7 +2640,7 @@ and ResolveOverloading
                     // Prefer methods with more precise param array arg type
                     let c = 
                         if candidate.UsesParamArrayConversion && other.UsesParamArrayConversion then
-                            compareTypes candidate.ParamArrayElementType other.ParamArrayElementType
+                            compareTypes (candidate.GetParamArrayElementType()) (other.GetParamArrayElementType())
                         else
                             0
                     if c <> 0 then c else
diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 66c306ac38..085237e75c 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -538,7 +538,8 @@ type CalledMeth<'T>
 
     member x.ParamArrayCallerArgs = x.ArgSets |> List.tryPick (fun argSet -> if Option.isSome argSet.ParamArrayCalledArgOpt then Some argSet.ParamArrayCallerArgs else None )
 
-    member x.ParamArrayElementType = 
+    member x.GetParamArrayElementType() =
+        // turned as a method to avoid assert in variable inspector 
         assert (x.UsesParamArrayConversion)
         x.ParamArrayCalledArgOpt.Value.CalledArgumentType |> destArrayTy x.amap.g 
 

From 95fe837f8ffddfc08e120df58b7cb047856a04a6 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sat, 15 Feb 2020 09:07:01 +0100
Subject: [PATCH 91/96] update baseline

---
 .../conformance/expressions/syntacticsugar/E_Slices01.bsl       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
index 6980b299e2..6cf7778a86 100644
--- a/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
+++ b/tests/fsharp/conformance/expressions/syntacticsugar/E_Slices01.bsl
@@ -31,7 +31,7 @@ Candidates:
  - member Foo.GetSlice : x1:float option * x2:int option * y:int -> unit
  - member Foo.GetSlice : x1:int option * x2:int option * y:int -> unit
 
-E_Slices01.fsx(19,9,19,17): typecheck error FS0039: The field, constructor or member 'Item' is not defined.
+E_Slices01.fsx(19,9,19,17): typecheck error FS0039: The type 'Foo<a>' does not define the field, constructor or member 'Item'.
 
 E_Slices01.fsx(20,9,20,26): typecheck error FS0503: A member or object constructor 'GetSlice' taking 4 arguments is not accessible from this code location. All accessible versions of method 'GetSlice' take 3 arguments.
 

From 4141681e49cb00ccc107c4694d7eb3ba95fe1d3f Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sat, 15 Feb 2020 12:22:58 +0100
Subject: [PATCH 92/96] fix base lines / new tests base lines

---
 .../compilation.errors.output.bsl             | 196 +++++++++++--
 .../compilation.langversion.old.output.bsl    |   4 +-
 tests/fsharp/typecheck/sigs/neg124.bsl        |  56 +---
 tests/fsharp/typecheck/sigs/neg125.bsl        | 273 +++++++++++++++++-
 tests/fsharp/typecheck/sigs/neg127.bsl        | 273 +++++++++++++++++-
 tests/fsharp/typecheck/sigs/neg128.bsl        |  21 +-
 tests/fsharp/typecheck/sigs/neg129.bsl        |  21 +-
 7 files changed, 748 insertions(+), 96 deletions(-)

diff --git a/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.bsl b/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.bsl
index 75c7c59d70..5c10823e04 100644
--- a/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.bsl
+++ b/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.bsl
@@ -1,55 +1,199 @@
 
-test.fsx(186,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int, SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
+test.fsx(186,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.Candidates:
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
-test.fsx(187,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int, SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
+test.fsx(187,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-test.fsx(188,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int, SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
+Known type of argument: x:int
 
-test.fsx(189,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int, SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
+Candidates:
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
-test.fsx(190,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int, SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
+test.fsx(188,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-test.fsx(191,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int, SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
+Known type of argument: y:string
 
-test.fsx(192,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int, SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
+Candidates:
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
-test.fsx(193,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int, SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
+test.fsx(189,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-test.fsx(196,42): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int, SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
+Known type of argument: x:int option
 
-test.fsx(198,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Candidates:
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
-test.fsx(199,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+test.fsx(190,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-test.fsx(200,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Known type of argument: y:string option
 
-test.fsx(201,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Candidates:
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
-test.fsx(202,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+test.fsx(191,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-test.fsx(203,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Known type of argument: x:'a option
 
-test.fsx(204,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Candidates:
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
-test.fsx(206,42): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+test.fsx(192,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-test.fsx(207,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Known type of argument: y:'a option
 
-test.fsx(208,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Candidates:
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
-test.fsx(209,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+test.fsx(193,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-test.fsx(210,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Known type of argument: d:'a option
 
-test.fsx(211,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Candidates:
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
-test.fsx(212,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+test.fsx(196,42): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-test.fsx(213,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Known type of argument: 'a0
 
-test.fsx(214,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+Candidates:
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
+ - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
-test.fsx(215,42): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int, SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+test.fsx(198,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed.Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(199,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: y:string
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(200,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: d:Nullable<float>
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(201,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: d:float
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(202,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: d:float option
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(203,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: x:'a option
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(204,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: d:'a option
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(206,42): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: 'a0
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(207,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(208,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: y:string
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(209,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: d:float
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(210,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: d:Nullable<float>
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(211,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: d:float
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(212,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: d:float option
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(213,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: x:'a option
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(214,35): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: d:'a option
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
+
+test.fsx(215,42): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known type of argument: 'a0
+
+Candidates:
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
+ - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
 
 test.fsx(232,15): warning FS0025: Incomplete pattern matches on this expression. For example, the value 'U2 (_, U1 (_, "a"))' may indicate a case not covered by the pattern(s).
 
diff --git a/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.bsl b/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.bsl
index 37bb96b77a..cafd27cffd 100644
--- a/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.bsl
+++ b/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.bsl
@@ -122,4 +122,6 @@ test.fsx(232,15): warning FS0025: Incomplete pattern matches on this expression.
 
 test.fsx(249,15): warning FS0025: Incomplete pattern matches on this expression. For example, the value 'U2 (_, U1 (_, "a"))' may indicate a case not covered by the pattern(s).
 
-test.fsx(383,29): error FS0041: A unique overload for method 'SimpleOverload' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: SomeClass.SimpleOverload(?x: Nullable<int>) : int, SomeClass.SimpleOverload(?x: int) : int
+test.fsx(383,29): error FS0041: A unique overload for method 'SimpleOverload' could not be determined based on type information prior to this program point. A type annotation may be needed.Candidates:
+ - SomeClass.SimpleOverload(?x: Nullable<int>) : int
+ - SomeClass.SimpleOverload(?x: int) : int
diff --git a/tests/fsharp/typecheck/sigs/neg124.bsl b/tests/fsharp/typecheck/sigs/neg124.bsl
index b9c55eba73..356440c6ef 100644
--- a/tests/fsharp/typecheck/sigs/neg124.bsl
+++ b/tests/fsharp/typecheck/sigs/neg124.bsl
@@ -1,42 +1,16 @@
 
-neg124.fs(39,27,39,35): typecheck error FS0071: Type constraint mismatch when applying the default type 'obj' for a type inference variable. No overloads match for method 'unsigned_witness'. The available overloads are shown below. Consider adding further type constraints
-neg124.fs(39,27,39,35): typecheck error FS0071: Possible overload: 'static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:uint64 -> uint64'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'uint64'    
-.
-neg124.fs(39,27,39,35): typecheck error FS0071: Possible overload: 'static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:int64 -> uint64'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'int64'    
-.
-neg124.fs(39,27,39,35): typecheck error FS0071: Possible overload: 'static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:uint32 -> uint32'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'uint32'    
-.
-neg124.fs(39,27,39,35): typecheck error FS0071: Possible overload: 'static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:int32 -> uint32'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'int32'    
-.
-neg124.fs(39,27,39,35): typecheck error FS0071: Possible overload: 'static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:uint16 -> uint16'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'uint16'    
-.
-neg124.fs(39,27,39,35): typecheck error FS0071: Possible overload: 'static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:int16 -> uint16'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'int16'    
-.
-neg124.fs(39,27,39,35): typecheck error FS0071: Possible overload: 'static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:byte -> byte'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'byte'    
-.
-neg124.fs(39,27,39,35): typecheck error FS0071: Possible overload: 'static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:sbyte -> uint8'. Type constraint mismatch. The type 
-    'obj'    
-is not compatible with type
-    'sbyte'    
-.
+neg124.fs(39,27,39,35): typecheck error FS0071: Type constraint mismatch when applying the default type 'obj' for a type inference variable. No overloads match for method 'unsigned_witness'.
+
+Known return type: uint8
+
+Known type parameter: < obj >
+
+Available overloads:
+ - static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:byte -> byte // Argument 'x' doesn't match
+ - static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:int16 -> uint16 // Argument 'x' doesn't match
+ - static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:int32 -> uint32 // Argument 'x' doesn't match
+ - static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:int64 -> uint64 // Argument 'x' doesn't match
+ - static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:sbyte -> uint8 // Argument 'x' doesn't match
+ - static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:uint16 -> uint16 // Argument 'x' doesn't match
+ - static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:uint32 -> uint32 // Argument 'x' doesn't match
+ - static member Negative_SelectOverloadedWitnessBasedOnInputAndReturnTypeWithoutOutputTypeSelector.witnesses.unsigned_witness : x:uint64 -> uint64 // Argument 'x' doesn't match Consider adding further type constraints
diff --git a/tests/fsharp/typecheck/sigs/neg125.bsl b/tests/fsharp/typecheck/sigs/neg125.bsl
index 4c96bbcc15..5c26683981 100644
--- a/tests/fsharp/typecheck/sigs/neg125.bsl
+++ b/tests/fsharp/typecheck/sigs/neg125.bsl
@@ -1,26 +1,273 @@
 
-neg125.fs(39,30,39,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+neg125.fs(39,30,39,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-neg125.fs(40,30,40,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known return type: int32
 
-neg125.fs(41,31,41,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known type parameter: < BigInteger >
 
-neg125.fs(42,30,42,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
 
-neg125.fs(43,30,43,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+neg125.fs(40,30,40,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-neg125.fs(44,30,44,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known return type: int64
 
-neg125.fs(45,29,45,31): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known type parameter: < BigInteger >
 
-neg125.fs(46,31,46,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
 
-neg125.fs(47,31,47,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+neg125.fs(41,31,41,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-neg125.fs(48,32,48,34): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known return type: bigint
 
-neg125.fs(49,33,49,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known type parameter: < BigInteger >
 
-neg125.fs(50,33,50,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
 
-neg125.fs(51,33,51,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+neg125.fs(42,30,42,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: float
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg125.fs(43,30,43,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: sbyte
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg125.fs(44,30,44,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: int16
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg125.fs(45,29,45,31): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: byte
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg125.fs(46,31,46,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: uint16
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg125.fs(47,31,47,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: uint32
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg125.fs(48,32,48,34): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: uint64
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg125.fs(49,33,49,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: float32
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg125.fs(50,33,50,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: decimal
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg125.fs(51,33,51,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: Complex
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
diff --git a/tests/fsharp/typecheck/sigs/neg127.bsl b/tests/fsharp/typecheck/sigs/neg127.bsl
index 0ab9e8c534..39c91a61d5 100644
--- a/tests/fsharp/typecheck/sigs/neg127.bsl
+++ b/tests/fsharp/typecheck/sigs/neg127.bsl
@@ -1,26 +1,273 @@
 
-neg127.fs(47,30,47,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+neg127.fs(47,30,47,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-neg127.fs(48,30,48,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known return type: int32
 
-neg127.fs(49,31,49,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known type parameter: < BigInteger >
 
-neg127.fs(50,30,50,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
 
-neg127.fs(51,30,51,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+neg127.fs(48,30,48,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-neg127.fs(52,30,52,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known return type: int64
 
-neg127.fs(53,29,53,31): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known type parameter: < BigInteger >
 
-neg127.fs(54,31,54,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
 
-neg127.fs(55,31,55,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+neg127.fs(49,31,49,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-neg127.fs(56,32,56,34): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known return type: bigint
 
-neg127.fs(57,33,57,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Known type parameter: < BigInteger >
 
-neg127.fs(58,33,58,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
 
-neg127.fs(59,33,59,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint -> Complex, static member witnesses.convert_witness : x:bigint -> bigint, static member witnesses.convert_witness : x:bigint -> byte, static member witnesses.convert_witness : x:bigint -> decimal, static member witnesses.convert_witness : x:bigint -> float, static member witnesses.convert_witness : x:bigint -> float32, static member witnesses.convert_witness : x:bigint -> int, static member witnesses.convert_witness : x:bigint -> int16, static member witnesses.convert_witness : x:bigint -> int64, static member witnesses.convert_witness : x:bigint -> sbyte, static member witnesses.convert_witness : x:bigint -> uint16, static member witnesses.convert_witness : x:bigint -> uint32, static member witnesses.convert_witness : x:bigint -> uint64
+neg127.fs(50,30,50,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: float
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg127.fs(51,30,51,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: sbyte
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg127.fs(52,30,52,32): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: int16
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg127.fs(53,29,53,31): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: byte
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg127.fs(54,31,54,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: uint16
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg127.fs(55,31,55,33): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: uint32
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg127.fs(56,32,56,34): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: uint64
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg127.fs(57,33,57,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: float32
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg127.fs(58,33,58,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: decimal
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
+
+neg127.fs(59,33,59,35): typecheck error FS0001: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: Complex
+
+Known type parameter: < BigInteger >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint -> Complex
+ - static member witnesses.convert_witness : x:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint -> byte
+ - static member witnesses.convert_witness : x:bigint -> decimal
+ - static member witnesses.convert_witness : x:bigint -> float
+ - static member witnesses.convert_witness : x:bigint -> float32
+ - static member witnesses.convert_witness : x:bigint -> int
+ - static member witnesses.convert_witness : x:bigint -> int16
+ - static member witnesses.convert_witness : x:bigint -> int64
+ - static member witnesses.convert_witness : x:bigint -> sbyte
+ - static member witnesses.convert_witness : x:bigint -> uint16
+ - static member witnesses.convert_witness : x:bigint -> uint32
+ - static member witnesses.convert_witness : x:bigint -> uint64
diff --git a/tests/fsharp/typecheck/sigs/neg128.bsl b/tests/fsharp/typecheck/sigs/neg128.bsl
index 3d91ad25b5..5d41804b73 100644
--- a/tests/fsharp/typecheck/sigs/neg128.bsl
+++ b/tests/fsharp/typecheck/sigs/neg128.bsl
@@ -1,2 +1,21 @@
 
-neg128.fs(36,47,36,54): typecheck error FS0043: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint * _output:Complex -> Complex, static member witnesses.convert_witness : x:bigint * _output:bigint -> bigint, static member witnesses.convert_witness : x:bigint * _output:byte -> byte, static member witnesses.convert_witness : x:bigint * _output:decimal -> decimal, static member witnesses.convert_witness : x:bigint * _output:float -> float, static member witnesses.convert_witness : x:bigint * _output:float32 -> float32, static member witnesses.convert_witness : x:bigint * _output:int16 -> int16, static member witnesses.convert_witness : x:bigint * _output:int32 -> int, static member witnesses.convert_witness : x:bigint * _output:int64 -> int64, static member witnesses.convert_witness : x:bigint * _output:sbyte -> sbyte, static member witnesses.convert_witness : x:bigint * _output:uint16 -> uint16, static member witnesses.convert_witness : x:bigint * _output:uint32 -> uint32, static member witnesses.convert_witness : x:bigint * _output:uint64 -> uint64
+neg128.fs(36,47,36,54): typecheck error FS0043: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type: 'output
+
+Known type parameters: < bigint , 'output >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint * _output:Complex -> Complex
+ - static member witnesses.convert_witness : x:bigint * _output:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint * _output:byte -> byte
+ - static member witnesses.convert_witness : x:bigint * _output:decimal -> decimal
+ - static member witnesses.convert_witness : x:bigint * _output:float -> float
+ - static member witnesses.convert_witness : x:bigint * _output:float32 -> float32
+ - static member witnesses.convert_witness : x:bigint * _output:int16 -> int16
+ - static member witnesses.convert_witness : x:bigint * _output:int32 -> int
+ - static member witnesses.convert_witness : x:bigint * _output:int64 -> int64
+ - static member witnesses.convert_witness : x:bigint * _output:sbyte -> sbyte
+ - static member witnesses.convert_witness : x:bigint * _output:uint16 -> uint16
+ - static member witnesses.convert_witness : x:bigint * _output:uint32 -> uint32
+ - static member witnesses.convert_witness : x:bigint * _output:uint64 -> uint64
diff --git a/tests/fsharp/typecheck/sigs/neg129.bsl b/tests/fsharp/typecheck/sigs/neg129.bsl
index 8e34cc5331..23bcf36815 100644
--- a/tests/fsharp/typecheck/sigs/neg129.bsl
+++ b/tests/fsharp/typecheck/sigs/neg129.bsl
@@ -1,2 +1,21 @@
 
-neg129.fs(67,47,67,54): typecheck error FS0043: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: static member witnesses.convert_witness : x:bigint * _output:Complex -> Complex, static member witnesses.convert_witness : x:bigint * _output:bigint -> bigint, static member witnesses.convert_witness : x:bigint * _output:byte -> byte, static member witnesses.convert_witness : x:bigint * _output:decimal -> decimal, static member witnesses.convert_witness : x:bigint * _output:float -> float, static member witnesses.convert_witness : x:bigint * _output:float32 -> float32, static member witnesses.convert_witness : x:bigint * _output:int16 -> int16, static member witnesses.convert_witness : x:bigint * _output:int32 -> int, static member witnesses.convert_witness : x:bigint * _output:int64 -> int64, static member witnesses.convert_witness : x:bigint * _output:sbyte -> sbyte, static member witnesses.convert_witness : x:bigint * _output:uint16 -> uint16, static member witnesses.convert_witness : x:bigint * _output:uint32 -> uint32, static member witnesses.convert_witness : x:bigint * _output:uint64 -> uint64
+neg129.fs(67,47,67,54): typecheck error FS0043: A unique overload for method 'convert_witness' could not be determined based on type information prior to this program point. A type annotation may be needed.
+
+Known return type:  ^output
+
+Known type parameters: < bigint ,  ^output >
+
+Candidates:
+ - static member witnesses.convert_witness : x:bigint * _output:Complex -> Complex
+ - static member witnesses.convert_witness : x:bigint * _output:bigint -> bigint
+ - static member witnesses.convert_witness : x:bigint * _output:byte -> byte
+ - static member witnesses.convert_witness : x:bigint * _output:decimal -> decimal
+ - static member witnesses.convert_witness : x:bigint * _output:float -> float
+ - static member witnesses.convert_witness : x:bigint * _output:float32 -> float32
+ - static member witnesses.convert_witness : x:bigint * _output:int16 -> int16
+ - static member witnesses.convert_witness : x:bigint * _output:int32 -> int
+ - static member witnesses.convert_witness : x:bigint * _output:int64 -> int64
+ - static member witnesses.convert_witness : x:bigint * _output:sbyte -> sbyte
+ - static member witnesses.convert_witness : x:bigint * _output:uint16 -> uint16
+ - static member witnesses.convert_witness : x:bigint * _output:uint32 -> uint32
+ - static member witnesses.convert_witness : x:bigint * _output:uint64 -> uint64

From 3042bdae3b84e61a5e90009f281956d6a9f25946 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sat, 15 Feb 2020 12:55:01 +0100
Subject: [PATCH 93/96] edge case: needs a new line after "A unique overload
 for method '%s' could not be determined based on type information prior to
 this program point. A type annotation may be needed." if there are no
 optional parts.

---
 src/fsharp/CompileOps.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 7363937a48..ff1dce25a3 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -838,7 +838,7 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
                 [knownReturnType; genericParametersMessage; argsMessage]
                 |> List.choose id
                 |> String.concat (nl + nl)
-                |> function | "" -> String.Empty
+                |> function | "" -> nl
                             | result -> nl + nl + result + nl + nl
               
               match failure with

From e03f680eed893d8c5dc2806edbdf3d709d3a3c57 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sat, 15 Feb 2020 13:09:33 +0100
Subject: [PATCH 94/96] updating base line for edge case of missing new line

---
 .../wellformedness/E_Clashing_Values_in_AbstractClass01.bsl    | 3 ++-
 .../core/fsfromfsviacs/compilation.langversion.old.output.bsl  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
index 45c1cf3535..f78afd6271 100644
--- a/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
+++ b/tests/fsharp/conformance/wellformedness/E_Clashing_Values_in_AbstractClass01.bsl
@@ -1,4 +1,5 @@
 
-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
diff --git a/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.bsl b/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.bsl
index cafd27cffd..ac498298de 100644
--- a/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.bsl
+++ b/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.bsl
@@ -122,6 +122,7 @@ test.fsx(232,15): warning FS0025: Incomplete pattern matches on this expression.
 
 test.fsx(249,15): warning FS0025: Incomplete pattern matches on this expression. For example, the value 'U2 (_, U1 (_, "a"))' may indicate a case not covered by the pattern(s).
 
-test.fsx(383,29): error FS0041: A unique overload for method 'SimpleOverload' could not be determined based on type information prior to this program point. A type annotation may be needed.Candidates:
+test.fsx(383,29): error FS0041: A unique overload for method 'SimpleOverload' could not be determined based on type information prior to this program point. A type annotation may be needed.
+Candidates:
  - SomeClass.SimpleOverload(?x: Nullable<int>) : int
  - SomeClass.SimpleOverload(?x: int) : int

From 1b0530d60cdf3704bbd9b9172b18933f791fa6e9 Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Sat, 15 Feb 2020 14:16:52 +0100
Subject: [PATCH 95/96] missing baseline

---
 .../core/fsfromfsviacs/compilation.errors.output.bsl     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.bsl b/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.bsl
index 5c10823e04..a626954ec3 100644
--- a/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.bsl
+++ b/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.bsl
@@ -1,5 +1,6 @@
 
-test.fsx(186,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.Candidates:
+test.fsx(186,34): error FS0041: A unique overload for method 'OverloadedMethodTakingOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
+Candidates:
  - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
  - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
@@ -67,7 +68,8 @@ Candidates:
  - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float) : int
  - SomeClass.OverloadedMethodTakingOptionals(?x: int,?y: string,?d: float32) : int
 
-test.fsx(198,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed.Candidates:
+test.fsx(198,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionalsWithDefaults' could not be determined based on type information prior to this program point. A type annotation may be needed.
+Candidates:
  - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
  - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
 
@@ -127,7 +129,8 @@ Candidates:
  - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
  - SomeClass.OverloadedMethodTakingNullableOptionalsWithDefaults(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
 
-test.fsx(207,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.Candidates:
+test.fsx(207,34): error FS0041: A unique overload for method 'OverloadedMethodTakingNullableOptionals' could not be determined based on type information prior to this program point. A type annotation may be needed.
+Candidates:
  - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int64>,?y: string,?d: Nullable<float>) : int
  - SomeClass.OverloadedMethodTakingNullableOptionals(?x: Nullable<int>,?y: string,?d: Nullable<float>) : int
 

From 9ab9ea9ab33a235d782ab97f095aa6ee0058457d Mon Sep 17 00:00:00 2001
From: Gauthier Segay <gauthier.segay@gmail.com>
Date: Tue, 18 Feb 2020 20:58:44 +0100
Subject: [PATCH 96/96] removing comment

---
 src/fsharp/MethodCalls.fs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index 085237e75c..341664d873 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -1002,10 +1002,6 @@ let CoerceFromFSharpFuncToDelegate g amap infoReader ad callerArgTy m callerArgE
 
 // Handle adhoc argument conversions
 let AdjustCallerArgExprForCoercions (g: TcGlobals) amap infoReader ad isOutArg calledArgTy (reflArgInfo: ReflectedArgInfo) callerArgTy m callerArgExpr = 
-   // todo after rebase:
-   // code review on the `coerceExpr` function from @tihan, we can discard first `isOutArg` argument as the only
-   // hardcoded usage was guarded by `error` when the value is true, and passing an explicit false which is now
-   // guaranteed equivalent to `callerArg.IsOptional`
    if isByrefTy g calledArgTy && isRefCellTy g callerArgTy then 
        None, Expr.Op (TOp.RefAddrGet false, [destRefCellTy g callerArgTy], [callerArgExpr], m)