averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42553 from aschwaighofer/irgen_metadata_instantiation_readonly_willreturn

Browse Source 
IRGen: Set `readonly` and `willreturn` on meta data instantiation functions
This commit is contained in:
Arnold Schwaighofer
2022-04-22 07:54:09 -07:00
committed by GitHub
parent 5ffdf0ba44 4ad42e65f5
commit 0da2562a22
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/IRGen/MetadataRequest.cpp
View File

@@ -2276,7 +2276,8 @@ MetadataResponse irgen::emitGenericTypeMetadataAccessFunction(
// materialize the nominal type descriptor and call this thunk. // materialize the nominal type descriptor and call this thunk.
auto generateThunkFn = [&IGM, auto generateThunkFn = [&IGM,
checkPrespecialized](IRGenFunction &subIGF) { checkPrespecialized](IRGenFunction &subIGF) {
subIGF.CurFn->setDoesNotAccessMemory(); subIGF.CurFn->setOnlyReadsMemory();
subIGF.CurFn->setWillReturn();
subIGF.CurFn->setCallingConv(IGM.SwiftCC); subIGF.CurFn->setCallingConv(IGM.SwiftCC);
IGM.setHasNoFramePointer(subIGF.CurFn); IGM.setHasNoFramePointer(subIGF.CurFn);
@@ -2857,7 +2858,8 @@ emitMetadataAccessByMangledName(IRGenFunction &IGF, CanType type,
? "__swift_instantiateConcreteTypeFromMangledNameAbstract" ? "__swift_instantiateConcreteTypeFromMangledNameAbstract"
: "__swift_instantiateConcreteTypeFromMangledName"; : "__swift_instantiateConcreteTypeFromMangledName";
auto generateInstantiationFn = [&IGM, request](IRGenFunction &subIGF) { auto generateInstantiationFn = [&IGM, request](IRGenFunction &subIGF) {
subIGF.CurFn->setDoesNotAccessMemory(); subIGF.CurFn->setOnlyReadsMemory();
subIGF.CurFn->setWillReturn();
IGM.setHasNoFramePointer(subIGF.CurFn); IGM.setHasNoFramePointer(subIGF.CurFn);
auto params = subIGF.collectParameters(); auto params = subIGF.collectParameters();
@@ -2960,7 +2962,7 @@ emitMetadataAccessByMangledName(IRGenFunction &IGF, CanType type,
llvm::ConstantPointerNull::get(IGM.Int8PtrPtrTy)}); llvm::ConstantPointerNull::get(IGM.Int8PtrPtrTy)});
} }
call->setDoesNotThrow(); call->setDoesNotThrow();
call->setDoesNotAccessMemory(); call->setOnlyReadsMemory();
call->setCallingConv(IGM.SwiftCC); call->setCallingConv(IGM.SwiftCC);
// Store the result back to the cache. Metadata instantiation should // Store the result back to the cache. Metadata instantiation should
@@ -2995,7 +2997,7 @@ emitMetadataAccessByMangledName(IRGenFunction &IGF, CanType type,
auto call = IGF.Builder.CreateCall(instantiationFn, cache); auto call = IGF.Builder.CreateCall(instantiationFn, cache);
call->setDoesNotThrow(); call->setDoesNotThrow();
call->setDoesNotAccessMemory(); call->setOnlyReadsMemory();
auto response = MetadataResponse::forComplete(call); auto response = MetadataResponse::forComplete(call);

7
test/IRGen/default_function_ir_attributes.swift
View File

@@ -56,7 +56,7 @@ func foo() {}
// helper function: __swift_instantiateConcreteTypeFromMangledName // helper function: __swift_instantiateConcreteTypeFromMangledName
// CHECK-LABEL: define {{.*}} @__swift_instantiateConcreteTypeFromMangledName( // CHECK-LABEL: define {{.*}} @__swift_instantiateConcreteTypeFromMangledName(
// CHECK-SAME: [[ATTRS_NOINLINE_READNONE_NOUNWIND_NOFRAME:#[0-9]+]] // CHECK-SAME: [[ATTRS_NOINLINE_READONLY_NOUNWIND_NOFRAME:#[0-9]+]]
func use_metadata() -> Any.Type { func use_metadata() -> Any.Type {
return ((C) -> Int).self return ((C) -> Int).self
@@ -96,7 +96,7 @@ func test_class_existential_cast_3(value: AnyObject) -> C & CP0 {
// metadata accessor // metadata accessor
// CHECK-LABEL: define {{.*}} @"$s30default_function_ir_attributes1CCMa"( // CHECK-LABEL: define {{.*}} @"$s30default_function_ir_attributes1CCMa"(
// CHECK-SAME: [[ATTRS_NOINLINE_READNONE_NOUNWIND_NOFRAME]] // CHECK-SAME: [[ATTRS_NOINLINE_READNONE_NOUNWIND_NOFRAME:#[0-9]+]]
// helper function: dynamic_cast_existential_1_superclass_conditional // helper function: dynamic_cast_existential_1_superclass_conditional
// CHECK-LABEL: define {{.*}} @dynamic_cast_existential_1_superclass_conditional( // CHECK-LABEL: define {{.*}} @dynamic_cast_existential_1_superclass_conditional(
@@ -164,7 +164,7 @@ func test_computed_key_path_generic_thunks<T: P0 & Hashable>(value: T) -> KeyPat
// helper function: __swift_instantiateGenericMetadata // helper function: __swift_instantiateGenericMetadata
// CHECK-LABEL: define {{.*}} @__swift_instantiateGenericMetadata( // CHECK-LABEL: define {{.*}} @__swift_instantiateGenericMetadata(
// CHECK-SAME: [[ATTRS_NOINLINE_READNONE_NOUNWIND_NOFRAME]] // CHECK-SAME: [[ATTRS_NOINLINE_READONLY_NOUNWIND_NOFRAME]]
// Use the presence of a target-cpu attribute as a litmus for // Use the presence of a target-cpu attribute as a litmus for
// whether constructInitialAttributes was called, since it's very // whether constructInitialAttributes was called, since it's very
@@ -172,4 +172,5 @@ func test_computed_key_path_generic_thunks<T: P0 & Hashable>(value: T) -> KeyPat
// CHECK: attributes [[ATTRS_SIMPLE]] = { [[CUSTOM_ATTRS:.*target-cpu.*]] }{{$}} // CHECK: attributes [[ATTRS_SIMPLE]] = { [[CUSTOM_ATTRS:.*target-cpu.*]] }{{$}}
// CHECK-DAG: attributes [[ATTRS_NOINLINE_NOUNWIND]] = { noinline nounwind {{.*target-cpu.*}} } // CHECK-DAG: attributes [[ATTRS_NOINLINE_NOUNWIND]] = { noinline nounwind {{.*target-cpu.*}} }
// CHECK-DAG: attributes [[ATTRS_NOINLINE_READNONE_NOUNWIND_NOFRAME]] = { noinline nounwind readnone {{.*}}"frame-pointer"="none"{{.*target-cpu.*}} } // CHECK-DAG: attributes [[ATTRS_NOINLINE_READNONE_NOUNWIND_NOFRAME]] = { noinline nounwind readnone {{.*}}"frame-pointer"="none"{{.*target-cpu.*}} }
// CHECK-DAG: attributes [[ATTRS_NOINLINE_READONLY_NOUNWIND_NOFRAME]] = { noinline nounwind readonly willreturn {{.*}}"frame-pointer"="none"{{.*target-cpu.*}} }
// CHECK-DAG: attributes [[ATTRS_NOUNWIND]] = { nounwind [[CUSTOM_ATTRS]] }{{$}} // CHECK-DAG: attributes [[ATTRS_NOUNWIND]] = { nounwind [[CUSTOM_ATTRS]] }{{$}}

2
test/IRGen/generic_metatypes.swift
View File

@@ -145,5 +145,5 @@ func makeGenericMetatypes() {
// CHECK-NOT: call void @llvm.lifetime.end // CHECK-NOT: call void @llvm.lifetime.end
// CHECK: ret %swift.metadata_response // CHECK: ret %swift.metadata_response
// CHECK-DAG: attributes [[NOUNWIND_READNONE]] = { nounwind readnone } // CHECK-DAG: attributes [[NOUNWIND_READNONE]] = { nounwind readonly }
// CHECK-DAG: attributes [[NOUNWIND_OPT]] = { noinline nounwind " // CHECK-DAG: attributes [[NOUNWIND_OPT]] = { noinline nounwind "

2
test/IRGen/generic_metatypes_future.swift
View File

@@ -175,5 +175,5 @@ func makeGenericMetatypes() {
// CHECK-NOT: call void @llvm.lifetime.end // CHECK-NOT: call void @llvm.lifetime.end
// CHECK: ret %swift.metadata_response // CHECK: ret %swift.metadata_response
// CHECK-DAG: attributes [[NOUNWIND_READNONE]] = { nounwind readnone } // CHECK-DAG: attributes [[NOUNWIND_READNONE]] = { nounwind readonly }
// CHECK-DAG: attributes [[NOUNWIND_OPT]] = { noinline nounwind " // CHECK-DAG: attributes [[NOUNWIND_OPT]] = { noinline nounwind "