Fixes #644 --- F# 4.0 ReflectedDefinitions when compiling for F# 3.1 runtime #644

A simple fix for #644. Compilation of ReflectedDefinition attributed code using F# 4.0 compiler when targeting runtime 4.3.1.0 generates an invalid attribute in a binary.

commit e384c1b41855ef9c6e848b452f84fde29dbcb74c
Author: Don Syme <donsyme@fastmail.fm>
Date:   Tue Sep 29 23:22:14 2015 +0100

    Fix #644

Author: dsyme

src/fsharp/fsc.fs

@@ -996,14 +996,20 @@ module MainModuleBuilder =
             codegenResults.quotationResourceInfo 
             |> List.map (fun (referencedTypeDefs, reflectedDefinitionBytes) -> 
                 let reflectedDefinitionResourceName = QuotationPickler.SerializedReflectedDefinitionsResourceNameBase+"-"+assemblyName+"-"+string(newUnique())+"-"+string(hash reflectedDefinitionBytes)
-                let reflectedDefinitionAttr = mkCompilationMappingAttrForQuotationResource tcGlobals (reflectedDefinitionResourceName, referencedTypeDefs)
+                let reflectedDefinitionAttrs = 
+                    match QuotationTranslator.QuotationGenerationScope.ComputeQuotationFormat tcGlobals with
+                    | QuotationTranslator.QuotationSerializationFormat.FSharp_40_Plus ->
+                        [ mkCompilationMappingAttrForQuotationResource tcGlobals (reflectedDefinitionResourceName, referencedTypeDefs) ]
+                    | QuotationTranslator.QuotationSerializationFormat.FSharp_20_Plus ->
+                        [  ]
                 let reflectedDefinitionResource = 
                   { Name=reflectedDefinitionResourceName;
                     Location = ILResourceLocation.Local (fun () -> reflectedDefinitionBytes);
                     Access= ILResourceAccess.Public;
                     CustomAttrs = emptyILCustomAttrs }
-                reflectedDefinitionAttr, reflectedDefinitionResource) 
+                reflectedDefinitionAttrs, reflectedDefinitionResource) 
             |> List.unzip
+            |> (fun (attrs, resource) -> List.concat attrs, resource)
 
         let manifestAttrs = 
             mkILCustomAttrs

tests/config.bat

@@ -213,6 +213,7 @@ echo FSCOREDLLPORTABLEPATH =%FSCOREDLLPORTABLEPATH%
 echo FSCOREDLLNETCOREPATH=%FSCOREDLLNETCOREPATH%
 echo FSCOREDLLNETCORE78PATH=%FSCOREDLLNETCORE78PATH%
 echo FSCOREDLLNETCORE259PATH=%FSCOREDLLNETCORE259PATH%
+echo FSCOREDLLVPREVPATH  =%FSCOREDLLVPREVPATH%
 echo FSDATATPPATH        =%FSDATATPPATH%
 echo FSDIFF              =%FSDIFF%
 echo FSI                 =%FSI%
@@ -266,6 +267,7 @@ set FSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FShar
 set FSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.78.4.0
 set FSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.259.4.0
 set FSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers
+set FSCOREDLLVPREVPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.1.0
 
 REM == Check if using open build instead
 IF EXIST "%FSCBinPath%\FSharp.Core.dll" set FSCOREDLLPATH=%FSCBinPath%
@@ -282,4 +284,4 @@ set FSCOREDLLPORTABLEPATH=%FSCOREDLLPORTABLEPATH%\FSharp.Core.dll
 set FSCOREDLLNETCOREPATH=%FSCOREDLLNETCOREPATH%\FSharp.Core.dll
 set FSCOREDLLNETCORE78PATH=%FSCOREDLLNETCORE78PATH%\FSharp.Core.dll
 set FSCOREDLLNETCORE259PATH=%FSCOREDLLNETCORE259PATH%\FSharp.Core.dll
-set FSDATATPPATH=%FSDATATPPATH%\FSharp.Data.TypeProviders.dll
+set FSCOREDLLVPREVPATH=%FSCOREDLLVPREVPATH%\FSharp.Core.dll

tests/fsharp/core/quotes/build.bat

@@ -37,6 +37,22 @@ rem fsc.exe building
     "%PEVERIFY%" test--optimize.exe 
     @if ERRORLEVEL 1 goto Error
 
+    rmdir /s /q test--downtarget
+    mkdir test--downtarget
+
+	dir "%FSCOREDLLVPREVPATH%"
+	dir "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\"
+	REM Compile with FSharp.Core 4.3.1.0.  Add the FSHARP_CORE_31 and Portable defines.
+	"%FSC%" %fsc_flags% -o:test--downtarget\test--downtarget.exe --noframework -r "%FSCOREDLLVPREVPATH%" -r "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\mscorlib.dll" -r System.dll -r System.Runtime.dll -r System.Xml.dll -r System.Data.dll -r System.Web.dll -r System.Core.dll -r System.Numerics.dll -r cslib.dll -g test.fsx --define:FSHARP_CORE_31 --define:Portable
+    @if ERRORLEVEL 1 goto Error
+
+	copy /y "%FSCOREDLLVPREVPATH%" test--downtarget\FSharp.Core.dll
+    @if ERRORLEVEL 1 goto Error
+
+    "%PEVERIFY%" test--downtarget\test--downtarget.exe 
+    @if ERRORLEVEL 1 goto Error
+
+
 :Ok
 echo Built fsharp %~f0 ok.
 echo. > build.ok

tests/fsharp/core/quotes/run.bat

@@ -35,6 +35,10 @@ echo TestD
     @if ERRORLEVEL 1 goto Error
     if NOT EXIST test.ok goto SetError
 
