Skip to content

Commit 2e5143a

Browse files
authored
Embeddedsource (#1608)
* Improve scope arrangement for portable pdbs * Git: 1) Enable implicit sequence points for portable pdbs 2) Minor rename and cleanup for portable pdb generation * Start enabling /embed * Saved * Fix manifest --- it was inadvertently updated with debuggableattribute flags. * reset debug build to full pdpbs * Fix up test baselines * Make build setup switch offable * Add testcase for portablepdb generation many let bindings * Feedback
1 parent b4b928e commit 2e5143a

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

src/absil/ilwritepdb.fs

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ type BlobBuildingStream () =
2626
static let chunkSize = 32 * 1024
2727
let builder = new BlobBuilder(chunkSize)
2828

29-
override this.CanWrite with get() = true
30-
override this.CanRead with get() = false
31-
override this.CanSeek with get() = false
32-
override this.Length with get() = int64(builder.Count)
29+
override this.CanWrite = true
30+
override this.CanRead = false
31+
override this.CanSeek = false
32+
override this.Length = int64(builder.Count)
3333

3434
override this.Write(buffer:byte array, offset:int, count:int) = builder.WriteBytes(buffer, offset, count)
3535
override this.WriteByte(value:byte) = builder.WriteByte(value)
@@ -294,11 +294,9 @@ let generatePortablePdb fixupSPs (embedAllSource:bool) (embedSourceList:string l
294294
let documentIndex =
295295
let includeSource file =
296296
let isInList =
297-
if embedSourceList |> List.length = 0 then false
297+
if embedSourceList.Length = 0 then false
298298
else
299-
match embedSourceList |> List.tryFind(fun f -> String.Compare(file, f, StringComparison.OrdinalIgnoreCase ) = 0) with
300-
| Some _ -> true
301-
| None -> false
299+
embedSourceList |> List.tryFind(fun f -> String.Compare(file, f, StringComparison.OrdinalIgnoreCase ) = 0) |> Option.isSome
302300

303301
if not embedAllSource && not isInList || not (File.Exists(file)) then
304302
None
@@ -324,25 +322,25 @@ let generatePortablePdb fixupSPs (embedAllSource:bool) (embedSourceList:string l
324322
let handle =
325323
match checkSum doc.File with
326324
| Some (hashAlg, checkSum) ->
327-
let h =
325+
let dbgInfo =
328326
(serializeDocumentName doc.File,
329327
metadata.GetOrAddGuid(hashAlg),
330328
metadata.GetOrAddBlob(checkSum.ToImmutableArray()),
331329
metadata.GetOrAddGuid(corSymLanguageTypeFSharp)) |> metadata.AddDocument
332330
match includeSource doc.File with
333331
| None -> ()
334332
| Some blob ->
335-
metadata.AddCustomDebugInformation(DocumentHandle.op_Implicit(h),
333+
metadata.AddCustomDebugInformation(DocumentHandle.op_Implicit(dbgInfo),
336334
metadata.GetOrAddGuid(embeddedSource),
337335
metadata.GetOrAddBlob(blob)) |> ignore
338-
h
336+
dbgInfo
339337
| None ->
340-
let h =
338+
let dbgInfo =
341339
(serializeDocumentName doc.File,
342340
metadata.GetOrAddGuid(System.Guid.Empty),
343341
metadata.GetOrAddBlob(ImmutableArray<byte>.Empty),
344342
metadata.GetOrAddGuid(corSymLanguageTypeFSharp)) |> metadata.AddDocument
345-
h
343+
dbgInfo
346344
index.Add(doc.File, handle)
347345
index
348346

0 commit comments

Comments
 (0)