Skip to content

Commit e13c345

Browse files
committed
ftms
1 parent c1cb0ca commit e13c345

File tree

4 files changed

+39
-40
lines changed

4 files changed

+39
-40
lines changed

src/Compiler/Driver/CompilerImports.fsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ val EncodeTypecheckingData:
8585
tcGlobals: TcGlobals *
8686
generatedCcu: CcuThunk *
8787
outfile: string *
88-
isIncrementalBuild: bool *
88+
isIncrementalBuild: bool *
8989
tcInfo: PickledTcInfo ->
9090
ILResource list
9191

src/Compiler/Driver/fsc.fs

+32-32
Original file line numberDiff line numberDiff line change
@@ -171,57 +171,57 @@ let TypeCheck
171171
let byteReaderA () = ByteMemory.Empty.AsReadOnly()
172172
let byteReaderB = None
173173

174-
let tcInfo =
174+
let tcInfo =
175175
GetTypecheckingData(
176176
assembly.FileName,
177177
assembly.ILScopeRef,
178178
assembly.RawMetadata.TryGetILModuleDef(),
179179
byteReaderA,
180-
byteReaderB)
180+
byteReaderB
181+
)
181182

182183
let rawData = tcInfo.RawData
183-
let topAttrs = {
184-
mainMethodAttrs = rawData.MainMethodAttrs
185-
netModuleAttrs = rawData.NetModuleAttrs
186-
assemblyAttrs = rawData.AssemblyAttrs
187-
}
184+
185+
let topAttrs =
186+
{
187+
mainMethodAttrs = rawData.MainMethodAttrs
188+
netModuleAttrs = rawData.NetModuleAttrs
189+
assemblyAttrs = rawData.AssemblyAttrs
190+
}
188191

189192
// need to understand if anything can be used here, pickling state is hard
190193
tcInitialState,
191-
topAttrs,
194+
topAttrs,
192195
rawData.DeclaredImpls,
193196
// this is quite definitely wrong, need to figure out what to do with the environment
194197
tcInitialState.TcEnvFromImpls
195198

196199
else
197-
let tcState, topAttrs, declaredImpls, tcEnvAtEndOfLastFile = CheckClosedInputSet(
198-
ctok,
199-
diagnosticsLogger.CheckForErrors,
200-
tcConfig,
201-
tcImports,
202-
tcGlobals,
203-
None,
204-
tcInitialState,
205-
eagerFormat,
206-
inputs
207-
)
200+
let tcState, topAttrs, declaredImpls, tcEnvAtEndOfLastFile =
201+
CheckClosedInputSet(
202+
ctok,
203+
diagnosticsLogger.CheckForErrors,
204+
tcConfig,
205+
tcImports,
206+
tcGlobals,
207+
None,
208+
tcInitialState,
209+
eagerFormat,
210+
inputs
211+
)
208212

209213
if false then
210-
let tcInfo = {
211-
MainMethodAttrs = topAttrs.mainMethodAttrs
212-
NetModuleAttrs = topAttrs.netModuleAttrs
213-
AssemblyAttrs = topAttrs.assemblyAttrs
214-
DeclaredImpls = declaredImpls
215-
}
214+
let tcInfo =
215+
{
216+
MainMethodAttrs = topAttrs.mainMethodAttrs
217+
NetModuleAttrs = topAttrs.netModuleAttrs
218+
AssemblyAttrs = topAttrs.assemblyAttrs
219+
DeclaredImpls = declaredImpls
220+
}
216221

217222
// will need to pass results further somewhere
218-
let _typecheckingDataResources = EncodeTypecheckingData(
219-
tcConfig,
220-
tcGlobals,
221-
tcState.Ccu,
222-
outfile,
223-
false,
224-
tcInfo)
223+
let _typecheckingDataResources =
224+
EncodeTypecheckingData(tcConfig, tcGlobals, tcState.Ccu, outfile, false, tcInfo)
225225

226226
()
227227

src/Compiler/Driver/fsc.fsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ val internal TypeCheck:
2626
assemblyName: string *
2727
tcEnv0: CheckBasics.TcEnv *
2828
openDecls0: TypedTree.OpenDeclaration list *
29-
inputs: ParsedInput list *
29+
inputs: ParsedInput list *
3030
exiter: Exiter *
3131
outfile: string ->
3232
TcState * TopAttribs * CheckedImplFile list * CheckBasics.TcEnv

src/Compiler/TypedTree/TypedTree.fsi

+5-6
Original file line numberDiff line numberDiff line change
@@ -4297,12 +4297,11 @@ type PickledCcuInfo =
42974297
[<DebuggerBrowsable(DebuggerBrowsableState.Never)>]
42984298
member DebugText: string
42994299

4300-
type PickledTcInfo = {
4301-
MainMethodAttrs: Attribs
4302-
NetModuleAttrs: Attribs
4303-
AssemblyAttrs: Attribs
4304-
DeclaredImpls: CheckedImplFile list
4305-
}
4300+
type PickledTcInfo =
4301+
{ MainMethodAttrs: Attribs
4302+
NetModuleAttrs: Attribs
4303+
AssemblyAttrs: Attribs
4304+
DeclaredImpls: CheckedImplFile list }
43064305

43074306
/// Represents a set of free local values. Computed type cached by later phases
43084307
/// (never cached type checking). Cached in expressions. Not pickled.

0 commit comments

Comments
 (0)