Skip to content

Commit 82caca0

Browse files
dsymeKevinRansom
authored andcommitted
Remove old workaround for .NET 2.x F# Interactive
1 parent 136fc2f commit 82caca0

File tree

5 files changed

+39
-250
lines changed

5 files changed

+39
-250
lines changed

src/fsharp/CompileOps.fs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,9 +1971,6 @@ type TcConfigBuilder =
19711971
/// pause between passes?
19721972
mutable pause : bool
19731973

1974-
/// use reflection and indirect calls to call methods taking multidimensional generic arrays
1975-
mutable indirectCallArrayMethods : bool
1976-
19771974
/// whenever possible, emit callvirt instead of call
19781975
mutable alwaysCallVirt : bool
19791976

@@ -2122,7 +2119,6 @@ type TcConfigBuilder =
21222119
showExtensionTypeMessages = false
21232120
#endif
21242121
pause = false
2125-
indirectCallArrayMethods = false
21262122
alwaysCallVirt = true
21272123
noDebugData = false
21282124
isInteractive = isInteractive
@@ -2582,7 +2578,6 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
25822578
member x.showExtensionTypeMessages = data.showExtensionTypeMessages
25832579
#endif
25842580
member x.pause = data.pause
2585-
member x.indirectCallArrayMethods = data.indirectCallArrayMethods
25862581
member x.alwaysCallVirt = data.alwaysCallVirt
25872582
member x.noDebugData = data.noDebugData
25882583
member x.isInteractive = data.isInteractive
@@ -4339,7 +4334,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
43394334

43404335
// OK, now we have both mscorlib.dll and FSharp.Core.dll we can create TcGlobals
43414336
let tcGlobals = mkTcGlobals(tcConfig.compilingFslib,sysCcu.FSharpViewOfMetadata,ilGlobals,fslibCcu,
4342-
tcConfig.implicitIncludeDir,tcConfig.mlCompatibility,using40environment,tcConfig.indirectCallArrayMethods,
4337+
tcConfig.implicitIncludeDir,tcConfig.mlCompatibility,using40environment,
43434338
tcConfig.isInteractive,getTypeCcu, tcConfig.emitDebugInfoInQuotations)
43444339

43454340
#if DEBUG

src/fsharp/CompileOps.fsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ type TcConfigBuilder =
304304
mutable showExtensionTypeMessages : bool
305305
#endif
306306
mutable pause : bool
307-
mutable indirectCallArrayMethods : bool
308307
mutable alwaysCallVirt : bool
309308
mutable noDebugData : bool
310309

@@ -448,7 +447,6 @@ type TcConfig =
448447
member showExtensionTypeMessages : bool
449448
#endif
450449
member pause : bool
451-
member indirectCallArrayMethods : bool
452450
member alwaysCallVirt : bool
453451
member noDebugData : bool
454452

src/fsharp/CompileOptions.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,6 @@ let internalFlags (tcConfigB:TcConfigBuilder) =
777777
CompilerOption("resolutionassemblyfoldersuffix", tagString, OptionString (fun s -> tcConfigB.resolutionAssemblyFoldersSuffix<-s), Some(InternalCommandLineOption("resolutionassemblyfoldersuffix", rangeCmdArgs)), None); // "The base registry key to use for assembly resolution. This part in brackets here: HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v2.0.50727\[AssemblyFoldersEx]");
778778
CompilerOption("resolutionassemblyfoldersconditions", tagString, OptionString (fun s -> tcConfigB.resolutionAssemblyFoldersConditions <- ","^s), Some(InternalCommandLineOption("resolutionassemblyfoldersconditions", rangeCmdArgs)), None); // "Additional reference resolution conditions. For example \"OSVersion=5.1.2600.0,PlatformID=id");
779779
CompilerOption("msbuildresolution", tagNone, OptionUnit (fun () -> tcConfigB.useMonoResolution<-false), Some(InternalCommandLineOption("msbuildresolution", rangeCmdArgs)), None); // "Resolve assembly references using MSBuild resolution rules rather than directory based (Default=true except when running fsc.exe under mono)");
780-
CompilerOption("indirectcallarraymethods", tagNone, OptionUnit (fun () -> tcConfigB.indirectCallArrayMethods<-true), Some(InternalCommandLineOption("--indirectCallArrayMethods", rangeCmdArgs)), None);
781780
CompilerOption("alwayscallvirt",tagNone,OptionSwitch(callVirtSwitch tcConfigB),Some(InternalCommandLineOption("alwayscallvirt",rangeCmdArgs)), None);
782781
CompilerOption("nodebugdata",tagNone, OptionUnit (fun () -> tcConfigB.noDebugData<-true),Some(InternalCommandLineOption("--nodebugdata",rangeCmdArgs)), None);
783782
testFlag tcConfigB ] @

0 commit comments

Comments
 (0)