Skip to content

Merge tag 'swift-DEVELOPMENT-SNAPSHOT-2019-09-02-a' into tensorflow #27232

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.

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 488 commits into from
Sep 18, 2019

Conversation

dan-zheng
Copy link
Contributor

No description provided.

rintaro and others added 30 commits August 27, 2019 12:28
This test was added in f34ef5d for a fix in 5.1 and is going to fail in 5.0

rdar://54754307
…lue fix

Instead of recording `TreatRValueAsLValue` fix directly inside
`matchTypes`, let's move towards recording it specifically for
each possible case in `repairFailures` which makes it a lot
easier to determine what other fixes could be applied (if any).
…ype-everywhere

ABI/API checker: always print fully qualified names for types when diagnosing module difference
[AppKit] Fix incorrect rawValue for NSEvent.SpecialKey.deleteForward
Revert "[Parser] Decouple the parser from AST creation (part 2)"
[WIP] SemanticARCOpts: Don't copy let properties of classes.
We first build up the worklist by applying our visitor to the CFG via a simple
instruction walk. During this walk, we know that we will only ever modify
instructions that are dominated by the visited instruction since we do not look
through basic block arguments.

Then once we have finished traversing the CFG, optimizing and gathering
opportunities, we drain the worklist. This is eventually where we should process
block arguments that we may be able to optimize.
[Serialization] Collapse indirection in DeclContextID
When type parsing inside generic argument fails, '<' must be before
other parsed arguments.
Base location for function type should include leading trivia.
Misaligned indices were fixed in 5.1, but we should disable the test
when testing back deployment.

Adds a shared helper to StdlibUnittest for the run time check.
[ConstraintSystem] Introduce a notion of a "hole"
Returns `true` if `T.Type` is known to refer to a concrete type. The
implementation allows for the optimizer to specialize this at -O and
eliminate conditional code.

Includes `Swift._isConcrete<T>(T.Type) -> Bool` wrapper function.
The `Builtin.isConcrete` function is apparently sensitive to inlining in
unoptimized builds.
compnerd and others added 21 commits September 1, 2019 10:15
The build on Windows has been failing due to the ambiguous constructor
overload:

```
lib\Parse\ParseRequests.cpp(83): error C2666: 'swift::Parser::Parser': 2 overloads have similar conversions
include\swift\Parse\Parser.h(412): note: could be 'swift::Parser::Parser(std::unique_ptr<swift::Lexer,std::default_delete<_Ty>>,swift::SourceFile &,swift::SILParserTUStateBase *,swift::PersistentParserState *,std::shared_ptr<swift::SyntaxParseActions>,bool)'
        with
        [
            _Ty=swift::Lexer
        ]
include\swift\Parse\Parser.h(408): note: or       'swift::Parser::Parser(unsigned int,swift::SourceFile &,swift::SILParserTUStateBase *,swift::PersistentParserState *,std::shared_ptr<swift::SyntaxParseActions>,bool)'
include\swift\Parse\Parser.h(403): note: or       'swift::Parser::Parser(unsigned int,swift::SourceFile &,swift::DiagnosticEngine *,swift::SILParserTUStateBase *,swift::PersistentParserState *,std::shared_ptr<swift::SyntaxParseActions>,bool)'
lib\Parse\ParseRequests.cpp(84): note: while trying to match the argument list '(unsigned int, swift::SourceFile, nullptr, nullptr, nullptr, bool)'
```
…gester-use-builtin-baseline

Re-apply "swift-api-digester: teach the tool to find framework-specific baselines from relative path"
…erge

Tag build swift-DEVELOPMENT-SNAPSHOT-2019-09-02-a
It causes SwiftOnoneSupport to fail to compile, with error "swift:
/usr/local/google/home/marcrasi/swift-merge/swift/lib/SILOptimizer/Utils/Generics.cpp:1864:
swift::SILFunction
*swift::GenericFuncSpecializer::tryCreateSpecialization(): Assertion
`!SpecializedF->hasOwnership()' failed."

Since we don't depend on constexpr any more, this removal shouldn't
break anything.
Fix logic for deriving `VectorProtocol` for derived `TangentVector` struct.
Previously, `ProtocolConformanceRef::getTypeWitnessByName` returned a null type.
Now, it returns a dependent member type with an error base type:

```
(dependent_member_type assoc_type=Swift.(file).Differentiable.TangentVector
  (base=error_type
    (original_type=bound_generic_struct_type decl=main.(file).TF_521@tf-521.swift:1:8
      (primary_archetype_type address=0x7fe08d860660
                              conforms_to=Swift.(file).Differentiable
                              conforms_to=Swift.(file).FloatingPoint name=T
        (nested_type=Exponent <<unresolved>>)
        (nested_type=IntegerLiteralType <<unresolved>>)
        (nested_type=Magnitude <<unresolved>>)
        (nested_type=Stride <<unresolved>>)
        (nested_type=TangentVector =T)))))
```

Explicitly check whether types have error in `conformsToDifferentiable`.
`-Xfrontend -enable-ownership-stripping-after-serialization` for swiftCore
causes test/AutoDiff/array.swift to crash (regarding calls to
`Array.recursivelyAllKeyPaths`).

SR-11336 seems related and is reproducible from master.
Disabling flag for swiftCore (and all other standard library modules) until
SR-11336 is resolved.

Temporarily disable affected test SILOptimizer/pound_assert.swift.
TF-799 tracks re-enabling the test.
@dan-zheng dan-zheng added the tensorflow This is for "tensorflow" branch PRs. label Sep 18, 2019
@dan-zheng
Copy link
Contributor Author

@swift-ci Please clean test tensorflow

@dan-zheng
Copy link
Contributor Author

dan-zheng commented Sep 18, 2019

Verified that utils/build-toolchain-tensorflow passes on both macOS and Ubuntu 18.04.
Ready to merge after LGTM.

@ematejska ematejska merged commit c4d9eb4 into tensorflow Sep 18, 2019
@dan-zheng dan-zheng deleted the tensorflow-merge branch September 18, 2019 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tensorflow This is for "tensorflow" branch PRs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.