Skip to content

Commit 801b35e

Browse files
xedinxedin
committed
[ABI/Runtime] NFC: Rename function metadata arguments to parameters
1 parent f6b0d2d commit 801b35e

File tree

7 files changed

+46
-45
lines changed

7 files changed

+46
-45
lines changed

‎include/swift/ABI/MetadataValues.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -550,20 +550,21 @@ enum class FunctionMetadataConvention: uint8_t {
550550
template <typename int_type>
551551
class TargetFunctionTypeFlags {
552552
enum : int_type {
553-
NumArgumentsMask = 0x00FFFFFFU,
554-
ConventionMask = 0x0F000000U,
555-
ConventionShift = 25U,
556-
ThrowsMask = 0x10000000U,
557-
ParamFlagsMask = 0x01000000U,
553+
NumParametersMask = 0x00FFFFFFU,
554+
ConventionMask = 0x0F000000U,
555+
ConventionShift = 25U,
556+
ThrowsMask = 0x10000000U,
557+
ParamFlagsMask = 0x01000000U,
558558
};
559559
int_type Data;
560560

561561
constexpr TargetFunctionTypeFlags(int_type Data) : Data(Data) {}
562562
public:
563563
constexpr TargetFunctionTypeFlags() : Data(0) {}
564564

565-
constexpr TargetFunctionTypeFlags withNumArguments(unsigned numArguments) const {
566-
return TargetFunctionTypeFlags((Data & ~NumArgumentsMask) | numArguments);
565+
constexpr TargetFunctionTypeFlags
566+
withNumParameters(unsigned numParams) const {
567+
return TargetFunctionTypeFlags((Data & ~NumParametersMask) | numParams);
567568
}
568569

569570
constexpr TargetFunctionTypeFlags<int_type>
@@ -584,10 +585,8 @@ class TargetFunctionTypeFlags {
584585
(hasFlags ? ParamFlagsMask : 0));
585586
}
586587

587-
unsigned getNumArguments() const {
588-
return Data & NumArgumentsMask;
589-
}
590-
588+
unsigned getNumParameters() const { return Data & NumParametersMask; }
589+
591590
FunctionMetadataConvention getConvention() const {
592591
return FunctionMetadataConvention((Data&ConventionMask) >> ConventionShift);
593592
}

‎include/swift/Remote/MetadataReader.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ class MetadataReader {
798798
}
799799
case MetadataKind::Function: {
800800
auto Function = cast<TargetFunctionTypeMetadata<Runtime>>(Meta);
801-
auto numParameters = Function->getNumArguments();
801+
auto numParameters = Function->getNumParameters();
802802

803803
std::vector<FunctionParam<BuiltType>> Parameters;
804804
StoredPointer ArgumentAddress = MetadataAddress +
@@ -836,8 +836,10 @@ class MetadataReader {
836836
if (!Result)
837837
return BuiltType();
838838

839-
auto flags = FunctionTypeFlags().withConvention(Function->getConvention())
840-
.withThrows(Function->throws());
839+
auto flags = FunctionTypeFlags()
840+
.withConvention(Function->getConvention())
841+
.withThrows(Function->throws())
842+
.withParameterFlags(Function->hasParameterFlags());
841843
auto BuiltFunction =
842844
Builder.createFunctionType(Parameters, Result, flags);
843845
TypeCache[MetadataAddress] = BuiltFunction;

‎include/swift/Runtime/Metadata.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,39 +1745,39 @@ using EnumMetadata = TargetEnumMetadata<InProcess>;
17451745
template <typename Runtime>
17461746
struct TargetFunctionTypeMetadata : public TargetMetadata<Runtime> {
17471747
using StoredSize = typename Runtime::StoredSize;
1748-
using Argument = const TargetMetadata<Runtime> *;
1748+
using Parameter = const TargetMetadata<Runtime> *;
17491749

17501750
TargetFunctionTypeFlags<StoredSize> Flags;
17511751

17521752
/// The type metadata for the result type.
17531753
ConstTargetMetadataPointer<Runtime, swift::TargetMetadata> ResultType;
17541754

1755-
TargetPointer<Runtime, Argument> getArguments() {
1756-
return reinterpret_cast<TargetPointer<Runtime, Argument>>(this + 1);
1755+
TargetPointer<Runtime, Parameter> getParameters() {
1756+
return reinterpret_cast<TargetPointer<Runtime, Parameter>>(this + 1);
17571757
}
17581758

1759-
TargetPointer<Runtime, const Argument> getArguments() const {
1760-
return reinterpret_cast<TargetPointer<Runtime, const Argument>>(this + 1);
1759+
TargetPointer<Runtime, const Parameter> getParameters() const {
1760+
return reinterpret_cast<TargetPointer<Runtime, const Parameter>>(this + 1);
17611761
}
17621762

17631763
TargetPointer<Runtime, uint32_t> getParameterFlags() {
17641764
return reinterpret_cast<TargetPointer<Runtime, uint32_t>>(
1765-
reinterpret_cast<Argument *>(this + 1) + getNumArguments());
1765+
reinterpret_cast<Parameter *>(this + 1) + getNumParameters());
17661766
}
17671767

17681768
TargetPointer<Runtime, const uint32_t> getParameterFlags() const {
17691769
return reinterpret_cast<TargetPointer<Runtime, const uint32_t>>(
1770-
reinterpret_cast<const Argument *>(this + 1) + getNumArguments());
1770+
reinterpret_cast<const Parameter *>(this + 1) + getNumParameters());
17711771
}
17721772

17731773
ParameterFlags getParameterFlags(unsigned index) const {
1774-
assert(index < getNumArguments());
1774+
assert(index < getNumParameters());
17751775
auto flags = hasParameterFlags() ? getParameterFlags()[index] : 0;
17761776
return ParameterFlags::fromIntValue(flags);
17771777
}
17781778

1779-
StoredSize getNumArguments() const {
1780-
return Flags.getNumArguments();
1779+
StoredSize getNumParameters() const {
1780+
return Flags.getNumParameters();
17811781
}
17821782
FunctionMetadataConvention getConvention() const {
17831783
return Flags.getConvention();

‎lib/IRGen/GenMeta.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ namespace {
748748
}
749749

750750
auto flagsVal = FunctionTypeFlags()
751-
.withNumArguments(numParams)
751+
.withNumParameters(numParams)
752752
.withConvention(metadataConvention)
753753
.withThrows(type->throws())
754754
.withParameterFlags(hasFlags);

‎stdlib/public/runtime/Casting.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,14 +1920,14 @@ static bool _dynamicCastToFunction(OpaqueValue *dest,
19201920
// The result and argument types must match.
19211921
if (srcFn->ResultType != targetFn->ResultType)
19221922
return _fail(src, srcType, targetType, flags);
1923-
if (srcFn->getNumArguments() != targetFn->getNumArguments())
1923+
if (srcFn->getNumParameters() != targetFn->getNumParameters())
19241924
return _fail(src, srcType, targetType, flags);
19251925

19261926
if (srcFn->hasParameterFlags() != targetFn->hasParameterFlags())
19271927
return _fail(src, srcType, targetType, flags);
19281928

1929-
for (unsigned i = 0, e = srcFn->getNumArguments(); i < e; ++i) {
1930-
if (srcFn->getArguments()[i] != targetFn->getArguments()[i] ||
1929+
for (unsigned i = 0, e = srcFn->getNumParameters(); i < e; ++i) {
1930+
if (srcFn->getParameters()[i] != targetFn->getParameters()[i] ||
19311931
srcFn->getParameterFlags(i) != targetFn->getParameterFlags(i))
19321932
return _fail(src, srcType, targetType, flags);
19331933
}

‎stdlib/public/runtime/Demangle.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,10 @@ swift::_swift_buildDemanglingForMetadata(const Metadata *type,
319319
}
320320

321321
std::vector<NodePointer> inputs;
322-
for (unsigned i = 0, e = func->getNumArguments(); i < e; ++i) {
323-
auto arg = func->getArguments()[i];
322+
for (unsigned i = 0, e = func->getNumParameters(); i < e; ++i) {
323+
auto param = func->getParameters()[i];
324324
auto flags = func->getParameterFlags(i);
325-
auto input = _swift_buildDemanglingForMetadata(arg, Dem);
325+
auto input = _swift_buildDemanglingForMetadata(param, Dem);
326326

327327
if (flags.isInOut()) {
328328
NodePointer inout = Dem.createNode(Node::Kind::InOut);

‎stdlib/public/runtime/Metadata.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ class FunctionCacheEntry {
337337
}
338338

339339
::ParameterFlags getParameterFlags(unsigned index) const {
340-
assert(index < Flags.getNumArguments());
340+
assert(index < Flags.getNumParameters());
341341
auto flags = Flags.hasParameterFlags() ? ParameterFlags[index] : 0;
342342
return ParameterFlags::fromIntValue(flags);
343343
}
@@ -358,9 +358,9 @@ class FunctionCacheEntry {
358358
if (auto result = comparePointers(key.getResult(), Data.ResultType))
359359
return result;
360360

361-
for (unsigned i = 0, e = keyFlags.getNumArguments(); i != e; ++i) {
361+
for (unsigned i = 0, e = keyFlags.getNumParameters(); i != e; ++i) {
362362
if (auto result = comparePointers(key.getParameters()[i],
363-
Data.getArguments()[i]))
363+
Data.getParameters()[i]))
364364
return result;
365365

366366
if (auto result =
@@ -380,8 +380,8 @@ class FunctionCacheEntry {
380380
}
381381

382382
static size_t getExtraAllocationSize(const FunctionTypeFlags flags) {
383-
const auto numParams = flags.getNumArguments();
384-
auto size = numParams * sizeof(FunctionTypeMetadata::Argument);
383+
const auto numParams = flags.getNumParameters();
384+
auto size = numParams * sizeof(FunctionTypeMetadata::Parameter);
385385
if (flags.hasParameterFlags())
386386
size += numParams * sizeof(uint32_t);
387387

@@ -399,7 +399,7 @@ const FunctionTypeMetadata *
399399
swift::swift_getFunctionTypeMetadata1(FunctionTypeFlags flags,
400400
const Metadata *arg0,
401401
const Metadata *result) {
402-
assert(flags.getNumArguments() == 1
402+
assert(flags.getNumParameters() == 1
403403
&& "wrong number of arguments in function metadata flags?!");
404404
const Metadata *parameters[] = { arg0 };
405405
return swift_getFunctionTypeMetadata(flags, parameters, nullptr, result);
@@ -410,7 +410,7 @@ swift::swift_getFunctionTypeMetadata1WithFlags(FunctionTypeFlags flags,
410410
const Metadata *arg0,
411411
ParameterFlags flags0,
412412
const Metadata *result) {
413-
assert(flags.getNumArguments() == 1
413+
assert(flags.getNumParameters() == 1
414414
&& "wrong number of arguments in function metadata flags?!");
415415
const Metadata *parameters[] = { arg0 };
416416
const uint32_t parameterFlags[] = { flags0.getIntValue() };
@@ -425,7 +425,7 @@ swift::swift_getFunctionTypeMetadata2(FunctionTypeFlags flags,
425425
const Metadata *arg0,
426426
const Metadata *arg1,
427427
const Metadata *result) {
428-
assert(flags.getNumArguments() == 2
428+
assert(flags.getNumParameters() == 2
429429
&& "wrong number of arguments in function metadata flags?!");
430430
const Metadata *parameters[] = { arg0, arg1 };
431431
return swift_getFunctionTypeMetadata(flags, parameters, nullptr, result);
@@ -438,7 +438,7 @@ swift::swift_getFunctionTypeMetadata2WithFlags(FunctionTypeFlags flags,
438438
const Metadata *arg1,
439439
ParameterFlags flags1,
440440
const Metadata *result) {
441-
assert(flags.getNumArguments() == 2
441+
assert(flags.getNumParameters() == 2
442442
&& "wrong number of arguments in function metadata flags?!");
443443
const Metadata *parameters[] = { arg0, arg1 };
444444
const uint32_t parameterFlags[] = {
@@ -457,7 +457,7 @@ swift::swift_getFunctionTypeMetadata3(FunctionTypeFlags flags,
457457
const Metadata *arg1,
458458
const Metadata *arg2,
459459
const Metadata *result) {
460-
assert(flags.getNumArguments() == 3
460+
assert(flags.getNumParameters() == 3
461461
&& "wrong number of arguments in function metadata flags?!");
462462
const Metadata *parameters[] = { arg0, arg1, arg2 };
463463
return swift_getFunctionTypeMetadata(flags, parameters, nullptr, result);
@@ -472,7 +472,7 @@ swift::swift_getFunctionTypeMetadata3WithFlags(FunctionTypeFlags flags,
472472
const Metadata *arg2,
473473
ParameterFlags flags2,
474474
const Metadata *result) {
475-
assert(flags.getNumArguments() == 3
475+
assert(flags.getNumParameters() == 3
476476
&& "wrong number of arguments in function metadata flags?!");
477477
const Metadata *parameters[] = { arg0, arg1, arg2 };
478478
const uint32_t parameterFlags[] = {
@@ -522,14 +522,14 @@ FunctionCacheEntry::FunctionCacheEntry(Key key) {
522522
break;
523523
}
524524

525-
unsigned numArguments = flags.getNumArguments();
525+
unsigned numParameters = flags.getNumParameters();
526526

527527
Data.setKind(MetadataKind::Function);
528528
Data.Flags = flags;
529529
Data.ResultType = key.getResult();
530530

531-
for (unsigned i = 0; i < numArguments; ++i) {
532-
Data.getArguments()[i] = key.getParameters()[i];
531+
for (unsigned i = 0; i < numParameters; ++i) {
532+
Data.getParameters()[i] = key.getParameters()[i];
533533
if (flags.hasParameterFlags())
534534
Data.getParameterFlags()[i] = key.getParameterFlags(i).getIntValue();
535535
}

0 commit comments

Comments
 (0)