Skip to content

Commit 9903d71

Browse files
committed
More changes to get off of ssize_t
1 parent 22349bc commit 9903d71

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

stdlib/public/runtime/Demangle.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,15 @@ _buildDemanglingForMetadataPack(MetadataPackPointer pack, size_t count,
267267
}
268268

269269
static Demangle::NodePointer
270-
_buildDemanglingForValue(size_t value, GenericValueDescriptor valueDescriptor,
270+
_buildDemanglingForValue(intptr_t value, GenericValueDescriptor valueDescriptor,
271271
Demangle::Demangler &Dem) {
272272
switch (valueDescriptor.Type) {
273273
case GenericValueType::Int: {
274-
auto signedValue = (ssize_t)value;
275-
276-
if (signedValue < 0) {
277-
return Dem.createNode(Node::Kind::NegativeInteger, signedValue);
274+
if (value < 0) {
275+
return Dem.createNode(Node::Kind::NegativeInteger, value);
278276
}
279277

280-
return Dem.createNode(Node::Kind::Integer, signedValue);
278+
return Dem.createNode(Node::Kind::Integer, value);
281279
}
282280
}
283281
}

stdlib/public/runtime/Private.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ class TypeInfo {
316316

317317
explicit MetadataPackOrValue(const void *ptr) : Ptr(ptr) {}
318318

319-
explicit MetadataPackOrValue(ssize_t value)
319+
explicit MetadataPackOrValue(intptr_t value)
320320
: Ptr(reinterpret_cast<const void *>(value)) {}
321321

322322
explicit MetadataPackOrValue(MetadataResponse response) : Ptr(response.Value) {}
@@ -362,8 +362,8 @@ class TypeInfo {
362362
fatalError(0, "Expected a metadata pack but got metadata\n");
363363
}
364364

365-
size_t getValue() const {
366-
return reinterpret_cast<size_t>(Ptr);
365+
intptr_t getValue() const {
366+
return reinterpret_cast<intptr_t>(Ptr);
367367
}
368368
};
369369

0 commit comments

Comments
 (0)