Added OpenILModuleReaderFromStream

dotnet · Aug 30, 2019 · 067b547 · 067b547
1 parent 23856f7
commit 067b547
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs
@@ -376,10 +376,18 @@ type StreamView(s: Stream) =
         s.Seek (int64 addr, SeekOrigin.Begin) |> ignore
         r.ReadUInt16 ()
 
+    override bfv.Finalize() =
+        (bfv :> IDisposable).Dispose()
+
+    interface IDisposable with
+
+        member this.Dispose() =
+            GC.SurpressFinalize(this)
+            r.Dispose()
+
 [<DebuggerDisplay("{FileName}")>]
-type StreamFile(fileName: string, bytes: byte[]) = 
-    let view = ByteView bytes
-    do stats.byteFileCount <- stats.byteFileCount + 1
+type StreamFile(fileName: string, s: Stream) = 
+    let view = StreamView s
     member __.FileName = fileName
     interface BinaryFile with
         override bf.GetView() = view :> BinaryView
@@ -4062,6 +4070,11 @@ let OpenILModuleReaderFromBytes fileName bytes opts =
     let ilModule, ilAssemblyRefs, pdb = openPE (fileName, pefile, opts.pdbDirPath, (opts.reduceMemoryUsage = ReduceMemoryFlag.Yes), opts.ilGlobals, true)
     new ILModuleReaderImpl(ilModule, ilAssemblyRefs, (fun () -> ClosePdbReader pdb)) :> ILModuleReader
 
+let OpenILModuleReaderFromStream fileName s opts = 
+    let pefile = StreamFile(fileName, s) :> BinaryFile
+    let ilModule, ilAssemblyRefs, pdb = openPE (fileName, pefile, opts.pdbDirPath, (opts.reduceMemoryUsage = ReduceMemoryFlag.Yes), opts.ilGlobals, true)
+    new ILModuleReaderImpl(ilModule, ilAssemblyRefs, (fun () -> ClosePdbReader pdb)) :> ILModuleReader
+
 let ClearAllILModuleReaderCache() =
     ilModuleReaderCache1.Clear(ILModuleReaderCache1LockToken())
     ilModuleReaderCache2.Clear()

diff --git a/src/absil/ilread.fsi b/src/absil/ilread.fsi
@@ -85,6 +85,10 @@ val internal ClearAllILModuleReaderCache : unit -> unit
 /// Open a binary reader based on the given bytes. 
 val internal OpenILModuleReaderFromBytes: fileNameForDebugOutput:string -> assemblyContents: byte[] -> options: ILReaderOptions -> ILModuleReader
 
+/// Open a binary reader based on the given stream.
+/// The ILModuleReader will own the lifetime of the stream.
+val internal OpenILModuleReaderFromStream: fileNameForDebugOutput:string -> assemblyContents: Stream -> options: ILReaderOptions -> ILModuleReader
+
 type Statistics = 
     { mutable rawMemoryFileCount : int
       mutable memoryMapFileOpenedCount : int