averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into master-next

Browse Source
This commit is contained in:
Arnold Schwaighofer
2019-08-26 13:30:41 -07:00
parent 5c39026dc7 af0247e92c
commit 20efacf2d6
57 changed files with 705 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/AST/Module.cpp
View File

@@ -55,6 +55,11 @@
using namespace swift;
static_assert(IsTriviallyDestructible<FileUnit>::value,
"FileUnits are BumpPtrAllocated; the d'tor may not be called");
static_assert(IsTriviallyDestructible<LoadedFile>::value,
"LoadedFiles are BumpPtrAllocated; the d'tor may not be called");
//===----------------------------------------------------------------------===//
// Builtin Module Name lookup
//===----------------------------------------------------------------------===//
@@ -1249,10 +1254,6 @@ StringRef ModuleDecl::getModuleFilename() const {
// per-file names. Modules can consist of more than one file.
StringRef Result;
for (auto F : getFiles()) {
Result = F->getParseableInterface();
if (!Result.empty())
return Result;
if (auto SF = dyn_cast<SourceFile>(F)) {
if (!Result.empty())
return StringRef();