This is an archive of the discontinued LLVM Phabricator instance.

Differential D142714

[lldb][CXXModuleHandler] Set TemplateArgument::IsDefaulted
ClosedPublic

Authored by Michael137 on Jan 27 2023, 6:19 AM.

Details

Reviewers
aprantl
labath
DavidSpickett
Commits
rG12e8e3fe90c9: [lldb][CXXModuleHandler] Set TemplateArgument::IsDefaulted
Summary

Since https://reviews.llvm.org/D141827 this field gets used
to print type names. Thus propagate it after importing TemplateArguments
from modules.

Testing

  • Confirmed that this fixes the ongoing import-std-module test failures.

Diff Detail

Event Timeline

Michael137 created this revision.Jan 27 2023, 6:19 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 27 2023, 6:19 AM
Michael137 requested review of this revision.Jan 27 2023, 6:19 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 27 2023, 6:19 AM
Herald added a subscriber: lldb-commits. · View Herald Transcript
Michael137 added a reviewer: DavidSpickett.Jan 27 2023, 6:19 AM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptJan 27 2023, 6:19 AM
Michael137 added a parent revision: D141827: [clang][TypePrinter] Test TemplateArgument::IsDefaulted when omitting default arguments.Jan 27 2023, 6:20 AM
Michael137 edited parent revisions, added: D142713: [clang][ASTImporter] Propagate TemplateArgument::IsDefaulted during import; removed: D141827: [clang][TypePrinter] Test TemplateArgument::IsDefaulted when omitting default arguments.
Harbormaster completed remote builds in B210341: Diff 492731.Jan 27 2023, 6:22 AM
Michael137 mentioned this in D141828: [lldb] Add support for DW_AT_default_value in template params.Jan 27 2023, 6:28 AM
aprantl accepted this revision.Jan 27 2023, 8:36 AM
This revision is now accepted and ready to land.Jan 27 2023, 8:36 AM
Closed by commit rG12e8e3fe90c9: [lldb][CXXModuleHandler] Set TemplateArgument::IsDefaulted (authored by Michael137). · Explain WhyJan 27 2023, 8:39 AM
This revision was automatically updated to reflect the committed changes.
Michael137 added a commit: rG12e8e3fe90c9: [lldb][CXXModuleHandler] Set TemplateArgument::IsDefaulted.

Revision Contents

PathSize
lldb/
source/
Plugins/
ExpressionParser/
Clang/
7 lines

Diff 492773

lldb/source/Plugins/ExpressionParser/Clang/CxxModuleHandler.cpp

Show First 20 Lines • Show All 233 Lines • ▼ Show 20 Linesstd::optional<Decl *> CxxModuleHandler::tryInstantiateStdTemplate(Decl *d) {
for (const TemplateArgument &arg : foreign_args.asArray()) { for (const TemplateArgument &arg : foreign_args.asArray()) {
switch (arg.getKind()) { switch (arg.getKind()) {
case TemplateArgument::Type: { case TemplateArgument::Type: {
llvm::Expected<QualType> type = m_importer->Import(arg.getAsType()); llvm::Expected<QualType> type = m_importer->Import(arg.getAsType());
if (!type) { if (!type) {
LLDB_LOG_ERROR(log, type.takeError(), "Couldn't import type: {0}"); LLDB_LOG_ERROR(log, type.takeError(), "Couldn't import type: {0}");
return std::nullopt; return std::nullopt;
} }
imported_args.push_back(TemplateArgument(*type)); imported_args.push_back(
TemplateArgument(*type, /*isNullPtr*/ false, arg.getIsDefaulted()));
break; break;
} }
case TemplateArgument::Integral: { case TemplateArgument::Integral: {
llvm::APSInt integral = arg.getAsIntegral(); llvm::APSInt integral = arg.getAsIntegral();
llvm::Expected<QualType> type = llvm::Expected<QualType> type =
m_importer->Import(arg.getIntegralType()); m_importer->Import(arg.getIntegralType());
if (!type) { if (!type) {
LLDB_LOG_ERROR(log, type.takeError(), "Couldn't import type: {0}"); LLDB_LOG_ERROR(log, type.takeError(), "Couldn't import type: {0}");
return std::nullopt; return std::nullopt;
} }
imported_args.push_back( imported_args.push_back(TemplateArgument(d->getASTContext(), integral,
TemplateArgument(d->getASTContext(), integral, *type)); *type, arg.getIsDefaulted()));
break; break;
} }
default: default:
assert(false && "templateArgsAreSupported not updated?"); assert(false && "templateArgsAreSupported not updated?");
} }
} }
// Find the class template specialization declaration that // Find the class template specialization declaration that
Show All 34 Lines