+    if exist test.ok (del /f /q test.ok)
+    %CLIX% test--downtarget\test--downtarget.exe 
+    if NOT EXIST test.ok goto SetError
+
 :Ok
 echo Ran fsharp %~f0 ok.
 endlocal

tests/fsharp/core/quotes/test.fsx

@@ -95,7 +95,6 @@ module TypedTest = begin
     test "check UInt16"   ((<@  1us  @> |> (function UInt16 1us -> true | _ -> false))) 
     test "check UInt32"   ((<@  1u   @> |> (function UInt32 1u ->  true | _ -> false))) 
     test "check UInt64"   ((<@  1UL  @> |> (function UInt64 1UL -> true | _ -> false))) 
-    test "check Decimal"  ((<@  1M   @> |> (function Decimal 1M -> true | _ -> false))) 
     test "check String"   ((<@  "1"  @> |> (function String "1" -> true | _ -> false))) 
 
     test "check ~SByte"   ((<@  "1"  @> |> (function SByte _ ->    false | _ -> true))) 
@@ -106,10 +105,14 @@ module TypedTest = begin
     test "check ~UInt16"  ((<@  "1"  @> |> (function UInt16 _ ->   false | _ -> true))) 
     test "check ~UInt32"  ((<@  "1"  @> |> (function UInt32 _ ->   false | _ -> true))) 
     test "check ~UInt64"  ((<@  "1"  @> |> (function UInt64 _ ->   false | _ -> true))) 
-    test "check ~Decimal" ((<@  "1"  @> |> (function Decimal _ ->  false | _ -> true))) 
     test "check ~String"  ((<@  1    @> |> (function String "1" -> false | _ -> true))) 
 
+#if FSHARP_CORE_31
+#else
+    test "check Decimal"  ((<@  1M   @> |> (function Decimal 1M -> true | _ -> false))) 
+    test "check ~Decimal" ((<@  "1"  @> |> (function Decimal _ ->  false | _ -> true))) 
     test "check ~Decimal neither" ((<@ 1M + 1M @> |> (function Decimal _ ->  false | _ -> true))) 
+#endif
 
     test "check AndAlso" ((<@ true && true  @> |> (function AndAlso(Bool(true),Bool(true)) -> true | _ -> false))) 
     test "check OrElse"  ((<@ true || true  @> |> (function OrElse(Bool(true),Bool(true)) -> true | _ -> false))) 
@@ -528,13 +531,16 @@ module TypedTest = begin
             |   _ -> false
         end
 
+#if FSHARP_CORE_31
+#else
     test "check accesses to readonly fields in ReflectedDefinitions" 
         begin
             let c1 = Class1("a")
             match <@ c1.myReadonlyField @> with
             |   FieldGet(Some (ValueWithName (_, v, "c1")), field) -> (v.Name = "Class1") && (field.Name = "myReadonlyField")
             |   _ -> false
         end
+#endif
 
 end
 
@@ -1669,10 +1675,13 @@ module QuotationConstructionTests =
     check "vcknwwe099" (Expr.PropertySet(<@@ (new System.Windows.Forms.Form()) @@>, setof <@@ (new System.Windows.Forms.Form()).Text <- "2" @@>, <@@ "3" @@> )) <@@ (new System.Windows.Forms.Form()).Text <- "3" @@>
     #endif
     check "vcknwwe099" (Expr.PropertySet(<@@ (new Foo()) @@>, setof <@@ (new Foo()).[3] <- 1 @@>, <@@ 2 @@> , [ <@@ 3 @@> ] )) <@@ (new Foo()).[3] <- 2 @@>
+#if FSHARP_CORE_31
+#else
     check "vcknwwe0qq1" (Expr.QuoteRaw(<@ "1" @>)) <@@ <@@ "1" @@> @@>
     check "vcknwwe0qq2" (Expr.QuoteRaw(<@@ "1" @@>)) <@@ <@@ "1" @@> @@>
     check "vcknwwe0qq3" (Expr.QuoteTyped(<@ "1" @>)) <@@ <@ "1" @> @@>
     check "vcknwwe0qq4" (Expr.QuoteTyped(<@@ "1" @@>)) <@@ <@ "1" @> @@>
+#endif
     check "vcknwwe0ww" (Expr.Sequential(<@@ () @@>, <@@ 1 @@>)) <@@ (); 1 @@>
     check "vcknwwe0ee" (Expr.TryFinally(<@@ 1 @@>, <@@ () @@>)) <@@ try 1 finally () @@>
     check "vcknwwe0rr" (match Expr.TryWith(<@@ 1 @@>, Var.Global("e1",typeof<exn>), <@@ 1 @@>, Var.Global("e2",typeof<exn>), <@@ 2 @@>) with TryWith(b,v1,ef,v2,eh) -> b = <@@ 1 @@> && eh = <@@ 2 @@> && ef = <@@ 1 @@> && v1 = Var.Global("e1",typeof<exn>) && v2 = Var.Global("e2",typeof<exn>)| _ -> false) true 
@@ -2448,6 +2457,8 @@ module QuotationOfResizeArrayIteration =
 
 
 
+#if FSHARP_CORE_31
+#else
 module TestAutoQuoteAtStaticMethodCalls = 
     open Microsoft.FSharp.Quotations
 
@@ -2752,6 +2763,10 @@ module ExtensionMembersWithSameName =
         | _ -> failwith "unexpected shape"
 
     runAll()
+#endif
+
+module TestAssemblyAttributes = 
+    let attributes = System.Reflection.Assembly.GetExecutingAssembly().GetCustomAttributes(false)
 
 let aa =
   if not failures.IsEmpty then (printfn "Test Failed, failures = %A" failures; exit 1)