Skip to content

[RemoteAST] Fix metadata reader to properly read tuple type metadata #12766

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
Nov 6, 2017
Merged

[RemoteAST] Fix metadata reader to properly read tuple type metadata #12766

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
16 changes: 4 additions & 12 deletions include/swift/Remote/MetadataReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,16 +777,8 @@ class MetadataReader {
std::vector<BuiltType> elementTypes;
elementTypes.reserve(tupleMeta->NumElements);

StoredPointer elementAddress = MetadataAddress +
sizeof(TargetTupleTypeMetadata<Runtime>);
using Element = typename TargetTupleTypeMetadata<Runtime>::Element;
for (StoredPointer i = 0; i < tupleMeta->NumElements; ++i,
elementAddress += sizeof(Element)) {
Element element;
if (!Reader->readBytes(RemoteAddress(elementAddress),
(uint8_t*)&element, sizeof(Element)))
return BuiltType();

for (unsigned i = 0, n = tupleMeta->NumElements; i != n; ++i) {
auto &element = tupleMeta->getElement(i);
if (auto elementType = readTypeFromMetadata(element.Type))
elementTypes.push_back(elementType);
else
Expand Down Expand Up @@ -1226,8 +1218,8 @@ class MetadataReader {
if (!Reader->readInteger(RemoteAddress(numElementsAddress),
&numElements))
return nullptr;
auto totalSize = sizeof(TargetTupleTypeMetadata<Runtime>)
+ numElements * sizeof(StoredPointer);
auto totalSize = sizeof(TargetTupleTypeMetadata<Runtime>) +
numElements * sizeof(TupleTypeMetadata::Element);

// Make sure the number of elements is reasonable
if (numElements >= 256)
Expand Down