Skip to content
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

Fix IL creation parts became internal #11354

Merged
merged 2 commits into from
Apr 3, 2021
Merged

Fix IL creation parts became internal #11354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e09e74
Fix IL creation parts became internal
auduchinok Apr 2, 2021
97ae555
Update surface
auduchinok Apr 2, 2021
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
63 changes: 30 additions & 33 deletions src/fsharp/absil/il.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ type ILScopeRef =
// ILThisConvention.InstanceExplicit is only used by Managed C++, and indicates
// that the 'this' pointer is actually explicit in the signature.
[<StructuralEquality; StructuralComparison; RequireQualifiedAccess>]
type internal ILArgConvention =
type ILArgConvention =
| Default
| CDecl
| StdCall
Expand All @@ -141,7 +141,7 @@ type internal ILArgConvention =
| VarArg

[<StructuralEquality; StructuralComparison; RequireQualifiedAccess>]
type internal ILThisConvention =
type ILThisConvention =
/// accepts an implicit 'this' pointer
| Instance

Expand All @@ -153,7 +153,6 @@ type internal ILThisConvention =

[<StructuralEquality; StructuralComparison>]
type ILCallingConv =
internal
| Callconv of ILThisConvention * ILArgConvention

member internal IsInstance: bool
Expand Down Expand Up @@ -628,7 +627,7 @@ type internal ILCode =

/// Field Init
[<RequireQualifiedAccess; StructuralEquality; StructuralComparison>]
type internal ILFieldInit =
type ILFieldInit =
| String of string
| Bool of bool
| Char of uint16
Expand Down Expand Up @@ -698,7 +697,6 @@ type internal ILNativeVariant =
/// Most of these are listed in the CLI ECMA-335 Spec (Partition II, 7.4).
[<RequireQualifiedAccess; StructuralEquality; StructuralComparison>]
type ILNativeType =
internal
| Empty
| Custom of ILGuid * nativeTypeName: string * custMarshallerName: string * cookieString: byte[]
| FixedSysString of int32
Expand Down Expand Up @@ -934,7 +932,7 @@ type internal ILOverridesSpec =
member DeclaringType: ILType

[<RequireQualifiedAccess>]
type internal MethodBody =
type MethodBody =
| IL of Lazy<ILMethodBody>
| PInvoke of Lazy<PInvokeMethod>
| Abstract
Expand Down Expand Up @@ -1217,7 +1215,6 @@ type ILMethodImplDefs =
/// Type Layout information.
[<RequireQualifiedAccess>]
type ILTypeDefLayout =
internal
| Auto
| Sequential of ILTypeDefLayoutInfo
| Explicit of ILTypeDefLayoutInfo
Expand Down Expand Up @@ -1804,7 +1801,7 @@ val internal andTailness: ILTailcall -> bool -> ILTailcall
val internal mkILParam: string option * ILType -> ILParameter
val internal mkILParamAnon: ILType -> ILParameter
val internal mkILParamNamed: string * ILType -> ILParameter
val internal mkILReturn: ILType -> ILReturn
val mkILReturn: ILType -> ILReturn
val internal mkILLocal: ILType -> (string * int * int) option -> ILLocal

/// Make a formal generic parameters.
Expand Down Expand Up @@ -1873,41 +1870,41 @@ val internal mkCtorMethSpecForDelegate: ILGlobals -> ILType * bool -> ILMethodSp
val internal mkILTypeForGlobalFunctions: ILScopeRef -> ILType

/// Making tables of custom attributes, etc.
val internal mkILCustomAttrs: ILAttribute list -> ILAttributes
val mkILCustomAttrs: ILAttribute list -> ILAttributes
val mkILCustomAttrsFromArray: ILAttribute[] -> ILAttributes
val internal storeILCustomAttrs: ILAttributes -> ILAttributesStored
val storeILCustomAttrs: ILAttributes -> ILAttributesStored
val internal mkILCustomAttrsReader: (int32 -> ILAttribute[]) -> ILAttributesStored
val emptyILCustomAttrs: ILAttributes

val internal mkILSecurityDecls: ILSecurityDecl list -> ILSecurityDecls
val mkILSecurityDecls: ILSecurityDecl list -> ILSecurityDecls
val emptyILSecurityDecls: ILSecurityDecls
val internal storeILSecurityDecls: ILSecurityDecls -> ILSecurityDeclsStored
val storeILSecurityDecls: ILSecurityDecls -> ILSecurityDeclsStored
val internal mkILSecurityDeclsReader: (int32 -> ILSecurityDecl[]) -> ILSecurityDeclsStored

val internal mkILEvents: ILEventDef list -> ILEventDefs
val internal mkILEventsLazy: Lazy<ILEventDef list> -> ILEventDefs
val internal emptyILEvents: ILEventDefs
val mkILEvents: ILEventDef list -> ILEventDefs
val mkILEventsLazy: Lazy<ILEventDef list> -> ILEventDefs
val emptyILEvents: ILEventDefs

