Skip to content

New attempt to fix 'not' function #9715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Jul 22, 2020
Merged

New attempt to fix 'not' function #9715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9fdbb91
Ignore NCrunch temp files and local user files
abelbraaksma Jul 3, 2020
f6256e3
Showing only failing line in ExprTests, cleanup temp files
abelbraaksma Jul 4, 2020
3eb988d
Show sensible message when UnresolvedPathReferenceNoRange is raised b…
abelbraaksma Jul 4, 2020
07822df
Attempt to re-enable two base tests, may need to be re-disabled for Mono
abelbraaksma Jul 4, 2020
3f0d533
Cleanup tests that use global state, ensure deletion of temp files
abelbraaksma Jul 4, 2020
f1c0904
Fix difference Mono, fix spacing difference CI vs VS IDE
abelbraaksma Jul 4, 2020
513345e
Normalize null vs None
abelbraaksma Jul 4, 2020
bc2c707
Fix next issue difference between CI and local
abelbraaksma Jul 4, 2020
8caa000
Make sure both smoke tests use the same filterhack function
abelbraaksma Jul 4, 2020
6684c2b
Next fix, overlooked
abelbraaksma Jul 4, 2020
60fa6b1
Add procid and threadid to temp file
abelbraaksma Jul 11, 2020
2a64fa8
Move #r System.Numerics to mkStandardProjectReferences
abelbraaksma Jul 11, 2020
04b8032
Cleanup
abelbraaksma Jul 11, 2020
70b58eb
Fix tests that actually count references and are dependent on Common.fs
abelbraaksma Jul 11, 2020
8fb768f
Merge branch 'master' into Fix-issue-with-tests-9617
abelbraaksma Jul 11, 2020
6bb6c44
Merge branch 'Fix-issue-with-tests-9617' into Fix-not-function
abelbraaksma Jul 18, 2020
f2a9e2c
Move `not` function down and remove inline IL
abelbraaksma Jul 18, 2020
fef21e4
Attempt at fix for bsl test Seq_for_all01
abelbraaksma Jul 18, 2020
9cc5409
Merge branch 'master' into Fix-not-function
abelbraaksma Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/fsharp/FSharp.Core/prim-types.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3791,10 +3791,6 @@ namespace Microsoft.FSharp.Core
[<CompiledName("FailurePattern")>]
let (|Failure|_|) (error: exn) = if error.GetType().Equals(typeof<System.Exception>) then Some error.Message else None

[<CompiledName("Not")>]
let inline not (value: bool) = (# "ceq" value false : bool #)


let inline (<) x y = GenericLessThan x y
let inline (>) x y = GenericGreaterThan x y
let inline (>=) x y = GenericGreaterOrEqual x y
Expand Down Expand Up @@ -4743,6 +4739,9 @@ namespace Microsoft.FSharp.Core
[<CompiledName("Identity")>]
let id x = x

[<CompiledName("Not")>]
let inline not (value: bool) = match value with true -> false | _ -> true

// std* are TypeFunctions with the effect of reading the property on instantiation.
// So, direct uses of stdout should capture the current System.Console.Out at that point.
[<CompiledName("ConsoleIn")>]
Expand Down
25 changes: 15 additions & 10 deletions tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,28 +69,33 @@
.method public strict virtual instance bool
Invoke(int32 s) cil managed
{
// Code size 14 (0xe)
// Code size 18 (0x12)
.maxstack 8
.language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}'
.line 5,5 : 31,47 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\Misc\\Seq_for_all01.fs'
IL_0000: ldc.i4.1
IL_0001: brtrue.s IL_0005
IL_0001: ldc.i4.0
IL_0002: ceq
.line 100001,100001 : 0,0 ''
IL_0004: nop
.line 100001,100001 : 0,0 ''
IL_0005: brfalse.s IL_0009

IL_0003: br.s IL_0007
IL_0007: br.s IL_000b

IL_0005: br.s IL_000b
IL_0009: br.s IL_000f

.line 5,5 : 48,50 ''
IL_0007: nop
IL_000b: nop
.line 100001,100001 : 0,0 ''
IL_0008: nop
IL_0009: br.s IL_000c
IL_000c: nop
IL_000d: br.s IL_0010

.line 100001,100001 : 0,0 ''
IL_000b: nop
IL_000f: nop
.line 6,6 : 31,35 ''
IL_000c: ldc.i4.1
IL_000d: ret
IL_0010: ldc.i4.1
IL_0011: ret
} // end of method q@4::Invoke

} // end of class q@4
Expand Down