Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1990 from apple/lldb-Fix-few-easily-correctable-w…
…arnings

[lldb] Fix few easily correctable warnings
  • Loading branch information
kastiglione committed Oct 17, 2020
2 parents 0ac1051 + 590ecce commit 9c80a3d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
2 changes: 1 addition & 1 deletion lldb/source/Expression/REPL.cpp
Expand Up @@ -196,7 +196,7 @@ static bool ReadCode(const std::string &path, std::string &code,
const size_t max_size = code.max_size();
if (file_size > max_size) {
error_sp->Printf("file at path '%s' too large: "
"file_size = %llu, max_size = %llu\n",
"file_size = %zu, max_size = %zu\n",
path.c_str(), file_size, max_size);
return false;
}
Expand Down
8 changes: 0 additions & 8 deletions lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
Expand Up @@ -8342,14 +8342,6 @@ bool SwiftASTContext::CacheUserImports(SwiftASTContext &swift_ast_context,
Status &error) {
llvm::SmallString<1> m_description;

swift::ModuleDecl::ImportFilter import_filter {
swift::ModuleDecl::ImportFilterKind::Exported,
swift::ModuleDecl::ImportFilterKind::Default,
swift::ModuleDecl::ImportFilterKind::ImplementationOnly,
swift::ModuleDecl::ImportFilterKind::SPIAccessControl,
swift::ModuleDecl::ImportFilterKind::ShadowedByCrossImportOverlay
};

auto *persistent_expression_state =
sc.target_sp->GetSwiftPersistentExpressionState(exe_scope);

Expand Down
Expand Up @@ -965,7 +965,7 @@ llvm::Optional<uint64_t> SwiftLanguageRuntimeImpl::GetMemberVariableOffset(
}
if (offset) {
LLDB_LOGF(GetLogIfAllCategoriesSet(LIBLLDB_LOG_TYPES),
"[GetMemberVariableOffset] offset of %s is %d",
"[GetMemberVariableOffset] offset of %s is %lld",
member_name.str().c_str(), *offset);
} else {
LLDB_LOGF(GetLogIfAllCategoriesSet(LIBLLDB_LOG_TYPES),
Expand Down Expand Up @@ -2033,7 +2033,7 @@ bool SwiftLanguageRuntime::IsTaggedPointer(lldb::addr_t addr,
// Check whether this is a reference to an Objective-C object.
if ((addr & 1) == 1)
return true;
}
} break;
default:
break;
}
Expand Down Expand Up @@ -2098,7 +2098,7 @@ lldb::addr_t SwiftLanguageRuntime::FixupAddress(lldb::addr_t addr,
if (extra_deref)
return refd_addr;
}
}
} break;
default:
break;
}
Expand Down

0 comments on commit 9c80a3d

Please sign in to comment.