Skip to content

Conversation

@dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from master into dev15.8.

git fetch --all
git checkout merges/master-to-dev15.8
git reset --hard upstream/dev15.8
git merge upstream/master
# Fix merge conflicts
git commit
git push merges/master-to-dev15.8 --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

dsyme and others added 7 commits June 4, 2018 16:10
…ef-like structs (#4888)

* initial support for span, readonly refs, byref-like structs

* fix proto build

* make proto work with previous FSharp.Core

* make proto work with previous FSharp.Core

* update baselines

* integrate code cleanup

* integrate code cleanup

* integrate code cleanup

* integrate code cleanup

* fix build

* fix build

* implicit deref of byref returns

* add tests for Memory, ReadOnlySpan and ReadOnlyMemory

* fix tests

* simplify diff

* simplify diff

* remove duplicate error messages

* fix build

* test updates

* fix build

* fix build

* update baselines

* fix uses of NativePtr.toByRef

* switch to inference using byref pointer capabilities

* fix proto build

* update baselines, byref extension methods

* fix test errors

* emit in,out,modreq attributes correctly

* update tests

* fix build

* fix build

* fix tests

* fix tests

* get it right silly boy

* fix test

* minor cleanup

* add more tests

* clarify overloading behaviour + test case

* fix build break

* fix build of tests

* update tests

* add more tests

* byref fixes

* updates for subsumption calls, error message, assign-to-return-byref

* test updates, implicit deref on byref return for normal functions

* update baseline

* improve debug formatting, better error message on implicit deref, improve error messages

* add more tests for recursive functions

* update baselines

* fix baselines

* updates for new test cases

* updates for new test cases

* test updates and byref-to-byreflike

* deal with 'M() <- expr'

* restrict addresses of immutable top-level things

* fix IsByRefLike on struct

* update tests

* fix test

* fix test

* improve check for no-return-of-struct-field-addresses

* fix test case
* provide fast generic comparer for bool values

* formatting
@brettfo
Copy link
Member

brettfo commented Jun 4, 2018

@dsyme This auto-merge from master to dev15.8 has a bunch of build failures, can you take a look?

"D:\j\w\release_ci_pa---24e1afcf\src\fsharp-proto-build.proj" (default target) (1) ->
"D:\j\w\release_ci_pa---24e1afcf\src\fsharp\Fsc-proto\Fsc-proto.fsproj" (Build target) (4) ->
(CoreCompile target) -> 
  D:\j\w\release_ci_pa---24e1afcf\src\fsharp\TypeChecker.fs(8468,28): error FS0001: This expression was expected to have type�    ''a * 'b'    �but here has type�    'SynExpr -> Expr * SyntacticUnscopedTyparEnv' [D:\j\w\release_ci_pa---24e1afcf\src\fsharp\Fsc-proto\Fsc-proto.fsproj]
  D:\j\w\release_ci_pa---24e1afcf\src\fsharp\TypeChecker.fs(8468,49): error FS0001: This expression was expected to have type�    'bool'    �but here has type�    'TType' [D:\j\w\release_ci_pa---24e1afcf\src\fsharp\Fsc-proto\Fsc-proto.fsproj]
  D:\j\w\release_ci_pa---24e1afcf\src\fsharp\TypeChecker.fs(8468,53): error FS0001: This expression was expected to have type�    'TType'    �but here has type�    'TcEnv' [D:\j\w\release_ci_pa---24e1afcf\src\fsharp\Fsc-proto\Fsc-proto.fsproj]
  D:\j\w\release_ci_pa---24e1afcf\src\fsharp\TypeChecker.fs(8468,57): error FS0001: This expression was expected to have type�    'TcEnv'    �but here has type�    'SyntacticUnscopedTyparEnv' [D:\j\w\release_ci_pa---24e1afcf\src\fsharp\Fsc-proto\Fsc-proto.fsproj]
  D:\j\w\release_ci_pa---24e1afcf\src\fsharp\TypeChecker.fs(8468,63): error FS0001: This expression was expected to have type�    'SyntacticUnscopedTyparEnv'    �but here has type�    'SynExpr' [D:\j\w\release_ci_pa---24e1afcf\src\fsharp\Fsc-proto\Fsc-proto.fsproj]
  D:\j\w\release_ci_pa---24e1afcf\src\fsharp\TypeChecker.fs(8468,28): error FS0001: This expression was expected to have type�    ''a * 'b'    �but here has type�    'SynExpr -> Expr * SyntacticUnscopedTyparEnv' [D:\j\w\release_ci_pa---24e1afcf\src\fsharp\Fsc-proto\Fsc-proto.fsproj]

@dsyme dsyme merged commit f1c9a98 into dev15.8 Jun 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants