Fix 631

Author: dsyme

src/fsharp/TastOps.fs

@@ -82,12 +82,14 @@ let emptyTyparInst = ([] : TyparInst)
 type Remap =
     { tpinst : TyparInst;
       valRemap: ValRemap;
-      tyconRefRemap : TyconRefRemap }
+      tyconRefRemap : TyconRefRemap;
+      removeTraitSolutions: bool }
 
 let emptyRemap = 
     { tpinst        = emptyTyparInst; 
       tyconRefRemap = emptyTyconRefRemap;
-      valRemap      = ValMap.Empty }
+      valRemap      = ValMap.Empty;
+      removeTraitSolutions = false }
 
 type Remap with 
     static member Empty = emptyRemap
@@ -228,6 +230,7 @@ and remapTraitAux tyenv (TTrait(typs,nm,mf,argtys,rty,slnCell)) =
     let slnCell = 
         match !slnCell with 
         | None -> None
+        | _ when tyenv.removeTraitSolutions -> None
         | Some sln -> 
             let sln = 
                 match sln with 
@@ -343,7 +346,8 @@ let remapSlotSig remapAttrib tyenv (TSlotSig(nm,typ, ctps,methTypars,paraml, rty
 let mkInstRemap tpinst = 
     { tyconRefRemap = emptyTyconRefRemap; 
       tpinst        = tpinst; 
-      valRemap      = ValMap.Empty }
+      valRemap      = ValMap.Empty;
+      removeTraitSolutions = false }
 
 // entry points for "typar -> TType" instantiation 
 let instType              tpinst x = if List.isEmpty tpinst then x else remapTypeAux  (mkInstRemap tpinst) x
@@ -1264,6 +1268,8 @@ let tryRescopeEntity viewedCcu (entity:Entity) : EntityRef option =
 let tryRescopeVal viewedCcu (entityRemap:Remap) (vspec:Val) : ValRef option = 
     match vspec.PublicPath with 
     | Some (ValPubPath(p,fullLinkageKey)) -> 
+        // The type information in the val linkage doesn't need to keep any information to trait solutions.
+        let entityRemap = { entityRemap with removeTraitSolutions = true }
         let fullLinkageKey = remapValLinkage entityRemap fullLinkageKey
         let vref = 
             // This compensates for the somewhat poor design decision in the F# compiler and metadata where
@@ -3482,7 +3488,8 @@ let addValRemap v v' tmenv =
 let mkRepackageRemapping mrpi = 
     { valRemap = ValMap.OfList (mrpi.mrpiVals |> List.map (fun (vref,x) -> vref.Deref, x));
       tpinst = emptyTyparInst; 
-      tyconRefRemap = TyconRefMap.OfList mrpi.mrpiEntities }
+      tyconRefRemap = TyconRefMap.OfList mrpi.mrpiEntities
+      removeTraitSolutions = false }
 
 //--------------------------------------------------------------------------
 // Compute instances of the above for mty -> mty

src/fsharp/TastOps.fsi

@@ -311,7 +311,8 @@ type ValRemap = ValMap<ValRef>
 type Remap =
     { tpinst : TyparInst;
       valRemap: ValRemap;
-      tyconRefRemap : TyconRefRemap }
+      tyconRefRemap : TyconRefRemap;
+      removeTraitSolutions: bool }
 
     static member Empty : Remap
 

tests/fsharp/single-neg-test.bat

@@ -40,9 +40,23 @@ if exist "%testname%b.ml" (set sources=%sources% %testname%b.ml)
 if exist "%testname%b.fs" (set sources=%sources% %testname%b.fs)
 if exist "helloWorldProvider.dll" (set sources=%sources% -r:helloWorldProvider.dll)
 
+if exist "%testname%-pre.fs" (
+    echo set sources=%sources% -r:%testname%-pre.dll
+    set sources=%sources% -r:%testname%-pre.dll
+)
+
 REM check negative tests for bootstrapped fsc.exe due to line-ending differences
 if "%FSC:fscp=X%" == "%FSC%" ( 
 
+    if exist "%testname%-pre.fs" (
+        echo "sources=%sources%"
+	    "%FSC%" %fsc_flags% -a -o:%testname%-pre.dll  "%testname%-pre.fs" 
+        @if ERRORLEVEL 1 (
+            set ERRORMSG=%ERRORMSG% FSC failed for precursor library code for  %sources%;
+            goto SetError
+		)
+    )
+
     echo Negative typechecker testing: %testname%
     echo "%FSC%" %fsc_flags% --vserrors --warnaserror --nologo --maxerrors:10000 -a -o:%testname%.dll  %sources%
     "%FSC%" %fsc_flags% --vserrors --warnaserror --nologo --maxerrors:10000 -a -o:%testname%.dll  %sources% 2> %testname%.err

tests/fsharp/typecheck/sigs/build.bat

@@ -5,6 +5,9 @@ setlocal
 REM Configure the sample, i.e. where to find the F# compiler and C# compiler.
 call %~d0%~p0..\..\..\config.bat
 
+call ..\..\single-neg-test.bat neg94
+@if ERRORLEVEL 1 goto Error
+
 "%FSC%" %fsc_flags% --target:exe -o:pos22.exe  pos22.fs 
 @if ERRORLEVEL 1 goto Error
 
@@ -338,7 +341,6 @@ call ..\..\single-neg-test.bat neg42
 "%PEVERIFY%" pos03a.dll
 @if ERRORLEVEL 1 goto Error
 
-
 call ..\..\single-neg-test.bat neg34
 @if ERRORLEVEL 1 goto Error
 

tests/fsharp/typecheck/sigs/neg94-pre.fs

@@ -0,0 +1,5 @@
+namespace Neg94Pre
+
+type Class1() =
+  static member inline ($) (r:'R, _) = fun (x:'T) -> ((^R) : (static member method2: ^T -> ^R) x)
+  static member inline method1 x = Unchecked.defaultof<'r> $ Class1()

tests/fsharp/typecheck/sigs/neg94.bsl

@@ -0,0 +1,2 @@
+
+neg94.fs(6,12,6,21): typecheck error FS0039: The value or constructor 'undefined' is not defined

tests/fsharp/typecheck/sigs/neg94.fs

@@ -0,0 +1,10 @@
+namespace Neg94
+
+module Repro1 = 
+  let v = Neg94Pre.Class1()
+
+  let v2 = undefined  
+  // We're expecting the compile of this file to fail, but the point is that the 
+  // reference of neg94-pre.dll shouldn't give extra warnings about bad definitions.
+  // See https://github.com/Microsoft/visualfsharp/issues/631
+