Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[2018-06] Apply F# portable pdb debug fix for pinvokes \u0026 bump #9797

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
akoeplinger merged 1 commit into from
Jul 30, 2018
Merged

[2018-06] Apply F# portable pdb debug fix for pinvokes \u0026 bump #9797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions packaging/MacSDK/fsharp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ class FsharpPackage(GitHubTarballPackage):
def __init__(self):
GitHubTarballPackage.__init__(self,
'fsharp', 'fsharp',
'4.1.33',
'561af8ba705fdbd84274702bc8073b9a94ba0a7d',
'4.1.34',
'662492595a63dffff8fac84939614743fd6d34f9',
configure='./configure --prefix="%{package_prefix}"',
override_properties={ 'make': 'make' })

self.extra_stage_files = ['lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.Targets']
self.sources.extend(['patches/fsharp-portable-pdb.patch', 'patches/fsharp-string-switchName.patch', 'patches/fsharp-path-overloads.patch'])
self.sources.extend(['patches/fsharp-portable-pdb.patch',
'patches/fsharp-string-switchName.patch',
'patches/fsharp-path-overloads.patch',
'patches/fsharp-debug-pinvoke-fix.patch'])

def prep(self):
Package.prep(self)
Expand Down
24 changes: 24 additions & 0 deletions packaging/MacSDK/patches/fsharp-debug-pinvoke-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs
index 8ea9dec..74b3d9d 100755
--- a/src/absil/ilwrite.fs
+++ b/src/absil/ilwrite.fs
@@ -2594,7 +2594,8 @@ let GenMethodDefAsRow cenv env midx (md: ILMethodDef) =
SequencePoints=seqpoints }
cenv.AddCode code
addr
- | MethodBody.Abstract ->
+ | MethodBody.Abstract
+ | MethodBody.PInvoke _ ->
// Now record the PDB record for this method - we write this out later.
if cenv.generatePdb then
cenv.pdbinfo.Add
@@ -2607,8 +2608,7 @@ let GenMethodDefAsRow cenv env midx (md: ILMethodDef) =
SequencePoints = [| |] }
0x0000
| MethodBody.Native ->
- failwith "cannot write body of native method - Abstract IL cannot roundtrip mixed native/managed binaries"
- | _ -> 0x0000)
+ failwith "cannot write body of native method - Abstract IL cannot roundtrip mixed native/managed binaries")

UnsharedRow
[| ULong codeAddr