s/warning/error

Update tests

Author: elsh

include/swift/AST/DiagnosticsFrontend.def

@@ -576,7 +576,7 @@ ERROR(no_allocations_without_embedded,none,
 ERROR(no_swift_sources_with_embedded,none,
       "embedded swift cannot be enabled in a compiler built without Swift sources", ())
 
-WARNING(package_cmo_requires_library_evolution, none,
+ERROR(package_cmo_requires_library_evolution, none,
         "Library evolution must be enabled for Package CMO", ())
 
 ERROR(experimental_not_supported_in_production,none,

test/SILOptimizer/package-cmo-non-resilient-mode.swift renamed to test/SILOptimizer/cmo-with-package-decls.swift

@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift -O -wmo -Xfrontend -experimental-package-cmo -Xfrontend -experimental-allow-non-resilient-access -parse-as-library -emit-module -emit-module-path=%t/Submodule.swiftmodule -module-name=Submodule -package-name Pkg %S/Inputs/cross-module/default-submodule.swift -c -o %t/submodule.o
-// RUN: %target-build-swift -O -wmo -Xfrontend -experimental-package-cmo -Xfrontend -experimental-allow-non-resilient-access -parse-as-library -emit-module -emit-module-path=%t/Module.swiftmodule -module-name=Module -package-name Pkg -I%t -I%S/Inputs/cross-module %S/Inputs/cross-module/default-module.swift -c -o %t/module.o
-// RUN: %target-build-swift -O -wmo -Xfrontend -experimental-package-cmo -Xfrontend -experimental-allow-non-resilient-access -parse-as-library -emit-tbd -emit-tbd-path %t/ModuleTBD.tbd -emit-module -emit-module-path=%t/ModuleTBD.swiftmodule -module-name=ModuleTBD -package-name Pkg -I%t -I%S/Inputs/cross-module %S/Inputs/cross-module/default-module.swift -c -o %t/moduletbd.o -Xfrontend -tbd-install_name -Xfrontend module
+// RUN: %target-build-swift -O -wmo -Xfrontend -enable-default-cmo -parse-as-library -emit-module -emit-module-path=%t/Submodule.swiftmodule -module-name=Submodule -package-name Pkg %S/Inputs/cross-module/default-submodule.swift -c -o %t/submodule.o
+// RUN: %target-build-swift -O -wmo -Xfrontend -enable-default-cmo -parse-as-library -emit-module -emit-module-path=%t/Module.swiftmodule -module-name=Module -package-name Pkg -I%t -I%S/Inputs/cross-module %S/Inputs/cross-module/default-module.swift -c -o %t/module.o
+// RUN: %target-build-swift -O -wmo -Xfrontend -enable-default-cmo -parse-as-library -emit-tbd -emit-tbd-path %t/ModuleTBD.tbd -emit-module -emit-module-path=%t/ModuleTBD.swiftmodule -module-name=ModuleTBD -package-name Pkg -I%t -I%S/Inputs/cross-module %S/Inputs/cross-module/default-module.swift -c -o %t/moduletbd.o -Xfrontend -tbd-install_name -Xfrontend module
 
 // RUN: %target-build-swift -O -wmo -module-name=Main -package-name Pkg -I%t -I%S/Inputs/cross-module %s -emit-sil -o %t/Main.sil
 // RUN: %FileCheck %s < %t/Main.sil

test/SILOptimizer/package-cmo-require-library-evolution.swift

@@ -1,17 +1,12 @@
 // RUN: %empty-directory(%t)
 
-// RUN: %target-build-swift %s \
+// RUN: not %target-build-swift %s \
 // RUN: -module-name=Lib -package-name Pkg \
 // RUN: -emit-module -o %t/Lib.swiftmodule -I%t \
 // RUN: -Xfrontend -package-cmo \
 // RUN: -Xfrontend -allow-non-resilient-access \
-// RUN: -O -wmo 2>&1 | %FileCheck %s --check-prefix CHECK-WARNING
-// CHECK-WARNING: warning: Library evolution must be enabled for Package CMO
-
-// RUN: llvm-bcanalyzer %t/Lib.swiftmodule | %FileCheck %s -check-prefix=CHECK-BC
-// CHECK-BC-NOT: SERIALIZE_PACKAGE_ENABLED
-
-// RUN: rm -rf %t/Lib.swiftmodule
+// RUN: -O -wmo 2>&1 | %FileCheck %s --check-prefix CHECK-DIAGS
+// CHECK-DIAGS: error: Library evolution must be enabled for Package CMO
 
 // RUN: %target-build-swift %s \
 // RUN: -module-name=Lib -package-name Pkg \
@@ -21,8 +16,8 @@
 // RUN: -enable-library-evolution \
 // RUN: -O -wmo
 
-// RUN: llvm-bcanalyzer %t/Lib.swiftmodule | %FileCheck %s -check-prefix=CHECK-OK
-// CHECK-OK: SERIALIZE_PACKAGE_ENABLED
+// RUN: llvm-bcanalyzer %t/Lib.swiftmodule | %FileCheck %s -check-prefix=CHECK-BC
+// CHECK-BC: SERIALIZE_PACKAGE_ENABLED
 
 // REQUIRES: swift_in_compiler
 

test/SILOptimizer/package-cmo-resilient-mode.swift

@@ -1,6 +1,7 @@
 // RUN: %empty-directory(%t)
 // RUN: split-file %s %t
 
+/// Enable Package CMO; conservative mode on resilient module.
 // RUN: %target-build-swift %t/Lib.swift \
 // RUN: -module-name=Lib -package-name Pkg \
 // RUN: -parse-as-library -emit-module -emit-module-path %t/Lib.swiftmodule -I%t \
@@ -18,10 +19,12 @@
 
 // RUN: rm -rf %t/Lib.swiftmodule
 
+/// Enable non-package CMO; conservative mode on non-resilient module,
+/// and compare results with Package CMO.
 // RUN: %target-build-swift %t/Lib.swift \
 // RUN: -module-name=Lib -package-name Pkg \
 // RUN: -parse-as-library -emit-module -emit-module-path %t/Lib.swiftmodule -I%t \
-// RUN: -Xfrontend -experimental-package-cmo -Xfrontend -experimental-allow-non-resilient-access \
+// RUN: -Xfrontend -enable-default-cmo \
 // RUN: -O -wmo
 
 // RUN: %target-sil-opt %t/Lib.swiftmodule -sil-verify-all -o %t/Lib-non-res.sil