Skip to content

Commit 78a406a

Browse files
authored
In Metadata.h/.cpp, start building the relative wtable support even on platforms that don't use it yet (#64354)
1 parent 209fe7b commit 78a406a

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

include/swift/Runtime/Metadata.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,11 @@ swift_getWitnessTable(const ProtocolConformanceDescriptor *conformance,
369369
const Metadata *type,
370370
const void * const *instantiationArgs);
371371

372-
#if SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES
373372
SWIFT_RUNTIME_EXPORT
374373
const RelativeWitnessTable *
375374
swift_getWitnessTableRelative(const ProtocolConformanceDescriptor *conformance,
376375
const Metadata *type,
377376
const void * const *instantiationArgs);
378-
#endif
379377

380378
/// Retrieve an associated type witness from the given witness table.
381379
///
@@ -392,15 +390,13 @@ MetadataResponse swift_getAssociatedTypeWitness(
392390
const Metadata *conformingType,
393391
const ProtocolRequirement *reqBase,
394392
const ProtocolRequirement *assocType);
395-
#if SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES
396393
SWIFT_RUNTIME_EXPORT SWIFT_CC(swift)
397394
MetadataResponse swift_getAssociatedTypeWitnessRelative(
398395
MetadataRequest request,
399396
RelativeWitnessTable *wtable,
400397
const Metadata *conformingType,
401398
const ProtocolRequirement *reqBase,
402399
const ProtocolRequirement *assocType);
403-
#endif
404400
/// Retrieve an associated conformance witness table from the given witness
405401
/// table.
406402
///
@@ -419,15 +415,13 @@ const WitnessTable *swift_getAssociatedConformanceWitness(
419415
const ProtocolRequirement *reqBase,
420416
const ProtocolRequirement *assocConformance);
421417

422-
#if SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES
423418
SWIFT_RUNTIME_EXPORT SWIFT_CC(swift)
424419
const RelativeWitnessTable *swift_getAssociatedConformanceWitnessRelative(
425420
RelativeWitnessTable *wtable,
426421
const Metadata *conformingType,
427422
const Metadata *assocType,
428423
const ProtocolRequirement *reqBase,
429424
const ProtocolRequirement *assocConformance);
430-
#endif
431425

432426
/// Determine whether two protocol conformance descriptors describe the same
433427
/// conformance of a type to a protocol.

stdlib/public/runtime/Metadata.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5689,7 +5689,6 @@ swift::swift_getWitnessTable(const ProtocolConformanceDescriptor *conformance,
56895689
return uniqueForeignWitnessTableRef(result.second);
56905690
}
56915691

5692-
#if SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES
56935692
namespace {
56945693

56955694
/// A cache-entry type suitable for use with LockingConcurrentMap.
@@ -5987,7 +5986,6 @@ swift::swift_getWitnessTableRelative(const ProtocolConformanceDescriptor *confor
59875986
return reinterpret_cast<RelativeWitnessTable*>(((uintptr_t)table) |
59885987
(uintptr_t)0x1);
59895988
}
5990-
#endif
59915989

59925990
/// Find the name of the associated type with the given descriptor.
59935991
static StringRef findAssociatedTypeName(const ProtocolDescriptor *protocol,
@@ -6209,7 +6207,6 @@ RelativeWitnessTable *swift::lookThroughOptionalConditionalWitnessTable(
62096207
return table;
62106208
}
62116209

6212-
#if SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES
62136210
SWIFT_CC(swift)
62146211
static MetadataResponse
62156212
swift_getAssociatedTypeWitnessRelativeSlowImpl(
@@ -6307,7 +6304,6 @@ swift::swift_getAssociatedTypeWitnessRelative(MetadataRequest request,
63076304
conformingType, reqBase,
63086305
assocType);
63096306
}
6310-
#endif
63116307

63126308
using AssociatedConformanceWitness = std::atomic<void *>;
63136309

@@ -6452,7 +6448,6 @@ const WitnessTable *swift::swift_getAssociatedConformanceWitness(
64526448
assocConformance);
64536449
}
64546450

6455-
#if SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES
64566451
SWIFT_CC(swift)
64576452
static const RelativeWitnessTable *swift_getAssociatedConformanceWitnessRelativeSlowImpl(
64586453
RelativeWitnessTable *wtable,
@@ -6541,7 +6536,6 @@ const RelativeWitnessTable *swift::swift_getAssociatedConformanceWitnessRelative
65416536
assocType, reqBase,
65426537
assocConformance);
65436538
}
6544-
#endif
65456539

65466540
bool swift::swift_compareProtocolConformanceDescriptors(
65476541
const ProtocolConformanceDescriptor *lhs,

0 commit comments

Comments
 (0)