Fix embedded PDB support on big-endian systems #12086
Conversation
* Use little-endian byte order when writing integers to the buffer in pdbGetCvDebugInfo and pdbGetEmbeddedPdbDebugInfo
| // Portable PDB Writer | ||
| //--------------------------------------------------------------------- | ||
|
|
||
| let b0 n = (n &&& 0xFF) |
There was a problem hiding this comment.
I think you can open Internal.Utilities.Library.Extras.Bits
There was a problem hiding this comment.
i32AsBytes could be moved from il.fs into lib.fs too, there are a few duplications of these
There was a problem hiding this comment.
I see. Just to clarify, that module seems to contain the b0 .. b3 functions, but not i32AsBytes, so the latter would have to remain, right? EDIT: sorry, missed your update. I'll look into that.
There was a problem hiding this comment.
It's actually OK, this is not the only duplication, we can clean that up later I think
There was a problem hiding this comment.
I merged - if you'd like to submit a PR consolidating b0 etc that would be cool
|
Great fix, thanks! |
|
Thanks! I'll prepare a separate PR to clean up the duplication. As to this PR - it would be great to have this in .NET 6 as the problem prevents bootstrapping the compiler on s390x (and therefore prevents a source-build of the whole SDK to go through). Does this mean the PR will have to be backported to the dev17 branch, and if so, would that be possible? |
Never mind, I see this has already happened automatically.
Actually, I could use a bit of advice here. It seems the duplication is not quite identical: the "b0" .. "b3" functions in lib.fs return "int" while a number of the duplicates return "byte". (Note that all copies of the 64-bit "dw0" .. "dw7" routines return "byte".) If those are to be merged, should the result preferably be "int" or "byte" ? Either way seems to require a number of follow-on changes to fix the fall-out. |
3 participants
in pdbGetCvDebugInfo and pdbGetEmbeddedPdbDebugInfo
This showed up as a bug when bootstrapping the fsharp compiler natively on a big-endian machine (linux-s390x - IBM Z mainframe - which we're working on enabling for .NET 6). The compiler would create a .dll file with an invalid embedded PDB header, which would then cause the runtime to abort with a failed assertion when running that .dll. With this patch, native bootstrap of fsharp is successful on linux-s390x.
The implementation of "i32AsBytes" is copied from fsharp/absil/il.fs.