Merge tag 'swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a' into tensorflow #28080

dan-zheng · 2019-11-05T15:12:07Z

No description provided.

[SyntaxParse] Remove unnecessary verifyElementRanges() call

[ClangImporter] Fix edge cases where custom name matches native name

This adjusts the encoded RPATH to enable us to switch to the new Foundation build.

[build-script] Add preset to set up CI testing for the stress tester

[CS] Make resolveLocatorToDecl simpler and more robust

Also fix a comment typo while I'm here.

...not the one they came from. This is important when specializing an inlinable function that takes an opaque type as a generic argument: that opaque type should still be considered opaque even if it came from the same module as the inlinable function. rdar://problem/56410009

No functionality change.

build: adjust rpath for new foundation layout

…warning-unecessary-casts

getInterfaceType() will return an ErrorType if the declaration is currently being validated, which can happen if override checking triggers associated type inference. I believe this is <rdar://problem/47220065>.

…med superclass type It is possible for getSuperclassDecl() to return a non-null type, while getSuperclass() returns an ErrorType. In this case, getContextSubstitutions() could crash because the walk of the superclass chain via getSuperclass() might not find the context class. Instead of crashing in asserts builds, let getContextSubstitutions() silently build an invalid substitution map here, just as it does in no-asserts builds.

Remove clone commands for curl and libxml2 as they are prebuilt now.

A couple of small circularity fixes

Update WindowsBuild.md

[windows] Add folder to path while testing.

[build-script] Don't build stdlib for iOS if --skip-build-ios is passed

[CMake] Fix the static bindings workflow.

…warning-unecessary-casts

…toneye-joe OpaqueArchetypeSpecializer: inlinable functions are now in this module

…ration for that being a semantic accessor.

Diagnose the fact that we're missing a colon, not the fact that we're missing a type since that's actually what has gone wrong.

[cmake] Install runtime swiftDemangle pieces.

rdar://problem/53400364

Fix `KeyPathIterable` derived conformances: `KeyPathIterable.allKeyPaths` synthesis logic now uses different key-path expression coercion logic to accommodate upstream type-checker changes. See TF-575 for more information.

* Disable expected SILOptimizer test failures. These tests fail because `-enable-ownership-stripping-after-serialization` has been disabled for libswiftCore on tensorflow branch due to SR-11336. TF-799 tracks re-enabling these tests. * Fix libInMemoryFrontend unittests. * Remove test/IRGen/copy_value_destroy_value.sil. The test was deleted upstream in #27866.

…erge

dan-zheng · 2019-11-05T15:13:35Z

@swift-ci Please clean test tensorflow

marcrasi · 2019-11-05T18:23:17Z

I just launched a toolchain build for this branch. Let's see what happens with that. Otherwise, looks good!

dan-zheng · 2019-11-05T18:38:55Z

I just launched a toolchain build for this branch. Let's see what happens with that. Otherwise, looks good!

./swift/utils/build-toolchain-tensorflow -t on Ubuntu failed for me during LLDB tests:

Failing Tests (35):
    LLDB :: Reproducer/Swift/TestBridging.test
    LLDB :: Reproducer/Swift/TestModule.test
    LLDB :: Reproducer/Swift/TestSimple.test
    LLDB :: Swift/No.swiftmodule.test
    LLDB :: Swift/astcontext_error.test
    LLDB :: Swift/cond-breakpoint.test
    LLDB :: Swift/global.test
    LLDB :: SwiftREPL/Basic.test
    LLDB :: SwiftREPL/Class.test
    LLDB :: SwiftREPL/ComputedProperties.test
    LLDB :: SwiftREPL/CrashArgs.test
    LLDB :: SwiftREPL/Deadlock.test
    LLDB :: SwiftREPL/Dict.test
    LLDB :: SwiftREPL/ErrorReturn.test
    LLDB :: SwiftREPL/ExclusivityREPL.test
    LLDB :: SwiftREPL/GenericTypealias.test
    LLDB :: SwiftREPL/Generics.test
    LLDB :: SwiftREPL/MetatypeRepl.test
    LLDB :: SwiftREPL/Optional.test
    LLDB :: SwiftREPL/OptionalUnowned.test
    LLDB :: SwiftREPL/PropertyWrapperPrivate.test
    LLDB :: SwiftREPL/PropertyWrapperPublic.test
    LLDB :: SwiftREPL/PropertyWrapperTopLevel.test
    LLDB :: SwiftREPL/RecursiveClass.test
    LLDB :: SwiftREPL/Redefinition.test
    LLDB :: SwiftREPL/SimpleExpressions.test
    LLDB :: SwiftREPL/Struct.test
    LLDB :: SwiftREPL/Subclassing.test
    LLDB :: SwiftREPL/SwiftInterface.test
    LLDB :: SwiftREPL/SwiftInterfaceForceModuleLoadMode.test
    LLDB :: SwiftREPL/SwiftTypeLookup.test
    LLDB :: SwiftREPL/UninitVariables.test
    LLDB :: SwiftREPL/ZeroSizeStruct.test
    LLDB :: SwiftREPL/enum-singlecase.test
    LLDB :: SwiftREPL/one-char-string.test

