Skip to content

Commit a725de5

Browse files
committed
Address review comments
1 parent 02d7fe5 commit a725de5

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

include/swift/IRGen/Linking.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ inline bool isEmbedded(CanType t) {
9090
return t->getASTContext().LangOpts.hasFeature(Feature::Embedded);
9191
}
9292
inline bool isEmbeddedWithoutEmbeddedExitentials(CanType t) {
93-
return t->getASTContext().LangOpts.hasFeature(Feature::Embedded) &&
94-
!t->getASTContext().LangOpts.hasFeature(Feature::EmbeddedExistentials);
93+
auto &langOpts = t->getASTContext().LangOpts;
94+
return langOpts.hasFeature(Feature::Embedded) &&
95+
!langOpts.hasFeature(Feature::EmbeddedExistentials);
9596
}
9697
// Metadata is not generated and not allowed to be referenced in Embedded Swift,
9798
// expect for classes (both generic and non-generic), dynamic self, and

lib/IRGen/GenDecl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5318,7 +5318,7 @@ llvm::GlobalValue *IRGenModule::defineTypeMetadata(
53185318
: LinkEntity::forTypeMetadata(
53195319
concreteType, TypeMetadataAddress::FullMetadata));
53205320

5321-
if (Context.LangOpts.hasFeature(Feature::Embedded) ) {
5321+
if (Context.LangOpts.hasFeature(Feature::Embedded)) {
53225322
entity = LinkEntity::forTypeMetadata(concreteType,
53235323
TypeMetadataAddress::AddressPoint);
53245324
if (Context.LangOpts.hasFeature(Feature::EmbeddedExistentials))

lib/IRGen/MetadataRequest.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3387,8 +3387,9 @@ llvm::Value *IRGenFunction::emitTypeMetadataRef(CanType type) {
33873387
MetadataResponse
33883388
IRGenFunction::emitTypeMetadataRef(CanType type,
33893389
DynamicMetadataRequest request) {
3390-
if (type->getASTContext().LangOpts.hasFeature(Feature::Embedded) &&
3391-
!type->getASTContext().LangOpts.hasFeature(Feature::EmbeddedExistentials) &&
3390+
auto &langOpts = type->getASTContext().LangOpts;
3391+
if (langOpts.hasFeature(Feature::Embedded) &&
3392+
!langOpts.hasFeature(Feature::EmbeddedExistentials) &&
33923393
!isMetadataAllowedInEmbedded(type)) {
33933394
llvm::errs() << "Metadata pointer requested in embedded Swift for type "
33943395
<< type << "\n";
@@ -3408,7 +3409,7 @@ IRGenFunction::emitTypeMetadataRef(CanType type,
34083409
if (type->hasArchetype() ||
34093410
!shouldTypeMetadataAccessUseAccessor(IGM, type) ||
34103411
isa<PackType>(type) ||
3411-
type->getASTContext().LangOpts.hasFeature(Feature::Embedded)) {
3412+
langOpts.hasFeature(Feature::Embedded)) {
34123413
return emitDirectTypeMetadataRef(*this, type, request);
34133414
}
34143415

0 commit comments

Comments
 (0)