averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +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
2020-01-08 06:41:34 -08:00
parent d1095e2b8a 66fe1ec2b2
commit 43c24be5cd
141 changed files with 2498 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp
View File

@@ -329,14 +329,14 @@ int main(int argc, char **argv) {
llvm::outs() << "Importing " << path << "... ";
#ifdef SWIFT_SUPPORTS_SUBMODULES
std::vector<std::pair<swift::Identifier, swift::SourceLoc> > AccessPath;
std::vector<swift::Located<swift::Identifier>> AccessPath;
for (auto i = llvm::sys::path::begin(path);
i != llvm::sys::path::end(path); ++i)
if (!llvm::sys::path::is_separator((*i)[0]))
AccessPath.push_back({ CI.getASTContext().getIdentifier(*i),
swift::SourceLoc() });
#else
std::vector<std::pair<swift::Identifier, swift::SourceLoc> > AccessPath;
std::vector<swift::Located<swift::Identifier>> AccessPath;
AccessPath.push_back({ CI.getASTContext().getIdentifier(path),
swift::SourceLoc() });
#endif