Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5b72f32

Browse files
Merge remote-tracking branch 'origin/master' into nameof-operator
# Conflicts:#src/fsharp/FSComp.txt
2 parents15bf862 +798345d commit5b72f32

File tree

131 files changed

+3406
-1488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+3406
-1488
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,5 @@ times
107107
source_link.json
108108
.vs/
109109
/VSRelease/net40/bin
110+
System.ValueTuple.dll
111+
tests/fsharpqa/testenv/bin/System.ValueTuple.dll

‎FSharp.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HostedCompilerServer", "tes
4343
EndProject
4444
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="ILComparer","tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj","{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}"
4545
EndProject
46-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Tests.FSharpSuite.DrivingCoreCLR","tests\fsharp\FSharp.Tests.FSharpSuite.DrivingCoreCLR.fsproj","{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}"
46+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.LanguageService.Compiler","src\fsharp\FSharp.LanguageService.Compiler\FSharp.LanguageService.Compiler.fsproj","{A437A6EC-5323-47C2-8F86-E2CAC54FF152}"
4747
EndProject
4848
Global
4949
GlobalSection(SolutionConfigurationPlatforms) =preSolution
@@ -206,18 +206,18 @@ Global
206206
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.Build.0=Release|Any CPU
207207
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.ActiveCfg=Release|Any CPU
208208
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.Build.0=Release|Any CPU
209-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
210-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Debug|Any CPU.Build.0=Debug|Any CPU
211-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Debug|x86.ActiveCfg=Debug|Any CPU
212-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Debug|x86.Build.0=Debug|Any CPU
213-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
214-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Proto|Any CPU.Build.0=Proto|Any CPU
215-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Proto|x86.ActiveCfg=Proto|Any CPU
216-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Proto|x86.Build.0=Proto|Any CPU
217-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Release|Any CPU.ActiveCfg=Release|Any CPU
218-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Release|Any CPU.Build.0=Release|Any CPU
219-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Release|x86.ActiveCfg=Release|Any CPU
220-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED}.Release|x86.Build.0=Release|Any CPU
209+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
210+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.Build.0=Debug|Any CPU
211+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.ActiveCfg=Debug|Any CPU
212+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.Build.0=Debug|Any CPU
213+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
214+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.Build.0=Proto|Any CPU
215+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.ActiveCfg=Proto|Any CPU
216+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.Build.0=Proto|Any CPU
217+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.ActiveCfg=Release|Any CPU
218+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.Build.0=Release|Any CPU
219+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.ActiveCfg=Release|Any CPU
220+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.Build.0=Release|Any CPU
221221
EndGlobalSection
222222
GlobalSection(SolutionProperties) =preSolution
223223
HideSolutionNode =FALSE
@@ -236,6 +236,6 @@ Global
236236
{88E2D422-6852-46E3-A740-83E391DC7973} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
237237
{4239EFEA-E746-446A-BF7A-51FCBAB13946} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
238238
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
239-
{BDA4D411-6AD9-4B3E-A3B3-07BAD6BEF1ED} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
239+
{A437A6EC-5323-47C2-8F86-E2CAC54FF152} ={3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
240240
EndGlobalSection
241241
EndGlobal

‎Upload-Results.ps1‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎VisualFSharp.sln‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion =15.0.26020.0
4+
VisualStudioVersion =15.0.26206.0
55
MinimumVisualStudioVersion =10.0.40219.1
66
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler","src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
@@ -122,11 +122,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextFile", "vsintegration\I
122122
EndProject
123123
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XMLFile","vsintegration\ItemTemplates\XMLFile\XMLFile.csproj","{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6}"
124124
EndProject
125-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Solution Items","Solution Items","{A83A9A70-8C33-4253-BF6F-3AADB509F21C}"
126-
ProjectSection(SolutionItems) =preProject
127-
Performance1.psess=Performance1.psess
128-
EndProjectSection
129-
EndProject
130125
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Vsix","Vsix","{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}"
131126
EndProject
132127
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpFull","vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj","{59ADCE46-9740-4079-834D-9A03A3494EBC}"

‎appveyor.yml‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎build-everything.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
<ItemGroupCondition="'$(BUILD_VS)'=='1'">
3232
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-src-build.proj" />
33+
<ProjectsWithNet40Include="vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj" />
3334
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
3435
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
3536
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />

‎build.cmd‎

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -650,9 +650,7 @@ if '%TEST_NET40_FSHARP_SUITE%' == '1' (
650650
echo"!NUNIT3_CONSOLE!" --verbose"!FSCBINPATH!\FSharp.Tests.FSharpSuite.dll" --framework:V4.0 --work:"!FSCBINPATH!"!OUTPUTARG!!ERRORARG! --result:"!XMLFILE!;format=nunit3"!WHERE_ARG_NUNIT!
651651
"!NUNIT3_CONSOLE!" --verbose"!FSCBINPATH!\FSharp.Tests.FSharpSuite.dll" --framework:V4.0 --work:"!FSCBINPATH!"!OUTPUTARG!!ERRORARG! --result:"!XMLFILE!;format=nunit3"!WHERE_ARG_NUNIT!
652652

653-
call :UPLOAD_TEST_RESULTS"!XMLFILE!""!OUTPUTFILE!""!ERRORFILE!"
654-
655-
ifNOT '!saved_errorlevel!'== '0' (
653+
iferrorlevel1 (
656654
type"!ERRORFILE!"
657655
echo -----------------------------------------------------------------
658656
echo Error: Running tests net40-fsharp failed, see log above -- FAILED
@@ -661,7 +659,6 @@ if '%TEST_NET40_FSHARP_SUITE%' == '1' (
661659
)
662660
)
663661

664-
665662
REM ---------------- net40-fsharpqa -----------------------
666663

667664
setOSARCH=%PROCESSOR_ARCHITECTURE%
@@ -717,14 +714,12 @@ if '%TEST_NET40_COMPILERUNIT_SUITE%' == '1' (
717714
setERRORFILE=!RESULTSDIR!\test-net40-compilerunit-errors.log
718715
setERRORARG=--err:"!ERRORFILE!"
719716
setOUTPUTARG=--output:"!OUTPUTFILE!"
720-
)
717+
)
721718
setERRORFILE=!RESULTSDIR!\test-net40-compilerunit-errors.log
722719
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\..\..\net40\bin\FSharp.Compiler.Unittests.dll"!WHERE_ARG_NUNIT!
723720
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\..\..\net40\bin\FSharp.Compiler.Unittests.dll"!WHERE_ARG_NUNIT!
724721

725-
call :UPLOAD_TEST_RESULTS"!XMLFILE!""!OUTPUTFILE!""!ERRORFILE!"
726-
727-
ifNOT '!saved_errorlevel!'== '0' (
722+
iferrorlevel1 (
728723
echo -----------------------------------------------------------------
729724
type"!OUTPUTFILE!"
730725
echo -----------------------------------------------------------------
@@ -750,13 +745,12 @@ if '%TEST_NET40_COREUNIT_SUITE%' == '1' (
750745
setOUTPUTFILE=!RESULTSDIR!\test-net40-coreunit-output.log
751746
setERRORARG=--err:"!ERRORFILE!"
752747
setOUTPUTARG=--output:"!OUTPUTFILE!"
753-
)
748+
)
754749

755750
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
756751
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
757752

758-
call :UPLOAD_TEST_RESULTS"!XMLFILE!""!OUTPUTFILE!""!ERRORFILE!"
759-
ifNOT '!saved_errorlevel!'== '0' (
753+
iferrorlevel1 (
760754
echo -----------------------------------------------------------------
761755
type"!OUTPUTFILE!"
762756
echo -----------------------------------------------------------------
@@ -776,19 +770,18 @@ if '%TEST_PORTABLE_COREUNIT_SUITE%' == '1' (
776770
setERRORARG=
777771
setOUTPUTFILE=
778772
setERRORFILE=
779-
setXMLFILE=!RESULTSDIR!\test-portable-coreunit-results.xml
773+
setXMLFILE=!RESULTSDIR!\test-portable-coreunit-results.xml
780774
if '%CI%'== '1' (
781775
setOUTPUTFILE=!RESULTSDIR!\test-portable-coreunit-output.log
782776
setERRORFILE=!RESULTSDIR!\test-portable-coreunit-errors.log
783777
setERRORARG=--err:"!ERRORFILE!"
784778
setOUTPUTARG=--output:"!OUTPUTFILE!"
785-
)
779+
)
786780

787781
echo"!NUNIT3_CONSOLE!" /framework:V4.0 /result="!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! /work="!FSCBINPATH!""!FSCBINPATH!\..\..\portable7\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable47\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable78\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable259\bin\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
788782
"!NUNIT3_CONSOLE!" /framework:V4.0 /result="!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! /work="!FSCBINPATH!""!FSCBINPATH!\..\..\portable7\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable47\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable78\bin\FSharp.Core.Unittests.dll""!FSCBINPATH!\..\..\portable259\bin\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
789783

790-
call :UPLOAD_TEST_RESULTS"!XMLFILE!""!OUTPUTFILE!""!ERRORFILE!"
791-
ifNOT '!saved_errorlevel!'== '0' (
784+
iferrorlevel1 (
792785
echo -----------------------------------------------------------------
793786
type"!OUTPUTFILE!"
794787
echo -----------------------------------------------------------------
@@ -834,10 +827,7 @@ if '%TEST_CORECLR_FSHARP_SUITE%' == '1' (
834827
echo"%_dotnetexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
835828
"%_dotnetexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Tests.FSharpSuite.DrivingCoreCLR\FSharp.Tests.FSharpSuite.DrivingCoreCLR.dll"!WHERE_ARG_NUNIT!
836829

837-
838-
839-
call :UPLOAD_TEST_RESULTS"!XMLFILE!""!OUTPUTFILE!""!ERRORFILE!"
840-
ifNOT '!saved_errorlevel!'== '0' (
830+
iferrorlevel1 (
841831
echo -----------------------------------------------------------------
842832
echo Error: Running tests coreclr-fsharp failed, see logs above-- FAILED
843833
echo -----------------------------------------------------------------
@@ -865,8 +855,8 @@ if '%TEST_VS_IDEUNIT_SUITE%' == '1' (
865855
echo"!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!" --workers=1 --agents=1 --full"!FSCBINPATH!\VisualFSharp.Unittests.dll"!WHERE_ARG_NUNIT!
866856
"!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!" --workers=1 --agents=1 --full"!FSCBINPATH!\VisualFSharp.Unittests.dll"!WHERE_ARG_NUNIT!
867857
popd
868-
call :UPLOAD_TEST_RESULTS"!XMLFILE!""!OUTPUTFILE!""!ERRORFILE!"
869-
ifNOT '!saved_errorlevel!'== '0' (
858+
859+
iferrorlevel1 (
870860
echo --------begin vs-ide-unit output ---------------------
871861
type"!OUTPUTFILE!"
872862
echo --------end vs-ide-unit output -----------------------
@@ -880,28 +870,7 @@ if '%TEST_VS_IDEUNIT_SUITE%' == '1' (
880870
)
881871

882872
goto :success
883-
REM ------ upload test results procedure -------------------------------------
884-
885-
:UPLOAD_TEST_RESULTS
886-
887-
setsaved_errorlevel=%errorlevel%
888-
echo Saved errorlevel%saved_errorlevel%
889-
890-
rem See<http://www.appveyor.com/docs/environment-variables>
891-
ifnotdefined APPVEYORgoto :SKIP_APPVEYOR_UPLOAD
892-
893-
echo powershell -File Upload-Results.ps1"%~1"
894-
powershell -File Upload-Results.ps1"%~1"
895-
896-
:SKIP_APPVEYOR_UPLOAD
897-
898-
goto :EOF
899-
:: Note: "goto :EOF" returns from an in-batchfile "call" command
900-
:: in preference to returning from the entire batch file.
901-
902873
REM ------ exit -------------------------------------
903-
904-
905874
:failure
906875
endlocal
907876
exit /b1

‎src/absil/il.fs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ let rec splitNamespaceAux (nm:string) =
8080
s1::splitNamespaceAux s2
8181

8282
/// Global State. All namespace splits ever seen
83-
// ++GLOBAL MUTABLE STATE
83+
// ++GLOBAL MUTABLE STATE (concurrency-safe)
8484
letmemoizeNamespaceTable=new ConcurrentDictionary<string,string list>()
8585

86-
// ++GLOBAL MUTABLE STATE
86+
// ++GLOBAL MUTABLE STATE (concurrency-safe)
8787
letmemoizeNamespaceRightTable=new ConcurrentDictionary<string,string option* string>()
8888

8989

@@ -92,7 +92,7 @@ let splitNamespace nm =
9292

9393
letsplitNamespaceMemoized nm= splitNamespace nm
9494

95-
// ++GLOBAL MUTABLE STATE
95+
// ++GLOBAL MUTABLE STATE (concurrency-safe)
9696
letmemoizeNamespaceArrayTable=
9797
Concurrent.ConcurrentDictionary<string,string[]>()
9898

@@ -1865,15 +1865,9 @@ let andTailness x y =
18651865

18661866
letformatCodeLabel(x:int)="L"+string x
18671867

1868-
letnew_generator()=
1869-
leti= ref0
1870-
fun _n->
1871-
incr i;!i
1872-
1873-
// ++GLOBAL MUTABLE STATE
1874-
letcodeLabelGenerator=(new_generator(): unit-> ILCodeLabel)
1875-
letgenerateCodeLabel x= codeLabelGenerator x
1876-
1868+
// ++GLOBAL MUTABLE STATE (concurrency safe)
1869+
letcodeLabelCount= ref0
1870+
letgenerateCodeLabel()= System.Threading.Interlocked.Increment(codeLabelCount)
18771871

18781872
letinstrIsRet i=
18791873
match iwith

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp