[ModuleInterfaces] Replace 'module file' with 'compiled module'

Harlan Haskins · Harlan Haskins · commit 150ad9945772 · 2019-04-11T18:05:09.000-07:00
...only in diagnostics. And make the tests pass.

rdar://49359734
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -600,16 +600,16 @@ ERROR(sema_opening_import,Fatal,
 ERROR(serialization_load_failed,Fatal,
       "failed to load module %0", (Identifier))
 ERROR(serialization_malformed_module,Fatal,
-      "malformed module file: %0", (StringRef))
+      "malformed compiled module: %0", (StringRef))
 ERROR(serialization_module_too_new,Fatal,
-      "module file was created by a newer version of the compiler: %0",
+      "compiled module was created by a newer version of the compiler: %0",
       (StringRef))
 ERROR(serialization_module_language_version_mismatch,Fatal,
       "module compiled with Swift %0 cannot be imported by the Swift %1 "
       "compiler: %2",
       (StringRef, StringRef, StringRef))
 ERROR(serialization_module_too_old,Fatal,
-      "module file was created by an older version of the compiler; "
+      "compiled module was created by an older version of the compiler; "
       "rebuild %0 and try again: %1",
       (Identifier, StringRef))
 ERROR(serialization_missing_single_dependency,Fatal,
diff --git a/test/Driver/imported_modules_bridging_header.swift b/test/Driver/imported_modules_bridging_header.swift
@@ -4,6 +4,6 @@
 
 // Confirm that the compiler does look for/find the bad overlay during a normal
 // compilation, and thus validate that -emit-imported-modules doesn't.
-// CHECK: malformed module file: {{.*}}InvalidOverlay.swiftmodule
+// CHECK: malformed compiled module: {{.*}}InvalidOverlay.swiftmodule
 
 // REQUIRES: objc_interop
diff --git a/test/Interpreter/SDK/missing_imports_repl.swift b/test/Interpreter/SDK/missing_imports_repl.swift
@@ -33,7 +33,7 @@ MKMapRectIsNull(x)
 
 
 import Corrupted_Module
-// CHECK-ERROR: error: malformed module file
+// CHECK-ERROR: error: malformed compiled module
 
 "unreached"
 // CHECK-NOT: unreached
diff --git a/test/ParseableInterface/ModuleCache/force-module-loading-mode-archs.swift b/test/ParseableInterface/ModuleCache/force-module-loading-mode-archs.swift
@@ -93,7 +93,7 @@
 
 import Lib
 // NO-SUCH-MODULE: [[@LINE-1]]:8: error: no such module 'Lib'
-// BAD-MODULE: [[@LINE-2]]:8: error: malformed module file: {{.*}}Lib.swiftmodule
+// BAD-MODULE: [[@LINE-2]]:8: error: malformed compiled module: {{.*}}Lib.swiftmodule
 // WRONG-ARCH: [[@LINE-3]]:8: error: could not find module 'Lib' for target '[[ARCH]]'; found: garbage
 
 struct X {}
diff --git a/test/ParseableInterface/ModuleCache/force-module-loading-mode-framework.swift b/test/ParseableInterface/ModuleCache/force-module-loading-mode-framework.swift
@@ -94,7 +94,7 @@
 
 import Lib
 // NO-SUCH-MODULE: [[@LINE-1]]:8: error: no such module 'Lib'
-// BAD-MODULE: [[@LINE-2]]:8: error: malformed module file: {{.*}}Lib.swiftmodule
+// BAD-MODULE: [[@LINE-2]]:8: error: malformed compiled module: {{.*}}Lib.swiftmodule
 // WRONG-ARCH: [[@LINE-3]]:8: error: could not find module 'Lib' for target '[[ARCH]]'; found: garbage
 
 struct X {}
diff --git a/test/ParseableInterface/ModuleCache/force-module-loading-mode.swift b/test/ParseableInterface/ModuleCache/force-module-loading-mode.swift
@@ -69,7 +69,7 @@
 
 import Lib
 // NO-SUCH-MODULE: [[@LINE-1]]:8: error: no such module 'Lib'
-// BAD-MODULE: [[@LINE-2]]:8: error: malformed module file: {{.*}}Lib.swiftmodule
+// BAD-MODULE: [[@LINE-2]]:8: error: malformed compiled module: {{.*}}Lib.swiftmodule
 
 struct X {}
 let _: X = Lib.testValue
diff --git a/test/Serialization/load-arch-fallback-framework.swift b/test/Serialization/load-arch-fallback-framework.swift
@@ -15,4 +15,4 @@
 // REQUIRES: CPU=armv7 || CPU=armv7k || CPU=armv7s
 
 import empty
-// CHECK: :[[@LINE-1]]:8: error: malformed module file: {{.*}}arm.swiftmodule
+// CHECK: :[[@LINE-1]]:8: error: malformed compiled module: {{.*}}arm.swiftmodule
diff --git a/test/Serialization/load-arch-fallback.swift b/test/Serialization/load-arch-fallback.swift
@@ -15,4 +15,4 @@
 // REQUIRES: CPU=armv7 || CPU=armv7k || CPU=armv7s
 
 import empty
-// CHECK: :[[@LINE-1]]:8: error: malformed module file: {{.*}}arm.swiftmodule
+// CHECK: :[[@LINE-1]]:8: error: malformed compiled module: {{.*}}arm.swiftmodule
diff --git a/test/Serialization/load-invalid-doc.swift b/test/Serialization/load-invalid-doc.swift
@@ -14,4 +14,4 @@
 // RUN: echo -n 'abcde' > %t/empty.swiftdoc
 // RUN: %target-swift-frontend -typecheck -I %t %s -verify -show-diagnostics-after-fatal
 
-import empty // expected-error{{malformed module file}}
+import empty // expected-error{{malformed compiled module}}
diff --git a/test/Serialization/load-invalid.swift b/test/Serialization/load-invalid.swift
@@ -12,7 +12,7 @@
 // RUN: echo -n 'abcde' > %t/new_module.swiftmodule
 // RUN: %target-swift-frontend %s -typecheck -I %t -verify -show-diagnostics-after-fatal
 
-import new_module // expected-error{{malformed module file}}
+import new_module // expected-error{{malformed compiled module}}
 
 // malformed module files produce an empty module to avoid further errors.
 new_module.foo() // expected-error {{module 'new_module' has no member named 'foo'}}
diff --git a/test/Serialization/load-wrong-name-doc.swift b/test/Serialization/load-wrong-name-doc.swift
@@ -6,4 +6,4 @@
 // RUN: mv %t/empty.swiftdoc %t/empty2.swiftdoc
 // RUN: %target-swift-frontend -typecheck -I %t %s -verify -show-diagnostics-after-fatal
 
-import empty2 // expected-error{{malformed module file}}
+import empty2 // expected-error{{malformed compiled module}}
diff --git a/test/Serialization/swiftdoc-versions.swift b/test/Serialization/swiftdoc-versions.swift
@@ -17,4 +17,4 @@
 // RUN: cp %S/Inputs/swiftdoc-versions/empty-0.7.swiftdoc %t/empty.swiftdoc
 // RUN: %target-swift-frontend -typecheck -I %t %s -verify -show-diagnostics-after-fatal
 
-import empty // expected-error{{malformed module file}}
+import empty // expected-error{{malformed compiled module}}
diff --git a/test/Serialization/version-mismatches.swift b/test/Serialization/version-mismatches.swift
@@ -8,8 +8,8 @@
 // RUN: not %target-swift-frontend %s -typecheck -I %S/Inputs/too-old-language/ -show-diagnostics-after-fatal 2>&1 | %FileCheck -check-prefix CHECK -check-prefix LANGUAGE %s
 
 import Library
-// TOO-OLD: :[[@LINE-1]]:8: error: module file was created by an older version of the compiler; rebuild 'Library' and try again: {{.*}}too-old/Library.swiftmodule{{$}}
-// TOO-NEW: :[[@LINE-2]]:8: error: module file was created by a newer version of the compiler: {{.*}}too-new/Library.swiftmodule{{$}}
+// TOO-OLD: :[[@LINE-1]]:8: error: compiled module was created by an older version of the compiler; rebuild 'Library' and try again: {{.*}}too-old/Library.swiftmodule{{$}}
+// TOO-NEW: :[[@LINE-2]]:8: error: compiled module was created by a newer version of the compiler: {{.*}}too-new/Library.swiftmodule{{$}}
 
 // Update this line when the compiler version changes.
 // LANGUAGE: :[[@LINE-5]]:8: error: module compiled with Swift X.Y cannot be imported by the Swift 5.{{.+}} compiler: {{.*}}too-{{old|new}}-language/Library.swiftmodule{{$}}
