Merge pull request #633 from xiaobai/fix-swift-master-next

Fix swift/master-next

Author: JDevlieghere

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -1651,8 +1651,7 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
   if (log) {
     std::string s;
     llvm::raw_string_ostream ss(s);
-    const bool verbose = false;
-    sil_module->print(ss, verbose, &parsed_expr->module);
+    sil_module->print(ss, &parsed_expr->module);
     ss.flush();
 
     log->Printf("SIL module before linking:");
@@ -1667,8 +1666,7 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
   if (log) {
     std::string s;
     llvm::raw_string_ostream ss(s);
-    const bool verbose = false;
-    sil_module->print(ss, verbose, &parsed_expr->module);
+    sil_module->print(ss, &parsed_expr->module);
     ss.flush();
 
     log->Printf("Generated SIL module:");
@@ -1681,8 +1679,7 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
   if (log) {
     std::string s;
     llvm::raw_string_ostream ss(s);
-    const bool verbose = false;
-    sil_module->print(ss, verbose, &parsed_expr->module);
+    sil_module->print(ss, &parsed_expr->module);
     ss.flush();
 
     log->Printf("SIL module after diagnostic passes:");

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

@@ -220,10 +220,6 @@ ParseSupportFilesFromPrologue(const lldb::ModuleSP &module,
   return support_files;
 }
 
-FileSpecList SymbolFileDWARF::GetSymlinkPaths() {
-  return GetGlobalPluginProperties()->GetSymLinkPaths();
-}
-
 static inline bool IsSwiftLanguage(LanguageType language) {
   return language == eLanguageTypePLI || language == eLanguageTypeSwift ||
          ((uint32_t)language == (uint32_t)llvm::dwarf::DW_LANG_Swift);

lldb/source/Symbol/ClangASTContext.cpp

@@ -722,7 +722,8 @@ void ClangASTContext::CreateASTContext() {
 ClangASTContext *ClangASTContext::GetASTContext(clang::ASTContext *ast) {
   ClangASTContext *clang_ast = GetASTMap().Lookup(ast);
   if (!clang_ast)
-    clang_ast = new ClangASTContext(*ast);
+    clang_ast = new ClangASTContext(
+        "ASTContext from ClangASTContext::GetASTContext", *ast);
   return clang_ast;
 }
 

lldb/source/Symbol/SwiftASTContext.cpp

@@ -841,7 +841,7 @@ static bool IsDeviceSupport(const char *path) {
 
 static std::string GetClangModulesCacheProperty() {
   llvm::SmallString<128> path;
-  auto props = ModuleList::GetGlobalModuleListProperties();
+  const auto &props = ModuleList::GetGlobalModuleListProperties();
   props.GetClangModulesCachePath().GetPath(path);
   return path.str();
 }
@@ -2690,7 +2690,7 @@ swift::ClangImporterOptions &SwiftASTContext::GetClangImporterOptions() {
 
     // Set the Clang module search path.
     llvm::SmallString<128> path;
-    auto props = ModuleList::GetGlobalModuleListProperties();
+    const auto &props = ModuleList::GetGlobalModuleListProperties();
     props.GetClangModulesCachePath().GetPath(path);
     clang_importer_options.ModuleCachePath = path.str();
 
@@ -3423,7 +3423,7 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
   if (!m_ast_context_ap->SearchPathOpts.SDKPath.empty() || TargetHasNoSDK()) {
     if (!clang_importer_options.OverrideResourceDir.empty()) {
       // Create the DWARFImporterDelegate.
-      auto props = ModuleList::GetGlobalModuleListProperties();
+      const auto &props = ModuleList::GetGlobalModuleListProperties();
       if (props.GetUseDWARFImporter())
         m_dwarf_importer_delegate_up =
             std::make_unique<SwiftDWARFImporterDelegate>(*this);
@@ -3480,7 +3480,7 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
              prebuiltModuleCachePath.c_str());
 
   // Determine the Swift module loading mode to use.
-  auto props = ModuleList::GetGlobalModuleListProperties();
+  const auto &props = ModuleList::GetGlobalModuleListProperties();
   swift::ModuleLoadingMode loading_mode;
   switch (props.GetSwiftModuleLoadingMode()) {
   case eSwiftModuleLoadingModePreferSerialized: