Skip to content

Commit a50a510

Browse files
committed
remove old workaround for .NET 2.x F# Interactive
1 parent f094532 commit a50a510

File tree

5 files changed

+43
-254
lines changed

5 files changed

+43
-254
lines changed

src/fsharp/CompileOps.fs

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

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

@@ -2128,7 +2125,6 @@ type TcConfigBuilder =
21282125
showExtensionTypeMessages = false
21292126
#endif
21302127
pause = false
2131-
indirectCallArrayMethods = false
21322128
alwaysCallVirt = true
21332129
noDebugData = false
21342130
isInteractive = isInteractive
@@ -2589,7 +2585,6 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
25892585
member x.showExtensionTypeMessages = data.showExtensionTypeMessages
25902586
#endif
25912587
member x.pause = data.pause
2592-
member x.indirectCallArrayMethods = data.indirectCallArrayMethods
25932588
member x.alwaysCallVirt = data.alwaysCallVirt
25942589
member x.noDebugData = data.noDebugData
25952590
member x.isInteractive = data.isInteractive
@@ -4355,7 +4350,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
43554350

43564351
// OK, now we have both mscorlib.dll and FSharp.Core.dll we can create TcGlobals
43574352
let tcGlobals = mkTcGlobals(tcConfig.compilingFslib,sysCcu.FSharpViewOfMetadata,ilGlobals,fslibCcu,
4358-
tcConfig.implicitIncludeDir,tcConfig.mlCompatibility,using40environment,tcConfig.indirectCallArrayMethods,
4353+
tcConfig.implicitIncludeDir,tcConfig.mlCompatibility,using40environment,
43594354
tcConfig.isInteractive,getTypeCcu, tcConfig.emitDebugInfoInQuotations)
43604355

43614356
#if DEBUG

src/fsharp/CompileOps.fsi

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

@@ -450,7 +449,6 @@ type TcConfig =
450449
member showExtensionTypeMessages : bool
451450
#endif
452451
member pause : bool
453-
member indirectCallArrayMethods : bool
454452
member alwaysCallVirt : bool
455453
member noDebugData : bool
456454

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)