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

Commitcea9284

Browse files
authored
Use NO_EXTENSIONTYPING for better compiler debugging in normal case (#3912)
* Use NO_EXTENSIONTYPING for better compiler debugging in normal case* Update Fsc.fsproj
1 parent433b331 commitcea9284

File tree

62 files changed

+320
-331
lines changed

Some content is hidden

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

62 files changed

+320
-331
lines changed

‎fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<TargetType>LIBRARY</TargetType>
1818
<NoWarn>58;75</NoWarn>
1919
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
20-
<DefineConstants>EXTENSIONTYPING;$(DefineConstants)</DefineConstants>
2120
<ResolveNuGetPackages>false</ResolveNuGetPackages>
2221
<OutputPath>..\..\$(Configuration)\fcs\net45\</OutputPath>
2322
<Tailcalls>true</Tailcalls>

‎fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<DefineConstants>$(DefineConstants);COMPILER_SERVICE</DefineConstants>
1414
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_ASSUMES_FSHARP_CORE_4_4_0_0</DefineConstants>
1515
<DefineConstants>$(DefineConstants);EXTENSIBLE_DUMPER</DefineConstants>
16+
<DefineConstants>$(DefineConstants);NO_EXTENSIONTYPING</DefineConstants>
1617
<DefineConstants>$(DefineConstants);FSHARP_CORE_4_5</DefineConstants>
1718
<DefineConstants>$(DefineConstants);FX_PORTABLE_OR_NETSTANDARD</DefineConstants>
1819
<DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<!-- We target .NET 4.5 for FSharp.Compiler.Service.dll to allow broader use of this DLL-->
2525
<TargetFrameworkVersionCondition=" '$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
2626
<TargetFrameworkProfile />
27-
<DefineConstants>$(DefineConstants);EXTENSIONTYPING</DefineConstants>
2827
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
2928
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
3029
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>

‎fcs/samples/FscExe/FscExe.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<NoWarn>$(NoWarn);62;44</NoWarn>
1616
<AssemblyName>FscExe</AssemblyName>
1717
<Name>FscExe</Name>
18-
<DefineConstants>EXTENSIONTYPING;$(DefineConstants)</DefineConstants>
1918
<DefineConstants>COMPILER;$(DefineConstants)</DefineConstants>
2019
<DefineConstants>FX_RESIDENT_COMPILER;$(DefineConstants)</DefineConstants>
2120
<AllowCrossTargeting>true</AllowCrossTargeting>

‎src/absil/il.fsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ type ILTypeRef =
287287

288288
member QualifiedName: string
289289

290-
#ifEXTENSIONTYPING
290+
#if!NO_EXTENSIONTYPING
291291
member QualifiedNameWithNoShortPrimaryAssembly: string
292292
#endif
293293

‎src/buildfromsource/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<NoWarn>$(NoWarn);45;55;62;75;1182;1204</NoWarn>
1010
<AllowCrossTargeting>true</AllowCrossTargeting>
1111
<FX_NO_LOADER>true</FX_NO_LOADER>
12-
<DefineConstants>EXTENSIONTYPING;$(DefineConstants)</DefineConstants>
1312
<OtherFlags>$(OtherFlags) --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
1413
</PropertyGroup>
1514

‎src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AssemblyName>FSharp.Compiler.Private</AssemblyName>
99
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
1010
<AllowCrossTargeting>true</AllowCrossTargeting>
11-
<DefineConstants>$(DefineConstants);EXTENSIONTYPING;COMPILER</DefineConstants>
11+
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
1212
<OtherFlags>$(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
1313
</PropertyGroup>
1414

‎src/buildfromsource/Fsc/Fsc.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AssemblyName>fsc</AssemblyName>
1010
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
1111
<AllowCrossTargeting>true</AllowCrossTargeting>
12-
<DefineConstants>$(DefineConstants);EXTENSIONTYPING;COMPILER</DefineConstants>
12+
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
1313
<OtherFlags>$(OtherFlags) --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
1414
</PropertyGroup>
1515

‎src/buildfromsource/Fsi/Fsi.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AssemblyName>fsi</AssemblyName>
1010
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
1111
<AllowCrossTargeting>true</AllowCrossTargeting>
12-
<DefineConstants>$(DefineConstants);BUILD_FROM_SOURCE;COMPILER;EXTENSIONTYPING</DefineConstants>
12+
<DefineConstants>$(DefineConstants);BUILD_FROM_SOURCE;COMPILER</DefineConstants>
1313
<OtherFlags>$(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
1414
</PropertyGroup>
1515

‎src/fsharp/AccessibilityLogic.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ open Microsoft.FSharp.Compiler.Tast
1414
openMicrosoft.FSharp.Compiler.Tastops
1515
openMicrosoft.FSharp.Compiler.TcGlobals
1616

17-
#ifEXTENSIONTYPING
17+
#if!NO_EXTENSIONTYPING
1818
openMicrosoft.FSharp.Compiler.ExtensionTyping
1919
#endif
2020

@@ -228,7 +228,7 @@ let ComputeILAccess isPublic isFamily isFamilyOrAssembly isFamilyAndAssembly =
228228
letIsILFieldInfoAccessible g amap m ad x=
229229
match xwith
230230
| ILFieldInfo(tinfo,fd)-> IsILTypeAndMemberAccessible g amap m ad ad tinfo fd.Access
231-
#ifEXTENSIONTYPING
231+
#if!NO_EXTENSIONTYPING
232232
| ProvidedField(amap, tpfi, m)as pfi->
233233
letaccess= tpfi.PUntaint((fun fi-> ComputeILAccess fi.IsPublic fi.IsFamily fi.IsFamilyOrAssembly fi.IsFamilyAndAssembly), m)
234234
IsProvidedMemberAccessible amap m ad pfi.EnclosingType access
@@ -314,7 +314,7 @@ let IsTypeAndMethInfoAccessible amap m adTyp ad = function
314314
| ILMeth(g,x,_)-> IsILMethInfoAccessible g amap m adTyp ad x
315315
| FSMeth(_,_,vref,_)-> IsValAccessible ad vref
316316
| DefaultStructCtor(g,typ)-> IsTypeAccessible g amap m ad typ
317-
#ifEXTENSIONTYPING
317+
#if!NO_EXTENSIONTYPING
318318
| ProvidedMeth(amap,tpmb,_,m)as etmi->
319319
letaccess= tpmb.PUntaint((fun mi-> ComputeILAccess mi.IsPublic mi.IsFamily mi.IsFamilyOrAssembly mi.IsFamilyAndAssembly), m)
320320
IsProvidedMemberAccessible amap m ad etmi.EnclosingType access
@@ -325,7 +325,7 @@ let IsPropInfoAccessible g amap m ad = function
325325
| ILProp(_,x)-> IsILPropInfoAccessible g amap m ad x
326326
| FSProp(_,_,Some vref,_)
327327
| FSProp(_,_,_,Some vref)-> IsValAccessible ad vref
328-
#ifEXTENSIONTYPING
328+
#if!NO_EXTENSIONTYPING
329329
| ProvidedProp(amap, tppi, m)as pp->
330330
letaccess=
331331
leta= tppi.PUntaint((fun ppi->

0 commit comments

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