@@ -3281,8 +3281,8 @@ and seekReadTopExportedTypes (ctxt: ILMetadataReader) =
32813281])
32823282
32833283#if ! FX_ NO_ PDB_ READER
3284- let getPdbReader pdbPath fileName=
3285- match pdbPath with
3284+ let getPdbReader pdbDirPath fileName=
3285+ match pdbDirPath with
32863286| None-> None
32873287| Some pdbpath->
32883288try
@@ -3694,7 +3694,7 @@ let openMetadataReader (fileName, mdfile: BinaryFile, metadataPhysLoc, peinfo, p
36943694// read of the AbsIL module.
36953695// ----------------------------------------------------------------------
36963696
3697- let openPEFileReader ( fileName , pefile : BinaryFile , pdbPath ) =
3697+ let openPEFileReader ( fileName , pefile : BinaryFile , pdbDirPath ) =
36983698let pev = pefile.GetView()
36993699(* MSDOS HEADER*)
37003700let peSignaturePhysLoc = seekReadInt32 pev0x3c
@@ -3861,13 +3861,13 @@ let openPEFileReader (fileName, pefile: BinaryFile, pdbPath) =
38613861// Set up the PDB reader so we can read debug info for methods.
38623862// ----------------------------------------------------------------------
38633863#if FX_ NO_ PDB_ READER
3864- let pdb = ignorepdbPath ; None
3864+ let pdb = ignorepdbDirPath ; None
38653865#else
38663866let pdb =
38673867if runningOnMonothen
38683868 None
38693869else
3870- getPdbReaderpdbPath fileName
3870+ getPdbReaderpdbDirPath fileName
38713871#endif
38723872
38733873let pectxt : PEReader =
@@ -3891,8 +3891,8 @@ let openPEFileReader (fileName, pefile: BinaryFile, pdbPath) =
38913891let peinfo = ( subsys, ( subsysMajor, subsysMinor), useHighEnthropyVA, ilOnly, only32, is32bitpreferred, only64, platform, isDll, alignVirt, alignPhys, imageBaseReal)
38923892( metadataPhysLoc, metadataSize, peinfo, pectxt, pev, pdb)
38933893
3894- let openPE ( fileName , pefile , pdbPath , reduceMemoryUsage , ilGlobals ) =
3895- let ( metadataPhysLoc , _metadataSize , peinfo , pectxt , pev , pdb ) = openPEFileReader( fileName, pefile, pdbPath )
3894+ let openPE ( fileName , pefile , pdbDirPath , reduceMemoryUsage , ilGlobals ) =
3895+ let ( metadataPhysLoc , _metadataSize , peinfo , pectxt , pev , pdb ) = openPEFileReader( fileName, pefile, pdbDirPath )
38963896let ilModule , ilAssemblyRefs = openMetadataReader( fileName, pefile, metadataPhysLoc, peinfo, pectxt, pev, Some pectxt, reduceMemoryUsage, ilGlobals)
38973897 ilModule, ilAssemblyRefs, pdb
38983898
@@ -3919,7 +3919,7 @@ type MetadataOnlyFlag = Yes | No
39193919type ReduceMemoryFlag = Yes| No
39203920
39213921type ILReaderOptions =
3922- { pdbPath : string option
3922+ { pdbDirPath : string option
39233923 ilGlobals: ILGlobals
39243924 reduceMemoryUsage: ReduceMemoryFlag
39253925 metadataOnly: MetadataOnlyFlag
@@ -3969,7 +3969,7 @@ let tryMemoryMapWholeFile opts fileName =
39693969
39703970let OpenILModuleReaderFromBytes fileName bytes opts =
39713971let pefile = ByteFile( fileName, bytes) :> BinaryFile
3972- let ilModule , ilAssemblyRefs , pdb = openPE( fileName, pefile, opts.pdbPath , ( opts.reduceMemoryUsage= ReduceMemoryFlag.Yes), opts.ilGlobals)
3972+ let ilModule , ilAssemblyRefs , pdb = openPE( fileName, pefile, opts.pdbDirPath , ( opts.reduceMemoryUsage= ReduceMemoryFlag.Yes), opts.ilGlobals)
39733973new ILModuleReader( ilModule, ilAssemblyRefs, ( fun () -> ClosePdbReader pdb))
39743974
39753975let OpenILModuleReader fileName opts =
@@ -3978,7 +3978,7 @@ let OpenILModuleReader fileName opts =
39783978try
39793979let fullPath = FileSystem.GetFullPathShim( fileName)
39803980let writeTime = FileSystem.GetLastWriteTimeShim( fileName)
3981- let key = ILModuleReaderCacheKey( fullPath, writeTime, opts.ilGlobals.primaryAssemblyScopeRef, opts.pdbPath .IsSome, opts.reduceMemoryUsage, opts.metadataOnly)
3981+ let key = ILModuleReaderCacheKey( fullPath, writeTime, opts.ilGlobals.primaryAssemblyScopeRef, opts.pdbDirPath .IsSome, opts.reduceMemoryUsage, opts.metadataOnly)
39823982 key, true
39833983with exn->
39843984 System.Diagnostics.Debug.Assert( false , sprintf" Failed to compute key in OpenILModuleReader cache for '%s '. Falling back to uncached. Error =%s " fileName( exn.ToString()))
@@ -3987,7 +3987,7 @@ let OpenILModuleReader fileName opts =
39873987
39883988let cacheResult =
39893989if keyOkthen
3990- if opts.pdbPath .IsSomethen None// can't used a cached entry when reading PDBs, since it makes the returned object IDisposable
3990+ if opts.pdbDirPath .IsSomethen None// can't used a cached entry when reading PDBs, since it makes the returned object IDisposable
39913991else ilModuleReaderCacheLock.AcquireLock( fun ltok -> ilModuleReaderCache.TryGet( ltok, key))
39923992else
39933993 None
@@ -3999,7 +3999,7 @@ let OpenILModuleReader fileName opts =
39993999let reduceMemoryUsage = ( opts.reduceMemoryUsage= ReduceMemoryFlag.Yes)
40004000let metadataOnly = ( opts.metadataOnly= MetadataOnlyFlag.Yes)
40014001
4002- if reduceMemoryUsage&& opts.pdbPath .IsNonethen
4002+ if reduceMemoryUsage&& opts.pdbDirPath .IsNonethen
40034003
40044004// This case is used in FCS applications, devenv.exe and fsi.exe
40054005//
@@ -4058,11 +4058,11 @@ let OpenILModuleReader fileName opts =
40584058let disposer = { new IDisposablewith member __.Dispose () = () }
40594059 disposer, pefile
40604060
4061- let ilModule , ilAssemblyRefs , pdb = openPE( fullPath, pefile, opts.pdbPath , reduceMemoryUsage, opts.ilGlobals)
4061+ let ilModule , ilAssemblyRefs , pdb = openPE( fullPath, pefile, opts.pdbDirPath , reduceMemoryUsage, opts.ilGlobals)
40624062let ilModuleReader = new ILModuleReader( ilModule, ilAssemblyRefs, ( fun () -> ClosePdbReader pdb))
40634063
40644064// Readers with PDB reader disposal logic don't go in the cache. Note the PDB reader is only used in static linking.
4065- if keyOk&& opts.pdbPath .IsNonethen
4065+ if keyOk&& opts.pdbDirPath .IsNonethen
40664066 ilModuleReaderCacheLock.AcquireLock( fun ltok -> ilModuleReaderCache.Put( ltok, key, ilModuleReader))
40674067
40684068 ilModuleReader