Skip to content

Commit f1d5154

Browse files
AnnaZaksAnnaZaks
authored
Merge pull request #24401 from harlanhaskins/thats-imparseable-5.1-04-24-2019
[5.1 04-24] [ModuleInterface] Rename 'parseable interface' to 'module interface' in diagnostics
2 parents fbfc0b4 + ab56a5d commit f1d5154

File tree

10 files changed

+30
-28
lines changed

10 files changed

+30
-28
lines changed

‎include/swift/AST/DiagnosticsDriver.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ ERROR(error_unknown_target,none,
8484

8585
ERROR(error_framework_bridging_header,none,
8686
"using bridging headers with framework targets is unsupported", ())
87-
ERROR(error_bridging_header_parseable_interface,none,
88-
"using bridging headers with parseable module interfaces is unsupported",
87+
ERROR(error_bridging_header_module_interface,none,
88+
"using bridging headers with module interfaces is unsupported",
8989
())
9090

9191
ERROR(error_i_mode,none,

‎include/swift/AST/DiagnosticsFrontend.def

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ ERROR(error_mode_cannot_emit_module,none,
119119
ERROR(error_mode_cannot_emit_module_doc,none,
120120
"this mode does not support emitting module documentation files", ())
121121
ERROR(error_mode_cannot_emit_interface,none,
122-
"this mode does not support emitting parseable interface files", ())
122+
"this mode does not support emitting module interface files", ())
123123

124124
WARNING(emit_reference_dependencies_without_primary_file,none,
125125
"ignoring -emit-reference-dependencies (requires -primary-file)", ())
@@ -258,18 +258,18 @@ ERROR(error_invalid_debug_prefix_map, none,
258258
ERROR(invalid_vfs_overlay_file,none,
259259
"invalid virtual overlay file '%0'", (StringRef))
260260

261-
WARNING(parseable_interface_scoped_import_unsupported,none,
262-
"scoped imports are not yet supported in parseable module interfaces",
261+
WARNING(module_interface_scoped_import_unsupported,none,
262+
"scoped imports are not yet supported in module interfaces",
263263
())
264-
ERROR(error_extracting_version_from_parseable_interface,none,
265-
"error extracting version from parseable module interface", ())
266-
ERROR(unsupported_version_of_parseable_interface,none,
267-
"unsupported version of parseable module interface '%0': '%1'",
264+
ERROR(error_extracting_version_from_module_interface,none,
265+
"error extracting version from module interface", ())
266+
ERROR(unsupported_version_of_module_interface,none,
267+
"unsupported version of module interface '%0': '%1'",
268268
(StringRef, llvm::VersionTuple))
269-
ERROR(error_extracting_flags_from_parseable_interface,none,
270-
"error extracting flags from parseable module interface", ())
271-
ERROR(missing_dependency_of_parseable_module_interface,none,
272-
"missing dependency '%0' of parseable module interface '%1': %2",
269+
ERROR(error_extracting_flags_from_module_interface,none,
270+
"error extracting flags from module interface", ())
271+
ERROR(missing_dependency_of_module_interface,none,
272+
"missing dependency '%0' of module interface '%1': %2",
273273
(StringRef, StringRef, StringRef))
274274
ERROR(error_extracting_dependencies_from_cached_module,none,
275275
"error extracting dependencies from cached module '%0'",

‎lib/Driver/Driver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ static void validateBridgingHeaderArgs(DiagnosticEngine &diags,
129129

130130
if (args.hasArgNoClaim(options::OPT_emit_module_interface,
131131
options::OPT_emit_module_interface_path)) {
132-
diags.diagnose({}, diag::error_bridging_header_parseable_interface);
132+
diags.diagnose({}, diag::error_bridging_header_module_interface);
133133
}
134134
}
135135

‎lib/Frontend/Frontend.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,13 @@ bool CompilerInstance::setUpModuleLoaders() {
296296
auto MLM = ModuleLoadingMode::PreferSerialized;
297297
if (auto forceModuleLoadingMode =
298298
llvm::sys::Process::GetEnv("SWIFT_FORCE_MODULE_LOADING")) {
299-
if (*forceModuleLoadingMode == "prefer-parseable")
299+
if (*forceModuleLoadingMode == "prefer-interface" ||
300+
*forceModuleLoadingMode == "prefer-parseable")
300301
MLM = ModuleLoadingMode::PreferParseable;
301302
else if (*forceModuleLoadingMode == "prefer-serialized")
302303
MLM = ModuleLoadingMode::PreferSerialized;
303-
else if (*forceModuleLoadingMode == "only-parseable")
304+
else if (*forceModuleLoadingMode == "only-interface" ||
305+
*forceModuleLoadingMode == "only-parseable")
304306
MLM = ModuleLoadingMode::OnlyParseable;
305307
else if (*forceModuleLoadingMode == "only-serialized")
306308
MLM = ModuleLoadingMode::OnlySerialized;

‎lib/Frontend/ParseableInterfaceModuleLoader.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static std::unique_ptr<llvm::MemoryBuffer> getBufferOfDependency(
227227
/*RequiresNullTerminator=*/false);
228228
if (!depBuf) {
229229
diags.diagnose(diagnosticLoc,
230-
diag::missing_dependency_of_parseable_module_interface,
230+
diag::missing_dependency_of_module_interface,
231231
depPath, interfacePath, depBuf.getError().message());
232232
return nullptr;
233233
}
@@ -240,7 +240,7 @@ static Optional<llvm::vfs::Status> getStatusOfDependency(
240240
auto status = fs.status(depPath);
241241
if (!status) {
242242
diags.diagnose(diagnosticLoc,
243-
diag::missing_dependency_of_parseable_module_interface,
243+
diag::missing_dependency_of_module_interface,
244244
depPath, interfacePath, status.getError().message());
245245
return None;
246246
}
@@ -367,12 +367,12 @@ class swift::ParseableInterfaceBuilder {
367367
SmallVector<StringRef, 1> VersMatches, FlagMatches;
368368
if (!VersRe.match(SB, &VersMatches)) {
369369
diags.diagnose(diagnosticLoc,
370-
diag::error_extracting_version_from_parseable_interface);
370+
diag::error_extracting_version_from_module_interface);
371371
return true;
372372
}
373373
if (!FlagRe.match(SB, &FlagMatches)) {
374374
diags.diagnose(diagnosticLoc,
375-
diag::error_extracting_flags_from_parseable_interface);
375+
diag::error_extracting_flags_from_module_interface);
376376
return true;
377377
}
378378
assert(VersMatches.size() == 2);
@@ -519,7 +519,7 @@ class swift::ParseableInterfaceBuilder {
519519
// compatible field variant.
520520
if (Vers.asMajorVersion() != InterfaceFormatVersion.asMajorVersion()) {
521521
diags.diagnose(diagnosticLoc,
522-
diag::unsupported_version_of_parseable_interface,
522+
diag::unsupported_version_of_module_interface,
523523
interfacePath, Vers);
524524
SubError = true;
525525
return;
@@ -872,7 +872,7 @@ class ParseableInterfaceModuleLoaderImpl {
872872
// The rest of the function should be covered by this.
873873
break;
874874
case ModuleLoadingMode::OnlySerialized:
875-
llvm_unreachable("parseable module loader should not have been created");
875+
llvm_unreachable("module interface loader should not have been created");
876876
}
877877

878878
// First, check the cached module path. Whatever's in this cache represents

‎lib/Frontend/ParseableInterfaceSupport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static void diagnoseScopedImports(DiagnosticEngine &diags,
5050
if (importPair.first.empty())
5151
continue;
5252
diags.diagnose(importPair.first.front().second,
53-
diag::parseable_interface_scoped_import_unsupported);
53+
diag::module_interface_scoped_import_unsupported);
5454
}
5555
}
5656

‎test/Driver/options.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
// RUN: not %swiftc_driver -import-objc-header fake.h -emit-parseable-module-interface %s 2>&1 | %FileCheck -check-prefix=BRIDGING_HEADER_SWIFTINTERFACE %s
2929
// RUN: not %swiftc_driver -import-objc-header fake.h -emit-parseable-module-interface-path fake.swiftinterface %s 2>&1 | %FileCheck -check-prefix=BRIDGING_HEADER_SWIFTINTERFACE %s
30-
// BRIDGING_HEADER_SWIFTINTERFACE: error: using bridging headers with parseable module interfaces is unsupported
30+
// BRIDGING_HEADER_SWIFTINTERFACE: error: using bridging headers with module interfaces is unsupported
3131

3232
// RUN: %swift_driver -### | %FileCheck -check-prefix=DEFAULT_REPL %s
3333
// DEFAULT_REPL: -repl

‎test/Frontend/supplementary-output-support.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
// RESOLVE_IMPORTS_NO_OBJC_HEADER: error: this mode does not support emitting Objective-C headers{{$}}
2626

2727
// RUN: not %target-swift-frontend -parse -emit-parseable-module-interface-path %t %s 2>&1 | %FileCheck -check-prefix=PARSE_NO_INTERFACE %s
28-
// PARSE_NO_INTERFACE: error: this mode does not support emitting parseable interface files{{$}}
28+
// PARSE_NO_INTERFACE: error: this mode does not support emitting module interface files{{$}}
2929
// RUN: not %target-swift-frontend -emit-silgen -emit-parseable-module-interface-path %t %s 2>&1 | %FileCheck -check-prefix=SILGEN_NO_INTERFACE %s
30-
// SILGEN_NO_INTERFACE: error: this mode does not support emitting parseable interface files{{$}}
30+
// SILGEN_NO_INTERFACE: error: this mode does not support emitting module interface files{{$}}

‎test/ParseableInterface/ModuleCache/module-cache-bad-version.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// RUN: test ! -f %t/TestModule.swiftmodule
2121
// RUN: test ! -f %t/modulecache/LeafModule-*.swiftmodule
2222
// RUN: %FileCheck %s -check-prefix=CHECK-ERR <%t/err.txt
23-
// CHECK-ERR: {{error: unsupported version of parseable module interface '.*/LeafModule.swiftinterface': '9999.999'}}
23+
// CHECK-ERR: {{error: unsupported version of module interface '.*[/\\]LeafModule.swiftinterface': '9999.999'}}
2424
// CHECK-ERR: error: no such module 'LeafModule
2525

2626
import LeafModule

‎test/ParseableInterface/imports.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
@_exported import empty
77
import B.B2
8-
import func C.c // expected-warning {{scoped imports are not yet supported in parseable module interfaces}}
8+
import func C.c // expected-warning {{scoped imports are not yet supported in module interfaces}}
99
import D
1010
@_implementationOnly import Secret_BAD
1111

0 commit comments

Comments
 (0)