Fix recursive inline member ordering in optimizer #20111
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| namespace EmittedIL.Inlining | ||
|
|
||
| open Xunit | ||
| open FSharp.Test | ||
| open FSharp.Test.Compiler | ||
|
|
||
| module Regression_RecursiveInlineMemberDependencies = | ||
|
|
||
| let private assertCompiles source = | ||
| source | ||
| |> withOptimize | ||
| |> compile | ||
| |> shouldSucceed | ||
| |> ignore | ||
|
|
||
| [<Fact>] | ||
| let ``Inline members that depend on sibling member access compile`` () = | ||
| FSharp """ | ||
| module MemberAccessDependencyRepro | ||
|
|
||
| type ValidationBuilder() = | ||
| member inline _.Return(value: int) : int = value | ||
|
|
||
| member inline this.Bind(value: int, binder: int -> int) : int = | ||
| let result = this.Source value | ||
| binder result | ||
|
|
||
| member inline this.Source(value: int) : int = value | ||
|
|
||
| let inline run (builder: ValidationBuilder) = | ||
| builder.Bind(1, fun x -> x + 1) | ||
| """ | ||
| |> assertCompiles | ||
|
|
||
| [<Fact>] | ||
| let ``Trait-witness inline overload consumers compile`` () = | ||
| FSharp """ | ||
| module TraitWitnessOverloadRepro | ||
|
|
||
| open System.Runtime.InteropServices | ||
|
|
||
| type Default1 = class end | ||
|
|
||
| type Intersperse = | ||
| inherit Default1 | ||
|
|
||
| static member inline Intersperse (x: '``Collection<'T>``, e: 'T, [<Optional>]_impl: Default1) = | ||
| x | ||
|
|
||
| static member Intersperse (x: list<'T>, e: 'T, [<Optional>]_impl: Intersperse) = | ||
| x | ||
|
|
||
| static member inline Invoke (sep: 'T) (source: '``Collection<'T>``) = | ||
| let inline call_2 (a: ^a, b: ^b, s) = | ||
| ((^a or ^b): (static member Intersperse: _ * _ * _ -> _) (b, s, a)) | ||
|
|
||
| let inline call (a: 'a, b: 'b, s) = | ||
| call_2 (a, b, s) | ||
|
|
||
| call (Unchecked.defaultof<Intersperse>, source, sep) : '``Collection<'T>`` | ||
|
|
||
| let _ = Intersperse.Invoke 0 [1] | ||
| """ | ||
| |> assertCompiles | ||
|
|
||
| [<Fact>] | ||
| let ``Issue 1565 example 1 compiles`` () = | ||
| FSharp """ | ||
| module Issue1565Example1 | ||
|
|
||
| let inline checkBounds f (g: 'b -> ^c) (tp: ^a) = | ||
| let convertFrom = (^a: (static member name: string) ()) | ||
| let convertTo = (^c: (static member name : string) ()) | ||
| let value = (^a: (member Value: 'b) tp) | ||
|
|
||
| if f value then | ||
| g value | ||
| else | ||
| failwithf "Cannot convert from %s to %s." convertFrom convertTo | ||
|
|
||
| [<Struct>] | ||
| type ConverterA = | ||
| val Value: sbyte | ||
| new(v) = { Value = v } | ||
|
|
||
| static member inline name with get () = "converter-a" | ||
|
|
||
| static member inline convert(x: ConverterA): ConverterB = | ||
| checkBounds ((>=) 0y) (byte >> ConverterB) x | ||
|
|
||
| and [<Struct>] ConverterB = | ||
| val Value: byte | ||
| new(v) = { Value = v } | ||
|
|
||
| static member inline name with get () = "converter-b" | ||
| """ | ||
| |> assertCompiles | ||
|
|
||
| [<Fact>] | ||
| let ``Issue 1565 example 2 compiles`` () = | ||
| FSharp """ | ||
| module Issue1565Example2 | ||
|
|
||
| [<System.Flags>] | ||
| type MyType = | ||
| | Integer = 0b0001 | ||
| | Float = 0b0010 | ||
|
|
||
| module Test = | ||
| [<CustomEquality; NoComparison>] | ||
| type SomeType = | ||
| | Int of int64 | ||
| | Float of float | ||
|
|
||
| override x.Equals other = | ||
| match other with | ||
| | :? SomeType as y -> | ||
| match SomeType.getType x &&& SomeType.getType y with | ||
| | MyType.Integer -> int64 x = int64 y | ||
| | MyType.Float -> float x = float y | ||
| | _ -> false | ||
| | _ -> false | ||
|
|
||
| override x.GetHashCode() = | ||
| match x with | ||
| | Int i -> hash i | ||
| | Float f -> hash f | ||
|
|
||
| static member inline op_Explicit(n: SomeType): float = | ||
| match n with | ||
| | Int i -> float i | ||
| | Float f -> f | ||
|
|
||
| static member inline op_Explicit(n: SomeType): int64 = | ||
| match n with | ||
| | Int i -> i | ||
| | Float f -> int64 f | ||
|
|
||
| static member inline getType x = | ||
| match x with | ||
| | Int _ -> MyType.Integer | ||
| | Float _ -> MyType.Float | ||
| """ | ||
| |> assertCompiles | ||
|
|
||
| [<Fact>] | ||
| let ``Issue 1565 example 3 compiles`` () = | ||
| FSharp """ | ||
| module Test | ||
|
|
||
| type SomeType = | ||
| | Int of int64 | ||
| | Float of float | ||
|
|
||
| static member MyEquals(x, other: SomeType) = | ||
| float x = float other | ||
|
|
||
| static member inline op_Explicit(n: SomeType): float = | ||
| match n with | ||
| | Int i -> float i | ||
| | Float f -> f | ||
|
|
||
| static member inline op_Explicit(n: SomeType): int64 = | ||
| match n with | ||
| | Int i -> i | ||
| | Float f -> int64 f | ||
| """ | ||
| |> assertCompiles |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unlike the module-level path (
OptimizeModuleBindings, which gates onbinds |> List.exists (fun b -> b.Var.ShouldInline)), this local recursive path runs the full dependency analysis unconditionally for everylet recgroup — including groups with no inline bindings. That adds a double expression traversal (freeInExpr+FoldExpr, plus trait-witness codegen) on a hot compile path, and it changes emitted IL for non-inline recursive functions (see the updatedVerify13043andRegression_TLR_MutualInnerRec_*baselines), which contradicts the PR statement that non-inline groups retain existing behavior. Consider gating this branch on the same inline-presence check and falling back to the originalList.mapFold (OptimizeBinding cenv isRec)otherwise.