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
Merged

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

Show file tree
Hide file tree
Changes from all commits
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
6 changes: 6 additions & 0 deletions src/absil/il.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,17 @@ open Microsoft.FSharp.Compiler.AbstractIL
open Microsoft.FSharp.Compiler.AbstractIL.Internal
open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library
open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics
open System
open System.Collections.Generic
open System.Collections

let logging = false

let runningOnWindows =
match System.Environment.OSVersion.Platform with
| PlatformID.Win32NT | PlatformID.Win32S | PlatformID.Win32Windows | PlatformID.WinCE -> true
| _ -> false

// Officially supported way to detect if we are running on Mono.
// See http://www.mono-project.com/FAQ:_Technical
// "How can I detect if am running in Mono?" section
Expand Down
1 change: 1 addition & 0 deletions src/absil/il.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2275,6 +2275,7 @@ type ILPropertyRef =
member Name: string
interface System.IComparable

val runningOnWindows: bool
val runningOnMono: bool

type ILReferences =
Expand Down
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 IL.runningOnWindows then
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