Skip to content

Commit

Permalink
Merge pull request #13203 from dotnet/merges/main-to-release/dev17.3
Browse files Browse the repository at this point in the history
Merge main to release/dev17.3
  • Loading branch information
dotnet-bot authored May 28, 2022
2 parents c0dc02d + d0baa9a commit ad3e6de
Show file tree
Hide file tree
Showing 36 changed files with 447 additions and 233 deletions.
2 changes: 2 additions & 0 deletions src/Compiler/AbstractIL/il.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1114,6 +1114,8 @@ type ILPlatform =
| X86
| AMD64
| IA64
| ARM
| ARM64

type ILSourceDocument =
{
Expand Down
2 changes: 2 additions & 0 deletions src/Compiler/AbstractIL/il.fsi
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ type ILPlatform =
| X86
| AMD64
| IA64
| ARM
| ARM64

/// Debug info. Values of type "source" can be attached at sequence
/// points and some other locations.
Expand Down
2 changes: 2 additions & 0 deletions src/Compiler/AbstractIL/ilread.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4741,7 +4741,9 @@ let openPEFileReader (fileName, pefile: BinaryFile, pdbDirPath, noFileOnDisk) =
let platform =
match machine with
| 0x8664 -> Some AMD64
| 0xaa64 -> Some ARM64
| 0x200 -> Some IA64
| 0x1c0 -> Some ARM
| _ -> Some X86

let sectionHeadersStartPhysLoc = peOptionalHeaderPhysLoc + headerSizeOpt
Expand Down
267 changes: 128 additions & 139 deletions src/Compiler/AbstractIL/ilwrite.fs

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/Compiler/AbstractIL/ilwritepdb.fs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ type BlobBuildingStream() =

override _.Read(_buffer: byte array, _offset: int, _count: int) = raise (NotSupportedException())


override _.SetLength(_value: int64) = raise (NotSupportedException())
override val Position = 0L with get, set

Expand Down
2 changes: 2 additions & 0 deletions src/Compiler/Driver/CompilerImports.fs
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,8 @@ type TcConfig with
| None -> "MSIL"
| Some X86 -> "x86"
| Some AMD64 -> "amd64"
| Some ARM -> "arm"
| Some ARM64 -> "arm64"
| Some IA64 -> "ia64"

try
Expand Down
2 changes: 2 additions & 0 deletions src/Compiler/Driver/CompilerOptions.fs
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,8 @@ let outputFileFlagsFsc (tcConfigB: TcConfigBuilder) =
match s with
| "x86" -> Some X86
| "x64" -> Some AMD64
| "arm" -> Some ARM
| "arm64" -> Some ARM64
| "Itanium" -> Some IA64
| "anycpu32bitpreferred" ->
tcConfigB.prefer32Bit <- true
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/Driver/CreateILModule.fs
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,8 @@ module MainModuleBuilder =
ImageBase = (match tcConfig.baseAddress with None -> 0x00400000l | Some b -> b)
IsDLL=(tcConfig.target = CompilerTarget.Dll || tcConfig.target=CompilerTarget.Module)
Platform = tcConfig.platform
Is32Bit=(match tcConfig.platform with Some X86 -> true | _ -> false)
Is64Bit=(match tcConfig.platform with Some AMD64 | Some IA64 -> true | _ -> false)
Is32Bit=(match tcConfig.platform with Some X86 | Some ARM -> true | _ -> false)
Is64Bit=(match tcConfig.platform with Some AMD64 | Some IA64 | Some ARM64 -> true | _ -> false)
Is32BitPreferred = if tcConfig.prefer32Bit && not tcConfig.target.IsExe then (error(Error(FSComp.SR.invalidPlatformTarget(), rangeCmdArgs))) else tcConfig.prefer32Bit
CustomAttrsStored=
storeILCustomAttrs
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/FSComp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ optsPublicSign,"Public-sign the assembly using only the public portion of the st
optsWriteXml,"Write the xmldoc of the assembly to the given file"
optsStrongKeyFile,"Specify a strong name key file"
optsStrongKeyContainer,"Specify a strong name key container"
optsPlatform,"Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu."
optsPlatform,"Limit which platforms this code can run on: x86, x64, Arm, Arm64, Itanium, anycpu32bitpreferred, or anycpu. The default is anycpu."
optsNoOpt,"Only include optimization information essential for implementing inlined constructs. Inhibits cross-module inlining but improves binary compatibility."
optsNoInterface,"Don't add a resource to the generated assembly containing F#-specific metadata"
optsSig,"Print the inferred interface of the assembly to a file"
Expand Down Expand Up @@ -917,7 +917,7 @@ optsHelpBannerMisc,"- MISCELLANEOUS -"
optsHelpBannerLanguage,"- LANGUAGE -"
optsHelpBannerErrsAndWarns,"- ERRORS AND WARNINGS -"
1063,optsUnknownArgumentToTheTestSwitch,"Unknown --test argument: '%s'"
1064,optsUnknownPlatform,"Unrecognized platform '%s', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'"
1064,optsUnknownPlatform,"Unrecognized platform '%s', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'. The default is anycpu."
1065,optsUnknownChecksumAlgorithm,"Algorithm '%s' is not supported"
optsInternalNoDescription,"The command-line option '%s' is for test purposes only"
optsDCLONoDescription,"The command-line option '%s' has been deprecated"
Expand Down
1 change: 0 additions & 1 deletion src/Compiler/Service/ServiceLexing.fsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ open System
open System.Threading
open FSharp.Compiler
open FSharp.Compiler.Text

#nowarn "57"

/// Represents encoded information for the end-of-line continuation of lexing
Expand Down
8 changes: 4 additions & 4 deletions src/Compiler/xlf/FSComp.txt.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5008,8 +5008,8 @@
<note />
</trans-unit>
<trans-unit id="optsPlatform">
<source>Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="translated">Omezuje platformy, na kterých je možné tento kód spustit: x86, Itanium, x64, anycpu32bitpreferred a anycpu. Výchozí je anycpu.</target>
<source>Limit which platforms this code can run on: x86, x64, Arm, Arm64, Itanium, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="needs-review-translation">Omezuje platformy, na kterých je možné tento kód spustit: x86, Itanium, x64, anycpu32bitpreferred a anycpu. Výchozí je anycpu.</target>
<note />
</trans-unit>
<trans-unit id="optsNoOpt">
Expand Down Expand Up @@ -5303,8 +5303,8 @@
<note />
</trans-unit>
<trans-unit id="optsUnknownPlatform">
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</source>
<target state="translated">Nerozpoznaná platforma {0}. Platné hodnoty jsou x86, x64, Itanium, anycpu32bitpreferred a anycpu.</target>
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'. The default is anycpu.</source>
<target state="needs-review-translation">Nerozpoznaná platforma {0}. Platné hodnoty jsou x86, x64, Itanium, anycpu32bitpreferred a anycpu.</target>
<note />
</trans-unit>
<trans-unit id="optsInternalNoDescription">
Expand Down
8 changes: 4 additions & 4 deletions src/Compiler/xlf/FSComp.txt.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5008,8 +5008,8 @@
<note />
</trans-unit>
<trans-unit id="optsPlatform">
<source>Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="translated">Schränken Sie ein, auf welchen Plattformen dieser Code ausgeführt werden kann: "x86", "Itanium", "x64", "anycpu32bitpreferred" oder "anycpu". Der Standard ist "anycpu".</target>
<source>Limit which platforms this code can run on: x86, x64, Arm, Arm64, Itanium, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="needs-review-translation">Schränken Sie ein, auf welchen Plattformen dieser Code ausgeführt werden kann: "x86", "Itanium", "x64", "anycpu32bitpreferred" oder "anycpu". Der Standard ist "anycpu".</target>
<note />
</trans-unit>
<trans-unit id="optsNoOpt">
Expand Down Expand Up @@ -5303,8 +5303,8 @@
<note />
</trans-unit>
<trans-unit id="optsUnknownPlatform">
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</source>
<target state="translated">Unbekannte Plattform "{0}", gültige Werte sind "x86", "x64", "Itanium", "anycpu32bitpreferred" und "anycpu".</target>
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'. The default is anycpu.</source>
<target state="needs-review-translation">Unbekannte Plattform "{0}", gültige Werte sind "x86", "x64", "Itanium", "anycpu32bitpreferred" und "anycpu".</target>
<note />
</trans-unit>
<trans-unit id="optsInternalNoDescription">
Expand Down
8 changes: 4 additions & 4 deletions src/Compiler/xlf/FSComp.txt.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5008,8 +5008,8 @@
<note />
</trans-unit>
<trans-unit id="optsPlatform">
<source>Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="translated">Limitar las plataformas en las que se puede ejecutar este código: x86, Itanium, x64, anycpu32bitpreferred o anycpu. El valor predeterminado es anycpu.</target>
<source>Limit which platforms this code can run on: x86, x64, Arm, Arm64, Itanium, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="needs-review-translation">Limitar las plataformas en las que se puede ejecutar este código: x86, Itanium, x64, anycpu32bitpreferred o anycpu. El valor predeterminado es anycpu.</target>
<note />
</trans-unit>
<trans-unit id="optsNoOpt">
Expand Down Expand Up @@ -5303,8 +5303,8 @@
<note />
</trans-unit>
<trans-unit id="optsUnknownPlatform">
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</source>
<target state="translated">Plataforma '{0}' no reconocida. Los valores válidos son 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred' y 'anycpu'</target>
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'. The default is anycpu.</source>
<target state="needs-review-translation">Plataforma '{0}' no reconocida. Los valores válidos son 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred' y 'anycpu'</target>
<note />
</trans-unit>
<trans-unit id="optsInternalNoDescription">
Expand Down
8 changes: 4 additions & 4 deletions src/Compiler/xlf/FSComp.txt.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5008,8 +5008,8 @@
<note />
</trans-unit>
<trans-unit id="optsPlatform">
<source>Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="translated">Limiter les plateformes sur lesquelles ce code peut s'exécuter : x86, Itanium, x64, anycpu32bitpreferred ou anycpu. La valeur par défaut est anycpu.</target>
<source>Limit which platforms this code can run on: x86, x64, Arm, Arm64, Itanium, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="needs-review-translation">Limiter les plateformes sur lesquelles ce code peut s'exécuter : x86, Itanium, x64, anycpu32bitpreferred ou anycpu. La valeur par défaut est anycpu.</target>
<note />
</trans-unit>
<trans-unit id="optsNoOpt">
Expand Down Expand Up @@ -5303,8 +5303,8 @@
<note />
</trans-unit>
<trans-unit id="optsUnknownPlatform">
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</source>
<target state="translated">Plateforme '{0}' non reconnue, les valeurs valides sont 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred' et 'anycpu'</target>
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'. The default is anycpu.</source>
<target state="needs-review-translation">Plateforme '{0}' non reconnue, les valeurs valides sont 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred' et 'anycpu'</target>
<note />
</trans-unit>
<trans-unit id="optsInternalNoDescription">
Expand Down
8 changes: 4 additions & 4 deletions src/Compiler/xlf/FSComp.txt.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5008,8 +5008,8 @@
<note />
</trans-unit>
<trans-unit id="optsPlatform">
<source>Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="translated">Limita le piattaforme in cui è possibile eseguire il codice: x86, Itanium, x64, anycpu32bitpreferred o anycpu. Il valore predefinito è anycpu.</target>
<source>Limit which platforms this code can run on: x86, x64, Arm, Arm64, Itanium, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="needs-review-translation">Limita le piattaforme in cui è possibile eseguire il codice: x86, Itanium, x64, anycpu32bitpreferred o anycpu. Il valore predefinito è anycpu.</target>
<note />
</trans-unit>
<trans-unit id="optsNoOpt">
Expand Down Expand Up @@ -5303,8 +5303,8 @@
<note />
</trans-unit>
<trans-unit id="optsUnknownPlatform">
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</source>
<target state="translated">Piattaforma '{0}' non riconosciuta. I valori validi sono 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred' e 'anycpu'</target>
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'. The default is anycpu.</source>
<target state="needs-review-translation">Piattaforma '{0}' non riconosciuta. I valori validi sono 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred' e 'anycpu'</target>
<note />
</trans-unit>
<trans-unit id="optsInternalNoDescription">
Expand Down
8 changes: 4 additions & 4 deletions src/Compiler/xlf/FSComp.txt.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5008,8 +5008,8 @@
<note />
</trans-unit>
<trans-unit id="optsPlatform">
<source>Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="translated">このコードが実行されるプラットフォームの制限: x86、Itanium、x64、anycpu32bitpreferred、または anycpu。既定は anycpu です。</target>
<source>Limit which platforms this code can run on: x86, x64, Arm, Arm64, Itanium, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="needs-review-translation">このコードが実行されるプラットフォームの制限: x86、Itanium、x64、anycpu32bitpreferred、または anycpu。既定は anycpu です。</target>
<note />
</trans-unit>
<trans-unit id="optsNoOpt">
Expand Down Expand Up @@ -5303,8 +5303,8 @@
<note />
</trans-unit>
<trans-unit id="optsUnknownPlatform">
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</source>
<target state="translated">認識されないプラットフォーム '{0}'。有効な値は 'x86'、'x64'、'Itanium'、'anycpu32bitpreferred'、および 'anycpu' です。</target>
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'. The default is anycpu.</source>
<target state="needs-review-translation">認識されないプラットフォーム '{0}'。有効な値は 'x86'、'x64'、'Itanium'、'anycpu32bitpreferred'、および 'anycpu' です。</target>
<note />
</trans-unit>
<trans-unit id="optsInternalNoDescription">
Expand Down
8 changes: 4 additions & 4 deletions src/Compiler/xlf/FSComp.txt.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5008,8 +5008,8 @@
<note />
</trans-unit>
<trans-unit id="optsPlatform">
<source>Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="translated">이 코드를 실행할 수 있는 플랫폼을 x86, Itanium, x64, anycpu32bitpreferred 또는 anycpu로 제한합니다. 기본값은 anycpu입니다.</target>
<source>Limit which platforms this code can run on: x86, x64, Arm, Arm64, Itanium, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="needs-review-translation">이 코드를 실행할 수 있는 플랫폼을 x86, Itanium, x64, anycpu32bitpreferred 또는 anycpu로 제한합니다. 기본값은 anycpu입니다.</target>
<note />
</trans-unit>
<trans-unit id="optsNoOpt">
Expand Down Expand Up @@ -5303,8 +5303,8 @@
<note />
</trans-unit>
<trans-unit id="optsUnknownPlatform">
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</source>
<target state="translated">인식할 수 없는 플랫폼 '{0}'입니다. 올바른 값은 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred' 및 'anycpu'입니다.</target>
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'. The default is anycpu.</source>
<target state="needs-review-translation">인식할 수 없는 플랫폼 '{0}'입니다. 올바른 값은 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred' 및 'anycpu'입니다.</target>
<note />
</trans-unit>
<trans-unit id="optsInternalNoDescription">
Expand Down
8 changes: 4 additions & 4 deletions src/Compiler/xlf/FSComp.txt.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5008,8 +5008,8 @@
<note />
</trans-unit>
<trans-unit id="optsPlatform">
<source>Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="translated">Ogranicz platformy, na jakich można uruchomić ten kod: x86, Itanium, x64, anycpu32bitpreferred lub anycpu. Domyślna platforma to anycpu.</target>
<source>Limit which platforms this code can run on: x86, x64, Arm, Arm64, Itanium, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="needs-review-translation">Ogranicz platformy, na jakich można uruchomić ten kod: x86, Itanium, x64, anycpu32bitpreferred lub anycpu. Domyślna platforma to anycpu.</target>
<note />
</trans-unit>
<trans-unit id="optsNoOpt">
Expand Down Expand Up @@ -5303,8 +5303,8 @@
<note />
</trans-unit>
<trans-unit id="optsUnknownPlatform">
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</source>
<target state="translated">Nierozpoznana platforma „{0}”. Prawidłowe wartości to „x86”, „x64”, „Itanium”, „anycpu32bitpreferred” i „anycpu”</target>
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'. The default is anycpu.</source>
<target state="needs-review-translation">Nierozpoznana platforma „{0}”. Prawidłowe wartości to „x86”, „x64”, „Itanium”, „anycpu32bitpreferred” i „anycpu”</target>
<note />
</trans-unit>
<trans-unit id="optsInternalNoDescription">
Expand Down
8 changes: 4 additions & 4 deletions src/Compiler/xlf/FSComp.txt.pt-BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5008,8 +5008,8 @@
<note />
</trans-unit>
<trans-unit id="optsPlatform">
<source>Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="translated">Limite em quais plataformas este código pode ser executado: x86, Itanium, x64, anycpu32bitpreferred ou anycpu. O padrão é anycpu.</target>
<source>Limit which platforms this code can run on: x86, x64, Arm, Arm64, Itanium, anycpu32bitpreferred, or anycpu. The default is anycpu.</source>
<target state="needs-review-translation">Limite em quais plataformas este código pode ser executado: x86, Itanium, x64, anycpu32bitpreferred ou anycpu. O padrão é anycpu.</target>
<note />
</trans-unit>
<trans-unit id="optsNoOpt">
Expand Down Expand Up @@ -5303,8 +5303,8 @@
<note />
</trans-unit>
<trans-unit id="optsUnknownPlatform">
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'</source>
<target state="translated">Plataforma não reconhecida '{0}', os valores válidos são 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred' e 'anycpu'</target>
<source>Unrecognized platform '{0}', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'. The default is anycpu.</source>
<target state="needs-review-translation">Plataforma não reconhecida '{0}', os valores válidos são 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred' e 'anycpu'</target>
<note />
</trans-unit>
<trans-unit id="optsInternalNoDescription">
Expand Down
Loading

0 comments on commit ad3e6de

Please sign in to comment.