Full log for building LLDB here.
Many tests are unresolved with this error:

UNRESOLVED: lldb-Suite :: lang/swift/anytype_array/TestAnyTypeArray.py (29 of 300)
******************** TEST 'lldb-Suite :: lang/swift/anytype_array/TestAnyTypeArray.py' FAILED ********************
Unable to find 'RESULT: PASSED' in dotest output (exit code 1):

lldb version 7.0.0 (https://github.com/apple/llvm-project.git revision bd31d693aabf94c5d68480408d9a1752ed900ea4)
Swift version 5.1.1-dev (Swift 012b9929e5)
LLDB library dir: /home/danielzheng/swift-merge2/build/buildbot_linux/lldb-linux-x86_64/bin
LLDB import library dir: /home/danielzheng/swift-merge2/build/buildbot_linux/lldb-linux-x86_64/bin
Traceback (most recent call last):
  File "/home/danielzheng/swift-merge2/lldb/test/dotest.py", line 7, in <module>
    lldbsuite.test.run_suite()
  File "/home/danielzheng/swift-merge2/llvm-project/lldb/packages/Python/lldbsuite/test/dotest.py", line 941, in run_suite
    import lldb
  File "/home/danielzheng/swift-merge2/build/buildbot_linux/lldb-linux-x86_64/lib/python3.7/site-packages/lldb/__init__.py", line 38, in <module>
    from . import _lldb
ImportError: dynamic module does not define init function (init_lldb)

I won't investigate these LLDB issues further, but I will report results for macOS:

./swift/utils/build-toolchain-tensorflow --pkg
./swift/utils/build-toolchain-tensorflow -t --pkg

Upstream recently added `registerIDERequestFunctions`. We had previously added it as a tensorflow patch. So we're now calling it twice, which is forbidden. This PR removes our call, putting us in sync with upstream. This fixes the following error from swiftlang/swift#28080 (comment): ``` lldb: /home/danielzheng/swift-merge2/swift/lib/AST/Evaluator.cpp:58: void swift::Evaluator::registerRequestFunctions(swift::Zone, ArrayRef<swift::AbstractRequestFunction *>): Assertion `zone.first != zoneID' failed. ```

Related upstream patches: - #27871 - swiftlang/swift-syntax#160

marcrasi · 2019-11-05T22:22:59Z

Downstream repo tests reveal some additional errors that I'll investigate.

swift-apis:

[91/93] Compiling FastaiNotebook_07_batchnorm 07_batchnorm.swift
/fastai_dev/swift/FastaiNotebook_07_batchnorm/Sources/FastaiNotebook_07_batchnorm/07_batchnorm.swift:209:26: error: circular reference
    @noDerivative public var delegates: [(Self.Output) -> ()] = []
                         ^
/fastai_dev/swift/FastaiNotebook_07_batchnorm/Sources/FastaiNotebook_07_batchnorm/07_batchnorm.swift:209:30: note: through reference here
    @noDerivative public var delegates: [(Self.Output) -> ()] = []
                             ^
/fastai_dev/swift/FastaiNotebook_07_batchnorm/Sources/FastaiNotebook_07_batchnorm/07_batchnorm.swift:209:30: note: through reference here
    @noDerivative public var delegates: [(Self.Output) -> ()] = []
                             ^
/fastai_dev/swift/FastaiNotebook_07_batchnorm/Sources/FastaiNotebook_07_batchnorm/07_batchnorm.swift:219:6: note: through reference here
    @differentiable
     ^
/fastai_dev/swift/FastaiNotebook_07_batchnorm/Sources/FastaiNotebook_07_batchnorm/07_batchnorm.swift:154:19: warning: 'Raw' is deprecated: 'Raw' has been renamed to '_Raw' to indicate that it is not a guaranteed/stable API.
        let ret = Raw.fusedBatchNormV2(
                  ^
/fastai_dev/swift/FastaiNotebook_07_batchnorm/Sources/FastaiNotebook_07_batchnorm/07_batchnorm.swift:154:19: note: use '_Raw' instead
        let ret = Raw.fusedBatchNormV2(
                  ^~~
                  _Raw
/fastai_dev/swift/FastaiNotebook_07_batchnorm/Sources/FastaiNotebook_07_batchnorm/07_batchnorm.swift:175:27: warning: 'Raw' is deprecated: 'Raw' has been renamed to '_Raw' to indicate that it is not a guaranteed/stable API.
                let res = Raw.fusedBatchNormGradV2(
                          ^
/fastai_dev/swift/FastaiNotebook_07_batchnorm/Sources/FastaiNotebook_07_batchnorm/07_batchnorm.swift:175:27: note: use '_Raw' instead
                let res = Raw.fusedBatchNormGradV2(
                          ^~~
                          _Raw
<unknown>:0: error: type of expression is ambiguous without more context

swift-quotes:

Test Case 'StructureTests.testThrow' started at 2019-11-05 20:35:47.228
/swift/Tests/QuoteTests/StructureTests.swift:449: error: StructureTests.testThrow : XCTAssertEqual failed: ("Closure(
  [],
  [Throw(
    Conversion(
      Call(
        Name(
          "X",
          "<unstable USR>",
          FunctionType(
            [],
            [],
            TypeName("X", "<unstable USR>"))),
        [],
        [],
        TypeName("X", "<unstable USR>")),
      TypeName("Error", "s:s5ErrorP")))],
  FunctionType(
    [],
    [],
    TupleType(
      [])))") is not equal to ("Closure(
  [],
  [Throw(
    Conversion(
      Call(
        Name(
          "X",
          "",
          FunctionType(
            [],
            [],
            TypeName("X", "<unstable USR>"))),
        [],
        [],
        TypeName("X", "<unstable USR>")),
      TypeName("Error", "s:s5ErrorP")))],
  FunctionType(
    [],
    [],
    TupleType(
      [])))") -
Test Case 'StructureTests.testThrow' failed (0.0 seconds)

marcrasi · 2019-11-07T02:13:14Z

@swift-ci please test tensorflow

marcrasi · 2019-11-07T02:13:28Z

@swift-ci please test tensorflow

marcrasi · 2019-11-07T02:14:11Z

@swift-ci please clean test tensorflow

Introduced in swiftlang#28080: `swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a -> tensorflow` merge.

Introduced in #28080: `swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a -> tensorflow` merge.

hamishknight and others added 30 commits October 23, 2019 13:22

Address review feedback

19fe19e

Merge pull request #27825 from rintaro/syntaxparse-verifyelementranges-2

d0ad5de

[SyntaxParse] Remove unnecessary verifyElementRanges() call

Merge pull request #27682 from ChristopherRogers/master

49fd5ac

[ClangImporter] Fix edge cases where custom name matches native name

build: adjust rpath for new foundation layout

3c17e97

This adjusts the encoded RPATH to enable us to switch to the new Foundation build.

Merge pull request #27817 from ahoppen/skstresstester-ci-testing

985ed1a

[build-script] Add preset to set up CI testing for the stress tester

[CS] Make resolveLocatorToDecl simpler and more robust (#27836)

c95ef11

[CS] Make resolveLocatorToDecl simpler and more robust

Make OpaqueSubstitutionKind an enum class. No functionality change.

b08014a

Also fix a comment typo while I'm here.

Constify ReplaceOpaqueTypesWithUnderlyingTypes's DeclContext

6c1afdc

No functionality change.

Merge pull request #27853 from compnerd/rpath

2f34df9

build: adjust rpath for new foundation layout

Fixing formatting issues

a92e62f

Handling ExplicityCoercion in simplifyLocator

3dc82a6

Merge branch 'master' of https://github.com/apple/swift into SR-11295-…

48fdd58

…warning-unecessary-casts

Sema: Fix crash when override checking encounters circularity

284fbf9

getInterfaceType() will return an ErrorType if the declaration is currently being validated, which can happen if override checking triggers associated type inference. I believe this is <rdar://problem/47220065>.

SILGen: Add regression test for https://bugs.swift.org/browse/SR-11623

79ef0b7

Update WindowsBuild.md

7ca58ac

Remove clone commands for curl and libxml2 as they are prebuilt now.

[Doc] Update the Branch doc with LLVM Project info

982afa0

Merge pull request #27857 from slavapestov/tiny-circularity-fixes

35518d7

A couple of small circularity fixes

Merge pull request #27858 from apple/compnerd-prebuilts

60ae0ea

Update WindowsBuild.md

Merge pull request #27844 from drodriguez/windows-modify-testing-path

355a25a

[windows] Add folder to path while testing.

Merge pull request #27840 from ahoppen/dont-build-ios-stdlib

9721fd7

[build-script] Don't build stdlib for iOS if --skip-build-ios is passed

Merge pull request #27814 from JDevlieghere/use-static-bindings

40e5924

[CMake] Fix the static bindings workflow.

Merge branch 'master' of https://github.com/apple/swift into SR-11295-…

d3abe34

…warning-unecessary-casts

Merge pull request #27856 from jrose-apple/where-do-you-come-from-cot…

3c225d3

…toneye-joe OpaqueArchetypeSpecializer: inlinable functions are now in this module

Clean up uses of setInvalid() and remove uses of isInvalid() in prepa…

d67057a

…ration for that being a semantic accessor.

Restructure invalid parameter diagnostic

5beb6f0

Diagnose the fact that we're missing a colon, not the fact that we're missing a type since that's actually what has gone wrong.

Merge pull request #27843 from drodriguez/windows-install-swift-demangle

d42d2e1

[cmake] Install runtime swiftDemangle pieces.

[Runtime] Add a function pointer for intercepting swift_willThrow calls.

b8f5e84

rdar://problem/53400364

python: fix lint issues

7bb0e9b

dan-zheng and others added 5 commits November 4, 2019 09:07

Fix TensorFlow module compilation. (#28023)

685b30c

Fix `KeyPathIterable` derived conformances: `KeyPathIterable.allKeyPaths` synthesis logic now uses different key-path expression coercion logic to accommodate upstream type-checker changes. See TF-575 for more information.

Update tensorflow-apis hash.

bbc1654

Update checkout to swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a.

aacdf7a

Merge branch 'tensorflow' of github.com:apple/swift into tensorflow-m…

012b992

…erge

dan-zheng added the tensorflow This is for "tensorflow" branch PRs. label Nov 5, 2019

dan-zheng requested review from pschuh and marcrasi November 5, 2019 15:12

marcrasi mentioned this pull request Nov 5, 2019

fix duplicate request function registration swiftlang/llvm-project#197

Merged

update llvm-project checkout commit hash

ca180f8

dan-zheng mentioned this pull request Nov 5, 2019

Update checkout for swift-syntax. #28087

Merged

Update checkout for swift-syntax. (#28087)

8254ae5

Related upstream patches: - #27871 - swiftlang/swift-syntax#160

Marc Rasi added 6 commits November 5, 2019 19:51

update commit hash for llvm-project

f8f72fc

update commit hash for swift-stress-tester

c3cdcba

fix lldb build-script-impl to be closer to upstream

d1b06ba

Merge branch 'tensorflow' into tensorflow-merge

ba21f8d

fix lldb build-script-impl to be closer to upstream

d11273b

Merge branch 'tensorflow' into tensorflow-merge

f54489f

marcrasi merged commit 4d1c1df into tensorflow Nov 7, 2019

dan-zheng added a commit to dan-zheng/swift that referenced this pull request Nov 8, 2019

Fix unused variable warning.

51667bf

Introduced in swiftlang#28080: `swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a -> tensorflow` merge.

dan-zheng mentioned this pull request Nov 8, 2019

Fix unused variable warning. #28160

Merged

dan-zheng added a commit that referenced this pull request Nov 9, 2019

Fix unused variable warning. (#28160)

56548e0

Introduced in #28080: `swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a -> tensorflow` merge.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge tag 'swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a' into tensorflow #28080

Merge tag 'swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a' into tensorflow #28080

Uh oh!

dan-zheng commented Nov 5, 2019

Uh oh!

dan-zheng commented Nov 5, 2019

Uh oh!

marcrasi commented Nov 5, 2019

Uh oh!

dan-zheng commented Nov 5, 2019

Uh oh!

marcrasi commented Nov 5, 2019

Uh oh!

marcrasi commented Nov 7, 2019

Uh oh!

marcrasi commented Nov 7, 2019

Uh oh!

marcrasi commented Nov 7, 2019

Uh oh!

Uh oh!

Merge tag 'swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a' into tensorflow #28080

Merge tag 'swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a' into tensorflow #28080

Uh oh!

Conversation

dan-zheng commented Nov 5, 2019

Uh oh!

dan-zheng commented Nov 5, 2019

Uh oh!

marcrasi commented Nov 5, 2019

Uh oh!

dan-zheng commented Nov 5, 2019

Uh oh!

marcrasi commented Nov 5, 2019

Uh oh!

marcrasi commented Nov 7, 2019

Uh oh!

marcrasi commented Nov 7, 2019

Uh oh!

marcrasi commented Nov 7, 2019

Uh oh!

Uh oh!