Skip to content

Witnesses made visible in FCS #9510

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
cartermp merged 14 commits into from
Nov 3, 2020
Merged

Witnesses made visible in FCS #9510

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
de9923d
witnesses made visible in FCS
dsyme Jun 19, 2020
46ba75a
Merge branch 'main' of https://github.com/dotnet/fsharp into feature/…
dsyme Sep 6, 2020
0e81647
Merge branch 'main' of https://github.com/dotnet/fsharp into feature/…
dsyme Sep 22, 2020
9ff1bfb
update baselines
dsyme Sep 22, 2020
8640a8d
merge main
Oct 23, 2020
fd6a290
fix build
Oct 23, 2020
fa405cc
add testing
Oct 24, 2020
1a8bb47
add testing
Oct 24, 2020
fc8479f
fix tests
Oct 25, 2020
f619ca0
fix tests
Oct 25, 2020
886205d
Merge branch 'main' of https://github.com/dotnet/fsharp into feature/…
Oct 28, 2020
c4b28a1
Fix Regression with quotations of List.sum on non-primitive type
Oct 30, 2020
c8d5dfd
further testing for FCS on List.sum on non-primitive type
Oct 30, 2020
812e67e
run Expr tests in independent checkers to get consistent names
Oct 30, 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
Prev Previous commit
Next Next commit
merge main
  • Loading branch information
Don Syme committed Oct 23, 2020
commit 8640a8dfc472bc3e66bf52c6f7bee719eaf54496
2 changes: 1 addition & 1 deletion src/fsharp/symbols/Symbols.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2470,7 +2470,7 @@ type FSharpParameter(cenv, paramTy: TType, topArgInfo: ArgReprInfo, ownerOpt, ow
override x.ToString() =
"parameter " + (match x.Name with None -> "<unnamed" | Some s -> s)

type FSharpAssemblySignature (cenv, topAttribs: TypeChecker.TopAttribs option, optViewedCcu: CcuThunk option, mtyp: ModuleOrNamespaceType) =
type FSharpAssemblySignature (cenv, topAttribs: TopAttribs option, optViewedCcu: CcuThunk option, mtyp: ModuleOrNamespaceType) =

// Assembly signature for a referenced/linked assembly
new (cenv: SymbolEnv, ccu: CcuThunk) =
Expand Down
5 changes: 0 additions & 5 deletions tests/scripts/compiler-perf.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,8 @@ let build(cloneUrl, baseSha, ref, prNumber) =
exec "git" ("clone " + repo + " " + dirBuild) dirBase |> ignore
let result = exec "git" "reset --merge" dir
let result = exec "git" "checkout main" dir
<<<<<<< HEAD
let result = exec "git" "clean -xfd artifacts src vsintegration tests" dir
let result = exec "git" ("checkout -B " + branch + " " + baseSha) dir
=======
let result = exec "git" "clean -f -x artifacts src" dir
let result = exec "git" ("checkout -B " + branch + " main") dir
>>>>>>> 83c6440d759a2097618d46d1aabb374fe4140afd
let result = exec "git" ("pull " + cloneUrl + " " + ref) dir
let result, buildTime = time (fun () -> exec "cmd" "/C build.cmd -c Release" dir )
let result, ngenTime = time (fun () -> exec "ngen" @"install artifacts\bin\fsc\Release\net472\fsc.exe" dir )
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.