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

Commitd97c797

Browse files
brettfoKevinRansom
authored andcommitted
normalizing error numbers to make the merges into dev16.0 normal (dotnet#5563)
1 parentc1e3314 commitd97c797

File tree

9 files changed

+35
-35
lines changed

9 files changed

+35
-35
lines changed

‎src/buildfromsource/FSharp.Compiler.Private/FSComp.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4341,19 +4341,19 @@ type internal SR private() =
43414341
static membertcIsReadOnlyNotStruct()=(3232, GetStringFunc("tcIsReadOnlyNotStruct",",,,"))
43424342
/// Struct members cannot return the address of fields of the struct by reference
43434343
/// (Originally from ..\FSComp.txt:1438)
4344-
static memberchkStructsMayNotReturnAddressesOfContents()=(3234, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,"))
4344+
static memberchkStructsMayNotReturnAddressesOfContents()=(3233, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,"))
43454345
/// The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope.
43464346
/// (Originally from ..\FSComp.txt:1439)
4347-
static memberchkNoByrefLikeFunctionCall()=(3235, GetStringFunc("chkNoByrefLikeFunctionCall",",,,"))
4347+
static memberchkNoByrefLikeFunctionCall()=(3234, GetStringFunc("chkNoByrefLikeFunctionCall",",,,"))
43484348
/// The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
43494349
/// (Originally from ..\FSComp.txt:1440)
4350-
static memberchkNoSpanLikeVariable(a0:System.String)=(3236, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0)
4350+
static memberchkNoSpanLikeVariable(a0:System.String)=(3235, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0)
43514351
/// A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope.
43524352
/// (Originally from ..\FSComp.txt:1441)
4353-
static memberchkNoSpanLikeValueFromExpression()=(3237, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,"))
4353+
static memberchkNoSpanLikeValueFromExpression()=(3236, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,"))
43544354
/// Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
43554355
/// (Originally from ..\FSComp.txt:1442)
4356-
static membertastCantTakeAddressOfExpression()=(3238, GetStringFunc("tastCantTakeAddressOfExpression",",,,"))
4356+
static membertastCantTakeAddressOfExpression()=(3237, GetStringFunc("tastCantTakeAddressOfExpression",",,,"))
43574357

43584358
/// Call this method once to validate that all known resources are valid; throws if not
43594359
static memberRunStartupValidation()=

‎src/fsharp/FSComp.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,8 +1435,8 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl
14351435
3230,chkNoWriteToLimitedSpan,"This value can't be assigned because the target '%s' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope."
14361436
3231,tastValueMustBeLocal,"A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...'"
14371437
3232,tcIsReadOnlyNotStruct,"A type annotated with IsReadOnly must also be a struct. Consider adding the [<Struct>] attribute to the type."
1438-
3234,chkStructsMayNotReturnAddressesOfContents,"Struct members cannot return the address of fields of the struct by reference"
1439-
3235,chkNoByrefLikeFunctionCall,"The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope."
1440-
3236,chkNoSpanLikeVariable,"The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope."
1441-
3237,chkNoSpanLikeValueFromExpression,"A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope."
1442-
3238,tastCantTakeAddressOfExpression,"Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address."
1438+
3233,chkStructsMayNotReturnAddressesOfContents,"Struct members cannot return the address of fields of the struct by reference"
1439+
3234,chkNoByrefLikeFunctionCall,"The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope."
1440+
3235,chkNoSpanLikeVariable,"The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope."
1441+
3236,chkNoSpanLikeValueFromExpression,"A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope."
1442+
3237,tastCantTakeAddressOfExpression,"Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address."

‎tests/fsharp/core/byrefs/test.bsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ test.fsx(66,34,66,47): typecheck error FS1204: This construct is for use in the
4343

4444
test.fsx(66,34,66,47): typecheck error FS1204: This construct isfor usein the FSharp.Core libraryand shouldnot be used directly
4545

46-
test.fsx(71,21,71,23): typecheck errorFS3238: Cannot take the address of the value returned from the expression. Assign the returned valueto a let-bound value before taking the address.
46+
test.fsx(71,21,71,23): typecheck errorFS3237: Cannot take the address of the value returned from the expression. Assign the returned valueto a let-bound value before taking the address.
4747

48-
test.fsx(72,21,72,23): typecheck errorFS3238: Cannot take the address of the value returned from the expression. Assign the returned valueto a let-bound value before taking the address.
48+
test.fsx(72,21,72,23): typecheck errorFS3237: Cannot take the address of the value returned from the expression. Assign the returned valueto a let-bound value before taking the address.
4949

50-
test.fsx(78,21,78,37): typecheck errorFS3238: Cannot take the address of the value returned from the expression. Assign the returned valueto a let-bound value before taking the address.
50+
test.fsx(78,21,78,37): typecheck errorFS3237: Cannot take the address of the value returned from the expression. Assign the returned valueto a let-bound value before taking the address.
5151

5252
test.fsx(85,22,85,23): typecheck error FS0001: This expression was expectedto have type
5353
'inref<System.DateTime>'

‎tests/fsharp/core/span/test.bsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
test.fsx(303,46,303,86): typecheck errorFS3235: The functionor method call cannot be used at this point, because one argument that is a byref of a non-stack-local Spanor IsByRefLike type is used with another argument that is a stack-local Spanor IsByRefLike type. This isto ensure the address of the local value doesnot escape its scope.
2+
test.fsx(303,46,303,86): typecheck errorFS3234: The functionor method call cannot be used at this point, because one argument that is a byref of a non-stack-local Spanor IsByRefLike type is used with another argument that is a stack-local Spanor IsByRefLike type. This isto ensure the address of the local value doesnot escape its scope.
33

44
test.fsx(306,13,306,86): typecheck error FS3230: This value can't be assigned because the target 'param1' may referto non-stack-local memory,while the expression being assigned is assessedto potentially referto stack-local memory. This isto help prevent pointersto stack-bound memory escaping their scope.
55

‎tests/fsharp/core/span/test2.bsl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ test2.fsx(119,14,119,37): typecheck error FS3228: The address of a value returne
2525

2626
test2.fsx(124,14,124,15): typecheck error FS3209: The address of the variable 'y'or a related expression cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
2727

28-
test2.fsx(128,13,128,42): typecheck errorFS3237: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
28+
test2.fsx(128,13,128,42): typecheck errorFS3236: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
2929

3030
test2.fsx(132,14,132,41): typecheck error FS3228: The address of a value returned from the expression cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
3131

3232
test2.fsx(136,14,136,71): typecheck error FS3228: The address of a value returned from the expression cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
3333

34-
test2.fsx(140,13,140,52): typecheck errorFS3237: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
34+
test2.fsx(140,13,140,52): typecheck errorFS3236: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
3535

36-
test2.fsx(144,13,144,14): typecheck errorFS3236: The Spanor IsByRefLike variable 's' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
36+
test2.fsx(144,13,144,14): typecheck errorFS3235: The Spanor IsByRefLike variable 's' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
3737

38-
test2.fsx(149,13,149,52): typecheck errorFS3237: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
38+
test2.fsx(149,13,149,52): typecheck errorFS3236: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
3939

40-
test2.fsx(153,21,153,84): typecheck errorFS3235: The functionor method call cannot be used at this point, because one argument that is a byref of a non-stack-local Spanor IsByRefLike type is used with another argument that is a stack-local Spanor IsByRefLike type. This isto ensure the address of the local value doesnot escape its scope.
40+
test2.fsx(153,21,153,84): typecheck errorFS3234: The functionor method call cannot be used at this point, because one argument that is a byref of a non-stack-local Spanor IsByRefLike type is used with another argument that is a stack-local Spanor IsByRefLike type. This isto ensure the address of the local value doesnot escape its scope.
4141

42-
test2.fsx(154,13,154,14): typecheck errorFS3236: The Spanor IsByRefLike variable 'y' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
42+
test2.fsx(154,13,154,14): typecheck errorFS3235: The Spanor IsByRefLike variable 'y' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
4343

44-
test2.fsx(158,13,158,83): typecheck errorFS3237: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
44+
test2.fsx(158,13,158,83): typecheck errorFS3236: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
4545

46-
test2.fsx(163,13,163,14): typecheck errorFS3236: The Spanor IsByRefLike variable 'y' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
46+
test2.fsx(163,13,163,14): typecheck errorFS3235: The Spanor IsByRefLike variable 'y' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
4747

4848
test2.fsx(167,14,167,71): typecheck error FS3228: The address of a value returned from the expression cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
4949

@@ -75,4 +75,4 @@ test2.fsx(213,14,213,19): typecheck error FS0437: A type would store a byref typ
7575

7676
test2.fsx(222,18,222,23): typecheck error FS3228: The address of a value returned from the expression cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
7777

78-
test2.fsx(231,17,231,18): typecheck errorFS3236: The Spanor IsByRefLike variable 's' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
78+
test2.fsx(231,17,231,18): typecheck errorFS3235: The Spanor IsByRefLike variable 's' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.

‎tests/fsharp/typecheck/sigs/neg106.bsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ is not compatible with type
3838
'byref<'a>'
3939
.
4040

41-
neg106.fs(17,59,17,61): typecheck errorFS3238: Cannot take the address of the value returned from the expression. Assign the returned valueto a let-bound value before taking the address.
41+
neg106.fs(17,59,17,61): typecheck errorFS3237: Cannot take the address of the value returned from the expression. Assign the returned valueto a let-bound value before taking the address.
4242

4343
neg106.fs(17,14,17,68): typecheck error FS0041: No overloads matchfor method 'CompareExchange'. The available overloads are shown below.
4444
neg106.fs(17,14,17,68): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int'. Type constraint mismatch. The type

‎tests/fsharp/typecheck/sigs/neg106.vsbsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ is not compatible with type
3838
'byref<'a>'
3939
.
4040

41-
neg106.fs(17,59,17,61): typecheck errorFS3238: Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
41+
neg106.fs(17,59,17,61): typecheck errorFS3237: Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
4242

4343
neg106.fs(17,14,17,68): typecheck error FS0041: No overloads match for method 'CompareExchange'. The available overloads are shown below.
4444
neg106.fs(17,14,17,68): typecheck error FS0041: Possible overload: 'System.Threading.Interlocked.CompareExchange(location1: byref<int>, value: int, comparand: int) : int'. Type constraint mismatch. The type

‎tests/fsharp/typecheck/sigs/neg107.bsl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ neg107.fsx(37,33,37,34): typecheck error FS0425: The type of a first-class funct
5555

5656
neg107.fsx(37,33,37,34): typecheck error FS0425: The type of a first-class function cannot contain byrefs
5757

58-
neg107.fsx(45,34,45,40): typecheck errorFS3234: Struct members cannotreturn the address of fields of the struct by reference
58+
neg107.fsx(45,34,45,40): typecheck errorFS3233: Struct members cannotreturn the address of fields of the struct by reference
5959

60-
neg107.fsx(45,34,45,38): typecheck errorFS3234: Struct members cannotreturn the address of fields of the struct by reference
60+
neg107.fsx(45,34,45,38): typecheck errorFS3233: Struct members cannotreturn the address of fields of the struct by reference
6161

62-
neg107.fsx(53,34,53,38): typecheck errorFS3234: Struct members cannotreturn the address of fields of the struct by reference
62+
neg107.fsx(53,34,53,38): typecheck errorFS3233: Struct members cannotreturn the address of fields of the struct by reference
6363

64-
neg107.fsx(67,34,67,40): typecheck errorFS3234: Struct members cannotreturn the address of fields of the struct by reference
64+
neg107.fsx(67,34,67,40): typecheck errorFS3233: Struct members cannotreturn the address of fields of the struct by reference
6565

66-
neg107.fsx(67,34,67,38): typecheck errorFS3234: Struct members cannotreturn the address of fields of the struct by reference
66+
neg107.fsx(67,34,67,38): typecheck errorFS3233: Struct members cannotreturn the address of fields of the struct by reference
6767

6868
neg107.fsx(71,19,71,20): typecheck error FS0412: A type instantiation involves a byref type. This isnot permitted by the rules of Common IL.
6969

‎tests/fsharp/typecheck/sigs/neg107.vsbsl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ neg107.fsx(37,33,37,34): typecheck error FS0425: The type of a first-class funct
5555

5656
neg107.fsx(37,33,37,34): typecheck error FS0425: The type of a first-class function cannot contain byrefs
5757

58-
neg107.fsx(45,34,45,40): typecheck errorFS3234: Struct members cannot return the address of fields of the struct by reference
58+
neg107.fsx(45,34,45,40): typecheck errorFS3233: Struct members cannot return the address of fields of the struct by reference
5959

60-
neg107.fsx(45,34,45,38): typecheck errorFS3234: Struct members cannot return the address of fields of the struct by reference
60+
neg107.fsx(45,34,45,38): typecheck errorFS3233: Struct members cannot return the address of fields of the struct by reference
6161

62-
neg107.fsx(53,34,53,38): typecheck errorFS3234: Struct members cannot return the address of fields of the struct by reference
62+
neg107.fsx(53,34,53,38): typecheck errorFS3233: Struct members cannot return the address of fields of the struct by reference
6363

64-
neg107.fsx(67,34,67,40): typecheck errorFS3234: Struct members cannot return the address of fields of the struct by reference
64+
neg107.fsx(67,34,67,40): typecheck errorFS3233: Struct members cannot return the address of fields of the struct by reference
6565

66-
neg107.fsx(67,34,67,38): typecheck errorFS3234: Struct members cannot return the address of fields of the struct by reference
66+
neg107.fsx(67,34,67,38): typecheck errorFS3233: Struct members cannot return the address of fields of the struct by reference
6767

6868
neg107.fsx(71,19,71,20): typecheck error FS0412: A type instantiation involves a byref type. This is not permitted by the rules of Common IL.
6969

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp