Skip to content

[Runtime] Fix subscript key path printing when arguments can't be resolved. #63305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2023
Merged

[Runtime] Fix subscript key path printing when arguments can't be resolved. #63305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions lib/Demangling/NodePrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3407,6 +3407,11 @@ std::string Demangle::keyPathSourceString(const char *MangledName,
case Node::Kind::Subscript: {
std::string subscriptText = "subscript(";
std::vector<std::string> argumentTypeNames;
auto getArgumentTypeName = [&argumentTypeNames](size_t i) {
if (i < argumentTypeNames.size())
return argumentTypeNames[i];
return std::string("<unknown>");
};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:-) Neat fix.

// Multiple arguments case
NodePointer argList = matchSequenceOfKinds(
child, {
Expand Down Expand Up @@ -3454,27 +3459,27 @@ std::string Demangle::keyPathSourceString(const char *MangledName,
if (child->getKind() == Node::Kind::LabelList) {
size_t numChildren = child->getNumChildren();
if (numChildren == 0) {
subscriptText += unlabelledArg + argumentTypeNames[0];
subscriptText += unlabelledArg + getArgumentTypeName(0);
} else {
while (idx < numChildren) {
Node *argChild = child->getChild(idx);
idx += 1;
if (argChild->getKind() == Node::Kind::Identifier) {
subscriptText += std::string(argChild->getText()) + ": " +
argumentTypeNames[idx - 1];
getArgumentTypeName(idx - 1);
if (idx != numChildren) {
subscriptText += ", ";
}
} else if (argChild->getKind() ==
Node::Kind::FirstElementMarker ||
argChild->getKind() == Node::Kind::VariadicMarker) {
subscriptText += unlabelledArg + argumentTypeNames[idx - 1];
subscriptText += unlabelledArg + getArgumentTypeName(idx - 1);
}
}
}
}
} else {
subscriptText += unlabelledArg + argumentTypeNames[0];
subscriptText += unlabelledArg + getArgumentTypeName(0);
}
return subscriptText + ")";
}
Expand Down
26 changes: 26 additions & 0 deletions test/Interpreter/keypath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,21 @@ class Controller {
0
}

subscript<T>(array: [T]) -> T? {
array.first
}

subscript<T, U>(array: [T], array2: [U]) -> T? {
array.first
}

subscript<T>(array array: [T]) -> T? {
array.first
}

subscript<T, U>(array array: [T], array2 array2: [U]) -> T? {
array.first
}
}

struct S {
Expand Down Expand Up @@ -95,3 +110,14 @@ print(\Controller.thirdLabel)
print(\Controller.[])
// CHECK: \Controller.self
print(\Controller.self)

// Subscripts with dependent generic types don't produce good output currently,
// so we're just checking to make sure they don't crash.
// CHECK: \Controller.
print(\Controller[[42]])
// CHECK: Controller.
print(\Controller[[42], [42]])
// CHECK: \Controller.
print(\Controller[array: [42]])
// CHECK: \Controller.
print(\Controller[array: [42], array2: [42]])
2 changes: 2 additions & 0 deletions test/stdlib/symbol-visibility-linux.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
// RUN: -e _ZSt9call_onceIRFvPvEJDnEEvRSt9once_flagOT_DpOT0_ \
// RUN: -e _ZNKSt8functionIFSsmmEEclEmm \
// RUN: -e _ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_ \
// RUN: -e _ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EERKS8_OS8_ \
// RUN: -e _ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EERKS8_SA_ \
// RUN: > %t/swiftCore-all.txt
// RUN: %llvm-nm --defined-only --extern-only --no-weak %platform-dylib-dir/%target-library-name(swiftCore) > %t/swiftCore-no-weak.txt
Expand Down Expand Up @@ -67,6 +68,7 @@
// RUN: -e _ZSt9call_onceIRFvPvEJDnEEvRSt9once_flagOT_DpOT0_ \
// RUN: -e _ZNKSt8functionIFSsmmEEclEmm \
// RUN: -e _ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_ \
// RUN: -e _ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EERKS8_OS8_ \
// RUN: -e _ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EERKS8_SA_ \
// RUN: > %t/swiftRemoteMirror-all.txt
// RUN: %llvm-nm --defined-only --extern-only --no-weak %platform-dylib-dir/%target-library-name(swiftRemoteMirror) > %t/swiftRemoteMirror-no-weak.txt
Expand Down