NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit173513e

authored

Merge pull requestdotnet#5098 from brettfo/type-provider-15.7

Cherry-pick type provider fixes to 15.7

2 parents1c56fef +b481145 commit173513eCopy full SHA for 173513e

File tree

3 files changed

+31

-25

lines changed

src/absil

3 files changed

+31

-25

lines changed

`‎src/absil/illib.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1237,7 +1237,7 @@ module Shim =`
`1237`	`1237`	`interface IFileSystemwith`
`1238`	`1238`
`1239`	`1239`	`member__.AssemblyLoadFrom(fileName:string)=`
`1240`		`- Assembly.LoadFrom fileName`
	`1240`	`+ Assembly.UnsafeLoadFrom fileName`
`1241`	`1241`
`1242`	`1242`	`member__.AssemblyLoad(assemblyName:AssemblyName)=`
`1243`	`1243`	`Assembly.Load assemblyName`

`‎src/absil/ilread.fs‎`

Lines changed: 12 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -3228,14 +3228,18 @@ and seekReadManifestResources (ctxt: ILMetadataReader) (mdv: BinaryView) (pectxt`
`3228`	`3228`	`letscoref= seekReadImplAsScopeRef ctxt mdv implIdx`
`3229`	`3229`
`3230`	`3230`	`letlocation=`
`3231`		`-match scorefwith`
`3232`		`-\| ILScopeRef.Local->`
`3233`		`-letstart= pectxtEager.anyV2P("resource", offset+ pectxtEager.resourcesAddr)`
`3234`		`-letresourceLength= seekReadInt32 pevEager start`
`3235`		`-letoffsetOfBytesFromStartOfPhysicalPEFile= start+4`
`3236`		`- ILResourceLocation.LocalIn(ctxt.fileName, offsetOfBytesFromStartOfPhysicalPEFile, resourceLength)`
`3237`		`-\| ILScopeRef.Module mref-> ILResourceLocation.File(mref, offset)`
`3238`		`-\| ILScopeRef.Assembly aref-> ILResourceLocation.Assembly aref`
	`3231`	`+match scorefwith`
	`3232`	`+\| ILScopeRef.Local->`
	`3233`	`+letstart= pectxtEager.anyV2P("resource", offset+ pectxtEager.resourcesAddr)`
	`3234`	`+letresourceLength= seekReadInt32 pevEager start`
	`3235`	`+letoffsetOfBytesFromStartOfPhysicalPEFile= start+4`
	`3236`	`+if pectxtEager.noFileOnDiskthen`
	`3237`	`+ ILResourceLocation.LocalOut(seekReadBytes pevEager offsetOfBytesFromStartOfPhysicalPEFile resourceLength)`
	`3238`	`+else`
	`3239`	`+ ILResourceLocation.LocalIn(ctxt.fileName, offsetOfBytesFromStartOfPhysicalPEFile, resourceLength)`
	`3240`	`+`
	`3241`	`+\| ILScopeRef.Module mref-> ILResourceLocation.File(mref, offset)`
	`3242`	`+\| ILScopeRef.Assembly aref-> ILResourceLocation.Assembly aref`
`3239`	`3243`
`3240`	`3244`	`letr=`
`3241`	`3245`	`{ Name= readStringHeap ctxt nameIdx`

`‎src/absil/ilwrite.fs‎`

Lines changed: 18 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -2679,22 +2679,24 @@ and GenEventPass3 cenv env (md: ILEventDef) =`
`2679`	`2679`
`2680`	`2680`	`let recGetResourceAsManifestResourceRow cenv r=`
`2681`	`2681`	`letdata,impl=`
`2682`		`-match r.Locationwith`
`2683`		`-\| ILResourceLocation.LocalIn_`
`2684`		`-\| ILResourceLocation.LocalOut_->`
`2685`		`-letbytes= r.GetBytes()`
`2686`		`-// Embedded managed resources must be word-aligned. However resource format is`
`2687`		`-// not specified in ECMA. Some mscorlib resources appear to be non-aligned - it seems it doesn't matter..`
`2688`		`-letoffset= cenv.resources.Position`
`2689`		`-letalignedOffset=(align0x8 offset)`
`2690`		`-letpad= alignedOffset- offset`
`2691`		`-letresourceSize= bytes.Length`
`2692`		`- cenv.resources.EmitPadding pad`
`2693`		`- cenv.resources.EmitInt32 resourceSize`
`2694`		`- cenv.resources.EmitBytes bytes`
`2695`		`- Data(alignedOffset,true),(i_File,0)`
`2696`		`-\| ILResourceLocation.File(mref, offset)-> ULong offset,(i_File, GetModuleRefAsFileIdx cenv mref)`
`2697`		`-\| ILResourceLocation.Assembly aref-> ULong0x0,(i_AssemblyRef, GetAssemblyRefAsIdx cenv aref)`
	`2682`	`+letembedManagedResources(bytes:byte[])=`
	`2683`	`+// Embedded managed resources must be word-aligned. However resource format is`
	`2684`	`+// not specified in ECMA. Some mscorlib resources appear to be non-aligned - it seems it doesn't matter..`
	`2685`	`+letoffset= cenv.resources.Position`
	`2686`	`+letalignedOffset=(align0x8 offset)`
	`2687`	`+letpad= alignedOffset- offset`
	`2688`	`+letresourceSize= bytes.Length`
	`2689`	`+ cenv.resources.EmitPadding pad`
	`2690`	`+ cenv.resources.EmitInt32 resourceSize`
	`2691`	`+ cenv.resources.EmitBytes bytes`
	`2692`	`+ Data(alignedOffset,true),(i_File,0)`
	`2693`	`+`
	`2694`	`+match r.Locationwith`
	`2695`	`+\| ILResourceLocation.LocalIn_-> embedManagedResources(r.GetBytes())`
	`2696`	`+\| ILResourceLocation.LocalOut bytes-> embedManagedResources bytes`
	`2697`	`+\| ILResourceLocation.File(mref, offset)-> ULong offset,(i_File, GetModuleRefAsFileIdx cenv mref)`
	`2698`	`+\| ILResourceLocation.Assembly aref-> ULong0x0,(i_AssemblyRef, GetAssemblyRefAsIdx cenv aref)`
	`2699`	`+`
`2698`	`2700`	`UnsharedRow`
`2699`	`2701`	`[\| data`
`2700`	`2702`	`ULong(match r.Accesswith ILResourceAccess.Public->0x01\| ILResourceAccess.Private->0x02)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit173513e

File tree

3 files changed

3 files changed

`‎src/absil/illib.fs‎`

`‎src/absil/ilread.fs‎`

`‎src/absil/ilwrite.fs‎`

0 commit comments