diff --git a/cmake/modules/SwiftSource.cmake b/cmake/modules/SwiftSource.cmake index 941505c8d284b..770bbe53261ee 100644 --- a/cmake/modules/SwiftSource.cmake +++ b/cmake/modules/SwiftSource.cmake @@ -237,12 +237,8 @@ function(_compile_swift_files NOT "${SWIFTFILE_MODULE_NAME}" STREQUAL "DifferentiationUnittest") list(APPEND swift_flags "-enable-library-evolution") endif() - # FIXME(SR-11336): `-enable-ownership-stripping-after-serialization` for - # swiftCore causes test/AutoDiff/array.swift to crash, related to - # Array and key paths. - # Disabling the flag for swiftCore requires disabling the flag for all - # other standard library modules. - # list(APPEND swift_flags "-Xfrontend" "-enable-ownership-stripping-after-serialization") + # SWIFT_ENABLE_TENSORFLOW END + list(APPEND swift_flags "-Xfrontend" "-enable-ownership-stripping-after-serialization") endif() if(SWIFT_STDLIB_USE_NONATOMIC_RC) diff --git a/test/DebugInfo/LoadableByAddress.swift b/test/DebugInfo/LoadableByAddress.swift index 540e48c5e3ada..34697d63e5305 100644 --- a/test/DebugInfo/LoadableByAddress.swift +++ b/test/DebugInfo/LoadableByAddress.swift @@ -1,4 +1,3 @@ -// SWIFT_ENABLE_TENSORFLOW // RUN: %target-swift-frontend %s -module-name A -emit-ir -g -o - | %FileCheck %s // REQUIRES: CPU=x86_64 public struct Continuation { diff --git a/test/SILOptimizer/OSLogPrototypeCompileTest.swift b/test/SILOptimizer/OSLogPrototypeCompileTest.swift index 6f927366eacbe..d0678c8af61c2 100644 --- a/test/SILOptimizer/OSLogPrototypeCompileTest.swift +++ b/test/SILOptimizer/OSLogPrototypeCompileTest.swift @@ -7,10 +7,6 @@ // whether specific compile-time constants such as the format string, // the size of the byte buffer etc. are literals after the mandatory pipeline. -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - import OSLogPrototype if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) { diff --git a/test/SILOptimizer/constant_evaluable_subset_test.swift b/test/SILOptimizer/constant_evaluable_subset_test.swift index 12132fef53743..8e1b6fa33b592 100644 --- a/test/SILOptimizer/constant_evaluable_subset_test.swift +++ b/test/SILOptimizer/constant_evaluable_subset_test.swift @@ -18,10 +18,6 @@ // // RUN: %FileCheck %s < %t/error-output-mandatory -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - // Test Swift code snippets that are expected to be constant evaluable and those // that are not. If any of the test here fails, it indicates a change in the // output of SILGen or the mandatory passes that affects the constant diff --git a/test/SILOptimizer/constant_propagation_diagnostics.swift b/test/SILOptimizer/constant_propagation_diagnostics.swift index e62498a46f860..de433d7a5a44c 100644 --- a/test/SILOptimizer/constant_propagation_diagnostics.swift +++ b/test/SILOptimizer/constant_propagation_diagnostics.swift @@ -1,10 +1,6 @@ // RUN: %target-swift-frontend -emit-sil -sdk %S/../SILGen/Inputs %s -o /dev/null -verify // RUN: %target-swift-frontend -enable-ownership-stripping-after-serialization -emit-sil -sdk %S/../SILGen/Inputs %s -o /dev/null -verify -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - // enum with raw values that are too big are not diagnosed enum EnumWithTooLargeElements : UInt8 { case negativeOne = -1 // expected-error 2 {{negative integer '-1' overflows when stored into unsigned type 'UInt8'}} diff --git a/test/SILOptimizer/definite_init_diagnostics.swift b/test/SILOptimizer/definite_init_diagnostics.swift index 8db86c0d440ba..a563afdd18a74 100644 --- a/test/SILOptimizer/definite_init_diagnostics.swift +++ b/test/SILOptimizer/definite_init_diagnostics.swift @@ -1,10 +1,6 @@ // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify // RUN: %target-swift-frontend -emit-sil -enable-ownership-stripping-after-serialization -primary-file %s -o /dev/null -verify -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - import Swift func markUsed(_ t: T) {} diff --git a/test/SILOptimizer/definite_init_diagnostics_objc.swift b/test/SILOptimizer/definite_init_diagnostics_objc.swift index 02c53017b956d..b1ecf92999b6e 100644 --- a/test/SILOptimizer/definite_init_diagnostics_objc.swift +++ b/test/SILOptimizer/definite_init_diagnostics_objc.swift @@ -2,10 +2,6 @@ // RUN: %target-swift-frontend -emit-sil -sdk %S/../SILGen/Inputs %s -I %S/../SILGen/Inputs -enable-source-import -parse-stdlib -o /dev/null -verify -enable-ownership-stripping-after-serialization // REQUIRES: objc_interop -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - import Swift import gizmo diff --git a/test/SILOptimizer/definite_init_failable_initializers_diagnostics.swift b/test/SILOptimizer/definite_init_failable_initializers_diagnostics.swift index 573b9c57e391b..125458ed212f6 100644 --- a/test/SILOptimizer/definite_init_failable_initializers_diagnostics.swift +++ b/test/SILOptimizer/definite_init_failable_initializers_diagnostics.swift @@ -1,10 +1,6 @@ // RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module -verify %s // RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module -verify %s -enable-ownership-stripping-after-serialization -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - // High-level tests that DI rejects certain invalid idioms for early // return from initializers. diff --git a/test/SILOptimizer/diagnostic_constant_propagation.swift b/test/SILOptimizer/diagnostic_constant_propagation.swift index 4e556f4f3b5b2..a0fd24cc56eee 100644 --- a/test/SILOptimizer/diagnostic_constant_propagation.swift +++ b/test/SILOptimizer/diagnostic_constant_propagation.swift @@ -9,10 +9,6 @@ // References: , // -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable RUN lines after SR-11336 is fixed. -// XFAIL: * - import StdlibUnittest func testArithmeticOverflow() { diff --git a/test/SILOptimizer/diagnostic_constant_propagation_int_arch64.swift b/test/SILOptimizer/diagnostic_constant_propagation_int_arch64.swift index c55e1058508a2..38104f2455167 100644 --- a/test/SILOptimizer/diagnostic_constant_propagation_int_arch64.swift +++ b/test/SILOptimizer/diagnostic_constant_propagation_int_arch64.swift @@ -13,10 +13,6 @@ // // FIXME: A false negative that happens only in REPL -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - import StdlibUnittest func testArithmeticOverflow_Int_64bit() { diff --git a/test/SILOptimizer/exclusivity_static_diagnostics.swift b/test/SILOptimizer/exclusivity_static_diagnostics.swift index 0a2b177b7b1d9..96afff273e1a5 100644 --- a/test/SILOptimizer/exclusivity_static_diagnostics.swift +++ b/test/SILOptimizer/exclusivity_static_diagnostics.swift @@ -1,10 +1,6 @@ // RUN: %target-swift-frontend -enforce-exclusivity=checked -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify // RUN: %target-swift-frontend -enforce-exclusivity=checked -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - import Swift func takesTwoInouts(_ p1: inout T, _ p2: inout T) { } diff --git a/test/SILOptimizer/exclusivity_static_diagnostics_objc.swift b/test/SILOptimizer/exclusivity_static_diagnostics_objc.swift index a896756bb3c0d..a2403ab2d67c9 100644 --- a/test/SILOptimizer/exclusivity_static_diagnostics_objc.swift +++ b/test/SILOptimizer/exclusivity_static_diagnostics_objc.swift @@ -2,10 +2,6 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/optional_closure_bridging.h -enforce-exclusivity=checked -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization // REQUIRES: objc_interop -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - import Foundation class SomeClass { diff --git a/test/SILOptimizer/generalized_accessors.swift b/test/SILOptimizer/generalized_accessors.swift index 36c7715bf61a0..a0faa6159d7a8 100644 --- a/test/SILOptimizer/generalized_accessors.swift +++ b/test/SILOptimizer/generalized_accessors.swift @@ -3,10 +3,6 @@ // // Tests for yield-once diagnostics emitted for generalized accessors. -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - struct TestNoYield { var computed: Int { _read { diff --git a/test/SILOptimizer/infinite_recursion.swift b/test/SILOptimizer/infinite_recursion.swift index cf07919694c3f..00c1bd94b0178 100644 --- a/test/SILOptimizer/infinite_recursion.swift +++ b/test/SILOptimizer/infinite_recursion.swift @@ -1,10 +1,6 @@ // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - func a() { // expected-warning {{all paths through this function will call itself}} a() } diff --git a/test/SILOptimizer/invalid_escaping_captures.swift b/test/SILOptimizer/invalid_escaping_captures.swift index 96883ea5e4cda..ae9ceb780ce3b 100644 --- a/test/SILOptimizer/invalid_escaping_captures.swift +++ b/test/SILOptimizer/invalid_escaping_captures.swift @@ -1,10 +1,6 @@ // RUN: %target-swift-frontend -emit-sil %s -verify // RUN: %target-swift-frontend -emit-sil %s -verify -enable-ownership-stripping-after-serialization -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - func takesEscaping(_: @escaping () -> ()) {} func takesNonEscaping(_ fn: () -> ()) { fn() } diff --git a/test/SILOptimizer/mandatory_inlining.swift b/test/SILOptimizer/mandatory_inlining.swift index 3409e42aad096..7867ce7baee4f 100644 --- a/test/SILOptimizer/mandatory_inlining.swift +++ b/test/SILOptimizer/mandatory_inlining.swift @@ -1,10 +1,6 @@ // RUN: %target-swift-frontend -sil-verify-all -primary-file %s -emit-sil -o - -verify | %FileCheck %s // RUN: %target-swift-frontend -sil-verify-all -primary-file %s -emit-sil -o - -verify -enable-ownership-stripping-after-serialization -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - // These tests are deliberately shallow, because I do not want to depend on the // specifics of SIL generation, which might change for reasons unrelated to this // pass diff --git a/test/SILOptimizer/noescape_param_exclusivity.swift b/test/SILOptimizer/noescape_param_exclusivity.swift index 9357626c9d540..ad7833937f279 100644 --- a/test/SILOptimizer/noescape_param_exclusivity.swift +++ b/test/SILOptimizer/noescape_param_exclusivity.swift @@ -1,10 +1,6 @@ // RUN: %target-swift-frontend -emit-sil %s -verify // RUN: %target-swift-frontend -emit-sil %s -verify -enable-ownership-stripping-after-serialization -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable test after SR-11336 is fixed. -// XFAIL: * - func test0(a: (() -> ()) -> (), b: () -> ()) { a(b) // expected-error {{passing a non-escaping function parameter 'b' to a call to a non-escaping function parameter can allow re-entrant modification of a variable}} } diff --git a/test/SILOptimizer/pound_assert.swift b/test/SILOptimizer/pound_assert.swift index a8ea5137bdfd2..acccdaf0e32b5 100644 --- a/test/SILOptimizer/pound_assert.swift +++ b/test/SILOptimizer/pound_assert.swift @@ -2,10 +2,6 @@ // RUN: %target-swift-frontend -enable-experimental-static-assert -enable-ownership-stripping-after-serialization -emit-sil %s -verify // REQUIRES: asserts -// SWIFT_ENABLE_TENSORFLOW -// TODO(TF-799): Re-enable RUN line after SR-11336 is fixed. -// XFAIL: * - //===----------------------------------------------------------------------===// // Basic function calls and control flow //===----------------------------------------------------------------------===// diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index 1ff695032879e..c81ae4ab69154 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/utils/update_checkout/update-checkout-config.json @@ -250,7 +250,7 @@ "tensorflow": { "aliases": ["tensorflow"], "repos": { - "llvm-project": "b3338d3f55b4eba6433be56c5e05f5c04f79dcd5", + "llvm-project": "6d186f86de6fe0e6da9ca1972386c064514703e6", "swift": "tensorflow", "cmark": "swift-DEVELOPMENT-SNAPSHOT-2019-11-11-a", "llbuild": "swift-DEVELOPMENT-SNAPSHOT-2019-11-11-a",