Skip to content

FSharp.Compiler.dll and the FSharp.LanguageService.Compiler.dll compiled with peverify issues. #1465

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

Merged
KevinRansom merged 4 commits into from
Aug 23, 2016
Merged

FSharp.Compiler.dll and the FSharp.LanguageService.Compiler.dll compiled with peverify issues. #1465

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cdcad8
Merge branch 'preview4' of https://github.com/Microsoft/visualfsharp …
KevinRansom Aug 13, 2016
76796c3
store
KevinRansom Aug 14, 2016
96b4a04
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
KevinRansom Aug 22, 2016
7c610c7
Make fsharp.compiler.dll and FSharp.LanguageService.Compiler.dll peve…
KevinRansom Aug 22, 2016
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
24 changes: 11 additions & 13 deletions src/absil/ilread.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,6 @@ module MemoryMapping =
let OPEN_EXISTING = 0x0003
let OPEN_ALWAYS = 0x0004

let derefByte (p:nativeint) =
NativePtr.read (NativePtr.ofNativeInt<byte> p)

type MemoryMappedFile(hMap: MemoryMapping.HANDLE, start:nativeint) =
inherit BinaryFile()

Expand All @@ -182,37 +179,38 @@ type MemoryMappedFile(hMap: MemoryMapping.HANDLE, start:nativeint) =
start + nativeint i

override m.ReadByte i =
derefByte (m.Addr i)
Marshal.ReadByte(m.Addr i)

override m.ReadBytes i len =
let res = Bytes.zeroCreate len
Marshal.Copy(m.Addr i, res, 0,len)
res

override m.ReadInt32 i =
NativePtr.read (NativePtr.ofNativeInt<int32> (m.Addr i))
Marshal.ReadInt32(m.Addr i)

override m.ReadUInt16 i =
NativePtr.read (NativePtr.ofNativeInt<uint16> (m.Addr i))
uint16(Marshal.ReadInt16(m.Addr i))

member m.Close() =
ignore(MemoryMapping.UnmapViewOfFile start)
ignore(MemoryMapping.CloseHandle hMap)

override m.CountUtf8String i =
let start = m.Addr i
let start = m.Addr i
let mutable p = start
while derefByte p <> 0uy do
while Marshal.ReadByte(p) <> 0uy do
p <- p + 1n
int (p - start)

override m.ReadUTF8String i =
let n = m.CountUtf8String i
#if FX_RESHAPED_REFLECTION
System.Text.Encoding.UTF8.GetString(NativePtr.ofNativeInt (m.Addr i), n)
#else
new System.String(NativePtr.ofNativeInt (m.Addr i), 0, n, System.Text.Encoding.UTF8)
#endif
System.Runtime.InteropServices.Marshal.PtrToStringAnsi((m.Addr i), n)
//#if FX_RESHAPED_REFLECTION
Copy link
Contributor

@OmarTawfik OmarTawfik Aug 22, 2016

Choose a reason for hiding this comment

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

Remove code?

// System.Text.Encoding.UTF8.GetString(NativePtr.ofNativeInt (m.Addr i), n)
//#else
// new System.String(NativePtr.ofNativeInt (m.Addr i), 0, n, System.Text.Encoding.UTF8)
//#endif


//---------------------------------------------------------------------
Expand Down