Merge fixes. (#28054)

dan-zheng · web-flow · commit 92b1f090d69d · 2019-11-05T06:52:59.000-08:00
* 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.
diff --git a/test/IRGen/copy_value_destroy_value.sil b/test/IRGen/copy_value_destroy_value.sil
diff --git a/test/SILOptimizer/OSLogConstantEvaluableTest.swift b/test/SILOptimizer/OSLogConstantEvaluableTest.swift
@@ -10,9 +10,6 @@
 //
 // REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
 
-// TODO(TF-799): Re-enable test after SR-11336 is fixed.
-// XFAIL: *
-
 // Test that the functions defined in the OSLogPrototype overlay annotated as
 // constant evaluable are so (with the constexpr-limit defined above).
 // This test is meant to catch regressions in the OSLog overlay implementation
diff --git a/test/SILOptimizer/OSLogPrototypeCompileTest.swift b/test/SILOptimizer/OSLogPrototypeCompileTest.swift
@@ -7,6 +7,10 @@
 // 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
@@ -18,6 +18,7 @@
 //
 // RUN: %FileCheck %s < %t/error-output-mandatory
 
+// SWIFT_ENABLE_TENSORFLOW
 // TODO(TF-799): Re-enable test after SR-11336 is fixed.
 // XFAIL: *
 
diff --git a/test/SILOptimizer/constant_propagation_diagnostics.swift b/test/SILOptimizer/constant_propagation_diagnostics.swift
@@ -1,6 +1,10 @@
 // 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: *
+
 // <rdar://problem/18213320> 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
@@ -1,6 +1,10 @@
 // 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: T) {}
diff --git a/test/SILOptimizer/definite_init_diagnostics_objc.swift b/test/SILOptimizer/definite_init_diagnostics_objc.swift
@@ -2,6 +2,10 @@
 // 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
@@ -1,6 +1,10 @@
 // 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
@@ -9,6 +9,7 @@
 // References: <rdar://problem/29937936>,
 // <https://bugs.swift.org/browse/SR-5964>
 
+// SWIFT_ENABLE_TENSORFLOW
 // TODO(TF-799): Re-enable RUN lines after SR-11336 is fixed.
 // XFAIL: *
 
diff --git a/test/SILOptimizer/diagnostic_constant_propagation_int_arch64.swift b/test/SILOptimizer/diagnostic_constant_propagation_int_arch64.swift
@@ -13,6 +13,10 @@
 //
 // FIXME: <rdar://problem/39193272> 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
@@ -1,6 +1,10 @@
 // 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<T>(_ p1: inout T, _ p2: inout T) { }
diff --git a/test/SILOptimizer/exclusivity_static_diagnostics_objc.swift b/test/SILOptimizer/exclusivity_static_diagnostics_objc.swift
@@ -2,6 +2,10 @@
 // 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
@@ -3,6 +3,10 @@
 //
 // 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
@@ -1,6 +1,10 @@
 // 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
@@ -1,6 +1,10 @@
 // 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
@@ -1,6 +1,10 @@
 // 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
@@ -1,6 +1,10 @@
 // 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
@@ -1,8 +1,10 @@
 // RUN: %target-swift-frontend -enable-experimental-static-assert -emit-sil %s -verify
+// 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.
-// UN: %target-swift-frontend -enable-experimental-static-assert -enable-ownership-stripping-after-serialization -emit-sil %s -verify
-// REQUIRES: asserts
+// XFAIL: *
 
 //===----------------------------------------------------------------------===//
 // Basic function calls and control flow
diff --git a/unittests/libInMemoryFrontend/InMemoryFrontendTests.cpp b/unittests/libInMemoryFrontend/InMemoryFrontendTests.cpp
@@ -15,13 +15,9 @@ class StreamDiagConsumer : public DiagnosticConsumer {
 public:
   StreamDiagConsumer(llvm::raw_ostream &OS) : OS(OS) {}
 
-  void
-  handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
-                   StringRef FormatString,
-                   ArrayRef<DiagnosticArgument> FormatArgs,
-                   const DiagnosticInfo &Info,
-                   const SourceLoc bufferIndirectlyCausingDiagnostic) override {
-    switch (Kind) {
+  void handleDiagnostic(SourceManager &SM,
+                        const DiagnosticInfo &Info) override {
+    switch (Info.Kind) {
     case DiagnosticKind::Error:
       OS << "error: ";
       break;
@@ -35,7 +31,8 @@ class StreamDiagConsumer : public DiagnosticConsumer {
       OS << "remark: ";
       break;
     }
-    DiagnosticEngine::formatDiagnosticText(OS, FormatString, FormatArgs);
+    DiagnosticEngine::formatDiagnosticText(OS, Info.FormatString,
+                                           Info.FormatArgs);
   }
 };
 