val internal mkILProperties: ILPropertyDef list -> ILPropertyDefs
val internal mkILPropertiesLazy: Lazy<ILPropertyDef list> -> ILPropertyDefs
val internal emptyILProperties: ILPropertyDefs
val mkILProperties: ILPropertyDef list -> ILPropertyDefs
val mkILPropertiesLazy: Lazy<ILPropertyDef list> -> ILPropertyDefs
val emptyILProperties: ILPropertyDefs

val internal mkILMethods: ILMethodDef list -> ILMethodDefs
val internal mkILMethodsFromArray: ILMethodDef[] -> ILMethodDefs
val internal mkILMethodsComputed: (unit -> ILMethodDef[]) -> ILMethodDefs
val internal emptyILMethods: ILMethodDefs
val mkILMethods: ILMethodDef list -> ILMethodDefs
val mkILMethodsFromArray: ILMethodDef[] -> ILMethodDefs
val mkILMethodsComputed: (unit -> ILMethodDef[]) -> ILMethodDefs
val emptyILMethods: ILMethodDefs

val internal mkILFields: ILFieldDef list -> ILFieldDefs
val internal mkILFieldsLazy: Lazy<ILFieldDef list> -> ILFieldDefs
val internal emptyILFields: ILFieldDefs
val mkILFields: ILFieldDef list -> ILFieldDefs
val mkILFieldsLazy: Lazy<ILFieldDef list> -> ILFieldDefs
val emptyILFields: ILFieldDefs

val internal mkILMethodImpls: ILMethodImplDef list -> ILMethodImplDefs
val internal mkILMethodImplsLazy: Lazy<ILMethodImplDef list> -> ILMethodImplDefs
val internal emptyILMethodImpls: ILMethodImplDefs
val mkILMethodImpls: ILMethodImplDef list -> ILMethodImplDefs
val mkILMethodImplsLazy: Lazy<ILMethodImplDef list> -> ILMethodImplDefs
val emptyILMethodImpls: ILMethodImplDefs

val internal mkILTypeDefs: ILTypeDef list -> ILTypeDefs
val internal mkILTypeDefsFromArray: ILTypeDef[] -> ILTypeDefs
val internal emptyILTypeDefs: ILTypeDefs
val mkILTypeDefs: ILTypeDef list -> ILTypeDefs
val mkILTypeDefsFromArray: ILTypeDef[] -> ILTypeDefs
val emptyILTypeDefs: ILTypeDefs

/// Create table of types which is loaded/computed on-demand, and whose individual
/// elements are also loaded/computed on-demand. Any call to tdefs.AsList will
Expand All @@ -1931,7 +1928,7 @@ val emptyILResources: ILResources
val internal mkILResources: ILResource list -> ILResources

/// Making modules.
val internal mkILSimpleModule: assemblyName:string -> moduleName:string -> dll:bool -> subsystemVersion: (int * int) -> useHighEntropyVA: bool -> ILTypeDefs -> int32 option -> string option -> int -> ILExportedTypesAndForwarders -> string -> ILModuleDef
val mkILSimpleModule: assemblyName:string -> moduleName:string -> dll:bool -> subsystemVersion: (int * int) -> useHighEntropyVA: bool -> ILTypeDefs -> int32 option -> string option -> int -> ILExportedTypesAndForwarders -> string -> ILModuleDef

/// Generate references to existing type definitions, method definitions
/// etc. Useful for generating references, e.g. to a class we're processing
Expand All @@ -1950,7 +1947,7 @@ val internal mkRefToILField: ILTypeRef * ILFieldDef -> ILFieldRef
val internal mkRefToILAssembly: ILAssemblyManifest -> ILAssemblyRef
val internal mkRefToILModule: ILModuleDef -> ILModuleRef

val internal NoMetadataIdx: int32
val NoMetadataIdx: int32

// --------------------------------------------------------------------
// Rescoping.
Expand Down
10 changes: 5 additions & 5 deletions src/fsharp/absil/ilread.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ module FSharp.Compiler.AbstractIL.ILBinaryReader
open FSharp.Compiler.AbstractIL.IL

/// Used to implement a Binary file over native memory, used by Roslyn integration
type internal ILReaderMetadataSnapshot = (obj * nativeint * int)
type internal ILReaderTryGetMetadataSnapshot = (* path: *) string * (* snapshotTimeStamp: *) System.DateTime -> ILReaderMetadataSnapshot option
type ILReaderMetadataSnapshot = (obj * nativeint * int)
type ILReaderTryGetMetadataSnapshot = (* path: *) string * (* snapshotTimeStamp: *) System.DateTime -> ILReaderMetadataSnapshot option

[<RequireQualifiedAccess>]
type internal MetadataOnlyFlag = Yes | No
type MetadataOnlyFlag = Yes | No

[<RequireQualifiedAccess>]
type internal ReduceMemoryFlag = Yes | No
type ReduceMemoryFlag = Yes | No

type internal ILReaderOptions =
type ILReaderOptions =
{ pdbDirPath: string option

// fsc.exe does not use reduceMemoryUsage (hence keeps MORE caches in AbstractIL and MORE memory mapping and MORE memory hogging but FASTER and SIMPLER file access)
Expand Down
Loading