Skip to content

Commit 7f8761a

Browse files
committed
Merge pull request #403 from dsyme/apply-585
Apply #585 from Microsoft/visualfsharp to remove old code
2 parents 2748a2e + b629a52 commit 7f8761a

File tree

5 files changed

+39
-254
lines changed

5 files changed

+39
-254
lines changed

src/fsharp/CompileOps.fs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2033,9 +2033,6 @@ type TcConfigBuilder =
20332033
/// pause between passes?
20342034
mutable pause : bool
20352035

2036-
/// use reflection and indirect calls to call methods taking multidimensional generic arrays
2037-
mutable indirectCallArrayMethods : bool
2038-
20392036
/// whenever possible, emit callvirt instead of call
20402037
mutable alwaysCallVirt : bool
20412038

@@ -2191,7 +2188,6 @@ type TcConfigBuilder =
21912188
showExtensionTypeMessages = false
21922189
#endif
21932190
pause = false
2194-
indirectCallArrayMethods = false
21952191
alwaysCallVirt = true
21962192
noDebugData = false
21972193
isInteractive = isInteractive
@@ -2668,7 +2664,6 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
26682664
member x.showExtensionTypeMessages = data.showExtensionTypeMessages
26692665
#endif
26702666
member x.pause = data.pause
2671-
member x.indirectCallArrayMethods = data.indirectCallArrayMethods
26722667
member x.alwaysCallVirt = data.alwaysCallVirt
26732668
member x.noDebugData = data.noDebugData
26742669
member x.isInteractive = data.isInteractive
@@ -4530,7 +4525,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
45304525

45314526
// OK, now we have both mscorlib.dll and FSharp.Core.dll we can create TcGlobals
45324527
let tcGlobals = mkTcGlobals(tcConfig.compilingFslib,sysCcu.FSharpViewOfMetadata,ilGlobals,fslibCcu,
4533-
tcConfig.implicitIncludeDir,tcConfig.mlCompatibility,using40environment,tcConfig.indirectCallArrayMethods,
4528+
tcConfig.implicitIncludeDir,tcConfig.mlCompatibility,using40environment,
45344529
tcConfig.isInteractive,getTypeCcu, tcConfig.emitDebugInfoInQuotations)
45354530

45364531
#if DEBUG

src/fsharp/CompileOps.fsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ type TcConfigBuilder =
341341
mutable showExtensionTypeMessages : bool
342342
#endif
343343
mutable pause : bool
344-
mutable indirectCallArrayMethods : bool
345344
mutable alwaysCallVirt : bool
346345
mutable noDebugData : bool
347346

@@ -487,7 +486,6 @@ type TcConfig =
487486
member showExtensionTypeMessages : bool
488487
#endif
489488
member pause : bool
490-
member indirectCallArrayMethods : bool
491489
member alwaysCallVirt : bool
492490
member noDebugData : bool
493491

src/fsharp/CompileOptions.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,6 @@ let internalFlags (tcConfigB:TcConfigBuilder) =
783783
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]");
784784
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");
785785
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)");
786-
CompilerOption("indirectcallarraymethods", tagNone, OptionUnit (fun () -> tcConfigB.indirectCallArrayMethods<-true), Some(InternalCommandLineOption("--indirectCallArrayMethods", rangeCmdArgs)), None);
787786
CompilerOption("alwayscallvirt",tagNone,OptionSwitch(callVirtSwitch tcConfigB),Some(InternalCommandLineOption("alwayscallvirt",rangeCmdArgs)), None);
788787
CompilerOption("nodebugdata",tagNone, OptionUnit (fun () -> tcConfigB.noDebugData<-true),Some(InternalCommandLineOption("--nodebugdata",rangeCmdArgs)), None);
789788
testFlag tcConfigB ] @

0 commit comments

Comments
 (0)