Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change throw/catch to conditional. fixes #456 #457

Merged
merged 2 commits into from
Nov 5, 2015
+9 −6
Merged

Change throw/catch to conditional. fixes #456 #457

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35d2e52
Change throw/catch to conditional. fixes #456
nosami Nov 4, 2015
ffe2b44
Changed conditional from mono check to Windows
nosami Nov 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/absil/ilread.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3971,19 +3971,15 @@ let ClosePdbReader pdb =
#endif

let OpenILModuleReader infile opts =

#if FX_NO_NATIVE_MEMORY_MAPPED_FILES
#else
try
if not IL.runningOnMono then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

runningOnMono isn't what we want here, because we may be running with Mono on Windows.

I think just check for Windows.

let mmap = MemoryMappedFile.Create infile
let modul,ilAssemblyRefs,pdb = genOpenBinaryReader infile mmap opts
{ modul = modul;
ilAssemblyRefs=ilAssemblyRefs;
dispose = (fun () ->
mmap.Close();
ClosePdbReader pdb) }
with _ ->
#endif
else
let mc = ByteFile.OpenIn infile
let modul,ilAssemblyRefs,pdb = genOpenBinaryReader infile mc opts
{ modul = modul;
Expand Down