Merge pull request #5098 from brettfo/type-provider-15.7

brettfo · web-flow · commit 173513e369ff · 2018-06-05T10:38:25.000-07:00
Cherry-pick type provider fixes to 15.7
diff --git a/src/absil/illib.fs b/src/absil/illib.fs
@@ -1237,7 +1237,7 @@ module Shim =
         interface IFileSystem with
 
             member __.AssemblyLoadFrom(fileName: string) = 
-                Assembly.LoadFrom fileName
+                Assembly.UnsafeLoadFrom fileName
 
             member __.AssemblyLoad(assemblyName: AssemblyName) = 
                 Assembly.Load assemblyName
diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs
@@ -3228,14 +3228,18 @@ and seekReadManifestResources (ctxt: ILMetadataReader) (mdv: BinaryView) (pectxt
              let scoref = seekReadImplAsScopeRef ctxt mdv implIdx
 
              let location = 
-               match scoref with
-               | ILScopeRef.Local -> 
-                  let start = pectxtEager.anyV2P ("resource", offset + pectxtEager.resourcesAddr)
-                  let resourceLength = seekReadInt32 pevEager start
-                  let offsetOfBytesFromStartOfPhysicalPEFile = start + 4
-                  ILResourceLocation.LocalIn (ctxt.fileName, offsetOfBytesFromStartOfPhysicalPEFile, resourceLength)
-               | ILScopeRef.Module mref -> ILResourceLocation.File (mref, offset)
-               | ILScopeRef.Assembly aref -> ILResourceLocation.Assembly aref
+                match scoref with
+                | ILScopeRef.Local ->
+                    let start = pectxtEager.anyV2P ("resource", offset + pectxtEager.resourcesAddr)
+                    let resourceLength = seekReadInt32 pevEager start
+                    let offsetOfBytesFromStartOfPhysicalPEFile = start + 4
+                    if pectxtEager.noFileOnDisk then
+                        ILResourceLocation.LocalOut (seekReadBytes pevEager offsetOfBytesFromStartOfPhysicalPEFile resourceLength)                     
+                    else
+                        ILResourceLocation.LocalIn (ctxt.fileName, offsetOfBytesFromStartOfPhysicalPEFile, resourceLength)
+
+                | ILScopeRef.Module mref -> ILResourceLocation.File (mref, offset)
+                | ILScopeRef.Assembly aref -> ILResourceLocation.Assembly aref
 
              let r = 
                { Name= readStringHeap ctxt nameIdx
diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs
@@ -2679,22 +2679,24 @@ and GenEventPass3 cenv env (md: ILEventDef) =
 
 let rec GetResourceAsManifestResourceRow cenv r = 
     let data, impl = 
-      match r.Location with
-      | ILResourceLocation.LocalIn _
-      | ILResourceLocation.LocalOut _ ->
-          let bytes = r.GetBytes()
-          // Embedded managed resources must be word-aligned.  However resource format is 
-          // not specified in ECMA.  Some mscorlib resources appear to be non-aligned - it seems it doesn't matter.. 
-          let offset = cenv.resources.Position
-          let alignedOffset =  (align 0x8 offset)
-          let pad = alignedOffset - offset
-          let resourceSize = bytes.Length
-          cenv.resources.EmitPadding pad
-          cenv.resources.EmitInt32 resourceSize
-          cenv.resources.EmitBytes bytes
-          Data (alignedOffset, true),  (i_File, 0) 
-      | ILResourceLocation.File (mref, offset) -> ULong offset, (i_File, GetModuleRefAsFileIdx cenv mref)
-      | ILResourceLocation.Assembly aref -> ULong 0x0, (i_AssemblyRef, GetAssemblyRefAsIdx cenv aref)
+        let embedManagedResources (bytes:byte[]) = 
+            // Embedded managed resources must be word-aligned.  However resource format is  
+            // not specified in ECMA.  Some mscorlib resources appear to be non-aligned - it seems it doesn't matter..  
+            let offset = cenv.resources.Position 
+            let alignedOffset =  (align 0x8 offset) 
+            let pad = alignedOffset - offset 
+            let resourceSize = bytes.Length 
+            cenv.resources.EmitPadding pad 
+            cenv.resources.EmitInt32 resourceSize 
+            cenv.resources.EmitBytes bytes 
+            Data (alignedOffset, true),  (i_File, 0)  
+
+        match r.Location with 
+        | ILResourceLocation.LocalIn _ -> embedManagedResources (r.GetBytes())
+        | ILResourceLocation.LocalOut bytes -> embedManagedResources bytes 
+        | ILResourceLocation.File (mref, offset) -> ULong offset, (i_File, GetModuleRefAsFileIdx cenv mref) 
+        | ILResourceLocation.Assembly aref -> ULong 0x0, (i_AssemblyRef, GetAssemblyRefAsIdx cenv aref) 
+
     UnsharedRow 
        [| data 
           ULong (match r.Access with ILResourceAccess.Public -> 0x01 | ILResourceAccess.Private -> 0x02)
