diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestors-1distinct_use-1st_ancestor_generic-1argument-1st_argument_constant_int-2nd_ancestor_generic-1st-argument_constant_double.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_con_double.swift similarity index 100% rename from test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestors-1distinct_use-1st_ancestor_generic-1argument-1st_argument_constant_int-2nd_ancestor_generic-1st-argument_constant_double.swift rename to test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_con_double.swift diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestors-1distinct_use-1st_ancestor_generic-1argument-1st_argument_constant_int-2nd_ancestor_generic-1st-argument_subclass_argument.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_subclass_arg.swift similarity index 100% rename from test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestors-1distinct_use-1st_ancestor_generic-1argument-1st_argument_constant_int-2nd_ancestor_generic-1st-argument_subclass_argument.swift rename to test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_subclass_arg.swift diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestors-1distinct_use-1st_ancestor_generic-1argument-1st_argument_subclass_argument-2nd_ancestor_generic-1st-argument_constant_int.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subclass_arg-2nd_anc_gen-1st-arg_con_int.swift similarity index 84% rename from test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestors-1distinct_use-1st_ancestor_generic-1argument-1st_argument_subclass_argument-2nd_ancestor_generic-1st-argument_constant_int.swift rename to test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subclass_arg-2nd_anc_gen-1st-arg_con_int.swift index 32f884d6f10fe..92fb12077cfb7 100644 --- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestors-1distinct_use-1st_ancestor_generic-1argument-1st_argument_subclass_argument-2nd_ancestor_generic-1st-argument_constant_int.swift +++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subclass_arg-2nd_anc_gen-1st-arg_con_int.swift @@ -5,15 +5,15 @@ // UNSUPPORTED: CPU=armv7 && OS=ios // UNSUPPORTED: CPU=armv7s && OS=ios -// CHECK-DAG: @"$s4main9Ancestor1[[UNIQUE_ID_1:[0-9a-zA-Z_]+]]CySSGMf" = -// CHECK-DAG: @"$s4main9Ancestor2[[UNIQUE_ID_1]]CySiGMf" = +// CHECK-DAG: @"$s4main9Ancestor1[[UNIQUE_ID_1:[0-9a-zA-Z_]+]]LLCySSGMf" = +// CHECK-DAG: @"$s4main9Ancestor2[[UNIQUE_ID_1]]LLCySiGMf" = -// CHECK: @"$s4main5Value[[UNIQUE_ID_1]]CySSGMf" = linkonce_odr hidden +// CHECK: @"$s4main5Value[[UNIQUE_ID_1]]LLCySSGMf" = linkonce_odr hidden // CHECK-unknown-SAME: constant // CHECK-apple-SAME: global // CHECK-SAME: <{ // CHECK-SAME: void ( -// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]C* +// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]LLC* // CHECK-SAME: )*, // CHECK-SAME: i8**, // : [[INT]], @@ -30,17 +30,17 @@ // CHECK-SAME: i32, // CHECK-SAME: %swift.type_descriptor*, // CHECK-SAME: void ( -// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]C* +// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]LLC* // CHECK-SAME: )*, // CHECK-SAME: %swift.type*, // CHECK-SAME: [[INT]], -// CHECK-SAME: %T4main9Ancestor1[[UNIQUE_ID_1]]C* ( +// CHECK-SAME: %T4main9Ancestor1[[UNIQUE_ID_1]]LLC* ( // CHECK-SAME: %TSi*, // CHECK-SAME: %swift.type* // CHECK-SAME: )*, // CHECK-SAME: %swift.type*, // CHECK-SAME: [[INT]], -// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]C* ( +// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]LLC* ( // CHECK-SAME: %swift.opaque*, // CHECK-SAME: %swift.type* // CHECK-SAME: )*, @@ -48,17 +48,17 @@ // CHECK-SAME: [[INT]] // CHECK-SAME: }> <{ // CHECK-SAME: void ( -// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]C* -// CHECK-SAME: $s4main5Value[[UNIQUE_ID_1]]CfD +// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]LLC* +// CHECK-SAME: $s4main5Value[[UNIQUE_ID_1]]LLCfD // CHECK-SAME: $sBoWV -// CHECK-apple-SAME: $s4main5Value[[UNIQUE_ID_1]]CySSGMM +// CHECK-apple-SAME: $s4main5Value[[UNIQUE_ID_1]]LLCySSGMM // CHECK-unknown-SAME: [[INT]] 0, // : %swift.type* getelementptr inbounds ( // : %swift.full_heapmetadata, // : %swift.full_heapmetadata* bitcast ( // : <{ // : void ( -// : %T4main9Ancestor1[[UNIQUE_ID_1]]C* +// : %T4main9Ancestor1[[UNIQUE_ID_1]]LLC* // : )*, // : i8**, // : [[INT]], @@ -75,21 +75,21 @@ // : i32, // : %swift.type_descriptor*, // : void ( -// : %T4main9Ancestor1[[UNIQUE_ID_1]]C* +// : %T4main9Ancestor1[[UNIQUE_ID_1]]LLC* // : )*, // : %swift.type*, // : [[INT]], -// : %T4main9Ancestor1[[UNIQUE_ID_1]]C* ( +// : %T4main9Ancestor1[[UNIQUE_ID_1]]LLC* ( // : %TSi*, // : %swift.type* // : )*, // : %swift.type*, // : [[INT]], -// : %T4main9Ancestor1[[UNIQUE_ID_1]]C* ( +// : %T4main9Ancestor1[[UNIQUE_ID_1]]LLC* ( // : %swift.opaque*, // : %swift.type* // : )* -// : }>* @"$s4main9Ancestor1[[UNIQUE_ID_1]]CySSGMf" to %swift.full_heapmetadata* +// : }>* @"$s4main9Ancestor1[[UNIQUE_ID_1]]LLCySSGMf" to %swift.full_heapmetadata* // : ), // : i32 0, // : i32 2 @@ -122,7 +122,7 @@ // CHECK-apple-SAME: }*, // CHECK-apple-SAME: i8*, // CHECK-apple-SAME: i8* -// CHECK-apple-SAME: }* @_DATA__TtC4mainP33_3988F8479474ED01F0E6D128C27960415Value to [[INT]] +// CHECK-apple-SAME: }* @_DATA__TtC4mainP[[UNIQUE_ID_1]]5Value to [[INT]] // CHECK-apple-SAME: ), // CHECK-apple-SAME: [[INT]] 2 // CHECK-apple-SAME: ), @@ -159,23 +159,23 @@ // : i8, // : i32, // : %swift.method_override_descriptor -// : }>* @"$s4main5Value[[UNIQUE_ID_1]]CMn" to %swift.type_descriptor* +// : }>* @"$s4main5Value[[UNIQUE_ID_1]]LLCMn" to %swift.type_descriptor* // : ), // CHECK-SAME: void ( -// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]C* -// CHECK-SAME: $s4main5Value[[UNIQUE_ID_1]]CfE +// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]LLC* +// CHECK-SAME: $s4main5Value[[UNIQUE_ID_1]]LLCfE // CHECK-SAME: %swift.type* @"$sSSN", // CHECK-SAME: [[INT]] {{(16|8)}}, -// CHECK-SAME: %T4main9Ancestor1[[UNIQUE_ID_1]]C* ( +// CHECK-SAME: %T4main9Ancestor1[[UNIQUE_ID_1]]LLC* ( // CHECK-SAME: %TSi*, // CHECK-SAME: %swift.type* -// CHECK-SAME: $s4main9Ancestor1[[UNIQUE_ID_1]]C5firstADyxGSi_tcfCAA9Ancestor2ACLLCAeHyxGx_tcfCTV +// CHECK-SAME: $s4main9Ancestor1[[UNIQUE_ID_1]]LLC5firstADyxGSi_tcfCAA9Ancestor2ACLLCAeHyxGx_tcfCTV // CHECK-SAME: %swift.type* @"$sSSN", // CHECK-SAME: [[INT]] {{(24|12)}}, -// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]C* ( +// CHECK-SAME: %T4main5Value[[UNIQUE_ID_1]]LLC* ( // CHECK-SAME: %swift.opaque*, // CHECK-SAME: %swift.type* -// CHECK-SAME: $s4main5Value[[UNIQUE_ID_1]]C5firstADyxGx_tcfC +// CHECK-SAME: $s4main5Value[[UNIQUE_ID_1]]LLC5firstADyxGx_tcfC // CHECK-SAME: %swift.type* @"$sSSN", // CHECK-SAME: [[INT]] {{(40|24)}} // CHECK-SAME: }>, @@ -214,7 +214,7 @@ func consume(_ t: T) { } // CHECK: define hidden swiftcc void @"$s4main4doityyF"() #{{[0-9]+}} { -// CHECK: [[METADATA_RESPONSE:%[0-9]+]] = call swiftcc %swift.metadata_response @"$s4main5Value[[UNIQUE_ID_1]]CySSGMb"([[INT]] 0) +// CHECK: [[METADATA_RESPONSE:%[0-9]+]] = call swiftcc %swift.metadata_response @"$s4main5Value[[UNIQUE_ID_1]]LLCySSGMb"([[INT]] 0) // CHECK: [[METADATA:%[0-9]+]] = extractvalue %swift.metadata_response [[METADATA_RESPONSE]], 0 // CHECK: call swiftcc void @"$s4main7consumeyyxlF"( // CHECK-SAME: %swift.opaque* noalias nocapture {{%[0-9]+}}, @@ -225,7 +225,7 @@ func doit() { } doit() -// CHECK: define internal swiftcc %swift.metadata_response @"$s4main9Ancestor2[[UNIQUE_ID_1]]CMa"([[INT]] [[METADATA_REQUEST:%[0-9]+]], %swift.type* %1) #{{[0-9]+}} { +// CHECK: define internal swiftcc %swift.metadata_response @"$s4main9Ancestor2[[UNIQUE_ID_1]]LLCMa"([[INT]] [[METADATA_REQUEST:%[0-9]+]], %swift.type* %1) #{{[0-9]+}} { // CHECK: entry: // CHECK: [[ERASED_TYPE:%[0-9]+]] = bitcast %swift.type* %1 to i8* // CHECK: br label %[[TYPE_COMPARISON_LABEL:[0-9]+]] @@ -236,7 +236,7 @@ doit() // CHECK: [[EQUAL_TYPES:%[0-9]+]] = and i1 true, [[EQUAL_TYPE]] // CHECK: br i1 [[EQUAL_TYPES]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]] // CHECK: [[EXIT_PRESPECIALIZED]]: -// CHECK-NEXT: [[METADATA_RESPONSE:%[0-9]+]] = call swiftcc %swift.metadata_response @"$s4main9Ancestor2[[UNIQUE_ID_3:[0-9A-Z_]+]]CySiGMb"([[INT]] [[METADATA_REQUEST]]) +// CHECK-NEXT: [[METADATA_RESPONSE:%[0-9]+]] = call swiftcc %swift.metadata_response @"$s4main9Ancestor2[[UNIQUE_ID_3:[0-9A-Z_]+]]LLCySiGMb"([[INT]] [[METADATA_REQUEST]]) // CHECK: [[METADATA:%[0-9]+]] = extractvalue %swift.metadata_response [[METADATA_RESPONSE]], 0 // CHECK: [[PARTIAL_RESULT_METADATA:%[\" a-zA-Z0-9]+]] = insertvalue %swift.metadata_response undef, %swift.type* [[METADATA]], 0 // CHECK: [[RESULT_METADATA:%[\" a-zA-Z0-9]+]] = insertvalue %swift.metadata_response [[PARTIAL_RESULT_METADATA]], [[INT]] 0, 1 @@ -249,14 +249,14 @@ doit() // CHECK-SAME: i8* undef, // : %swift.type_descriptor* bitcast ( // : <{ i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i16, i16, i16, i16, i8, i8, i8, i8, i32, i32, %swift.method_descriptor }>* -// CHECK-SAME: $s4main9Ancestor2[[UNIQUE_ID_1]]CMn +// CHECK-SAME: $s4main9Ancestor2[[UNIQUE_ID_1]]LLCMn // : to %swift.type_descriptor* // : ) // CHECK-SAME: ) #{{[0-9]+}} // CHECK: ret %swift.metadata_response {{%[0-9]+}} // CHECK: } -// CHECK: define internal swiftcc %swift.metadata_response @"$s4main9Ancestor1[[UNIQUE_ID_1]]CMa"([[INT]] [[METADATA_REQUEST:%[0-9]+]], %swift.type* %1) #{{[0-9]+}} { +// CHECK: define internal swiftcc %swift.metadata_response @"$s4main9Ancestor1[[UNIQUE_ID_1]]LLCMa"([[INT]] [[METADATA_REQUEST:%[0-9]+]], %swift.type* %1) #{{[0-9]+}} { // CHECK: entry: // CHECK: [[ERASED_TYPE:%[0-9]+]] = bitcast %swift.type* %1 to i8* // CHECK: br label %[[TYPE_COMPARISON_LABEL:[0-9]+]] @@ -267,7 +267,7 @@ doit() // CHECK: [[EQUAL_TYPES:%[0-9]+]] = and i1 true, [[EQUAL_TYPE]] // CHECK: br i1 [[EQUAL_TYPES]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]] // CHECK: [[EXIT_PRESPECIALIZED]]: -// CHECK-NEXT: [[METADATA_RESPONSE:%[0-9]+]] = call swiftcc %swift.metadata_response @"$s4main9Ancestor1[[UNIQUE_ID_3:[0-9A-Z_]+]]CySSGMb"([[INT]] [[METADATA_REQUEST]]) +// CHECK-NEXT: [[METADATA_RESPONSE:%[0-9]+]] = call swiftcc %swift.metadata_response @"$s4main9Ancestor1[[UNIQUE_ID_3:[0-9A-Z_]+]]LLCySSGMb"([[INT]] [[METADATA_REQUEST]]) // CHECK: [[METADATA:%[0-9]+]] = extractvalue %swift.metadata_response [[METADATA_RESPONSE]], 0 // CHECK: [[PARTIAL_RESULT_METADATA:%[\" a-zA-Z0-9]+]] = insertvalue %swift.metadata_response undef, %swift.type* [[METADATA]], 0 // CHECK: [[RESULT_METADATA:%[\" a-zA-Z0-9]+]] = insertvalue %swift.metadata_response [[PARTIAL_RESULT_METADATA]], [[INT]] 0, 1 @@ -280,14 +280,14 @@ doit() // CHECK-SAME: i8* undef, // : %swift.type_descriptor* bitcast ( // : <{ i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i16, i16, i16, i16, i8, i8, i8, i8, i32, i32, %swift.method_descriptor, i32, %swift.method_override_descriptor }>* -// CHECK-SAME: $s4main9Ancestor1[[UNIQUE_ID_1]]CMn +// CHECK-SAME: $s4main9Ancestor1[[UNIQUE_ID_1]]LLCMn // : to %swift.type_descriptor* // : ) // CHECK-SAME: ) #{{[0-9]+}} // CHECK: ret %swift.metadata_response {{%[0-9]+}} // CHECK: } -// CHECK: define internal swiftcc %swift.metadata_response @"$s4main5Value[[UNIQUE_ID_1]]CMa"([[INT]] [[METADATA_REQUEST:%[0-9]+]], %swift.type* %1) #{{[0-9]+}} { +// CHECK: define internal swiftcc %swift.metadata_response @"$s4main5Value[[UNIQUE_ID_1]]LLCMa"([[INT]] [[METADATA_REQUEST:%[0-9]+]], %swift.type* %1) #{{[0-9]+}} { // CHECK: entry: // CHECK: [[ERASED_TYPE:%[0-9]+]] = bitcast %swift.type* %1 to i8* // CHECK: br label %[[TYPE_COMPARISON_LABEL:[0-9]+]] @@ -298,7 +298,7 @@ doit() // CHECK: [[EQUAL_TYPES:%[0-9]+]] = and i1 true, [[EQUAL_TYPE]] // CHECK: br i1 [[EQUAL_TYPES]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]] // CHECK: [[EXIT_PRESPECIALIZED]]: -// CHECK-NEXT: [[METADATA_RESPONSE:%[0-9]+]] = call swiftcc %swift.metadata_response @"$s4main5Value[[UNIQUE_ID_3:[0-9A-Z_]+]]CySSGMb"([[INT]] [[METADATA_REQUEST]]) +// CHECK-NEXT: [[METADATA_RESPONSE:%[0-9]+]] = call swiftcc %swift.metadata_response @"$s4main5Value[[UNIQUE_ID_3:[0-9A-Z_]+]]LLCySSGMb"([[INT]] [[METADATA_REQUEST]]) // CHECK: [[METADATA:%[0-9]+]] = extractvalue %swift.metadata_response [[METADATA_RESPONSE]], 0 // CHECK: [[PARTIAL_RESULT_METADATA:%[\" a-zA-Z0-9]+]] = insertvalue %swift.metadata_response undef, %swift.type* [[METADATA]], 0 // CHECK: [[RESULT_METADATA:%[\" a-zA-Z0-9]+]] = insertvalue %swift.metadata_response [[PARTIAL_RESULT_METADATA]], [[INT]] 0, 1 @@ -311,7 +311,7 @@ doit() // CHECK-SAME: i8* undef, // : %swift.type_descriptor* bitcast ( // : <{ i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i16, i16, i16, i16, i8, i8, i8, i8, i32, %swift.method_override_descriptor }>* -// CHECK-SAME: $s4main5Value[[UNIQUE_ID_1]]CMn +// CHECK-SAME: $s4main5Value[[UNIQUE_ID_1]]LLCMn // : to %swift.type_descriptor* // : ) // CHECK-SAME: ) #{{[0-9]+}} @@ -319,20 +319,20 @@ doit() // CHECK: } // CHECK: ; Function Attrs: noinline nounwind readnone -// CHECK: define linkonce_odr hidden swiftcc %swift.metadata_response @"$s4main5Value[[UNIQUE_ID_1]]CySSGMb"([[INT]] {{%[0-9]+}}) #4 { +// CHECK: define linkonce_odr hidden swiftcc %swift.metadata_response @"$s4main5Value[[UNIQUE_ID_1]]LLCySSGMb"([[INT]] {{%[0-9]+}}) #4 { // CHECK: entry: -// CHECK-unknown: call swiftcc %swift.metadata_response @"$s4main9Ancestor1[[UNIQUE_ID_1]]CySSGMb"([[INT]] 0) +// CHECK-unknown: call swiftcc %swift.metadata_response @"$s4main9Ancestor1[[UNIQUE_ID_1]]LLCySSGMb"([[INT]] 0) // CHECK-unknown: ret // CHECK-apple: [[INITIALIZED_CLASS:%[0-9]+]] = call %objc_class* @objc_opt_self( -// CHECK-SAME: @"$s4main5Value[[UNIQUE_ID_1]]CySSGMf" +// CHECK-SAME: @"$s4main5Value[[UNIQUE_ID_1]]LLCySSGMf" // CHECK-apple: [[INITIALIZED_METADATA:%[0-9]+]] = bitcast %objc_class* [[INITIALIZED_CLASS]] to %swift.type* -// CHECK-apple: call swiftcc %swift.metadata_response @"$s4main9Ancestor1[[UNIQUE_ID_1]]CySSGMb"([[INT]] 0) -// CHECK-NOT: call swiftcc %swift.metadata_response @"$s4main9Ancestor2[[UNIQUE_ID_1]]CySiGMb"([[INT]] 0) +// CHECK-apple: call swiftcc %swift.metadata_response @"$s4main9Ancestor1[[UNIQUE_ID_1]]LLCySSGMb"([[INT]] 0) +// CHECK-NOT: call swiftcc %swift.metadata_response @"$s4main9Ancestor2[[UNIQUE_ID_1]]LLCySiGMb"([[INT]] 0) // CHECK-apple: [[PARTIAL_METADATA_RESPONSE:%[0-9]+]] = insertvalue %swift.metadata_response undef, %swift.type* [[INITIALIZED_METADATA]], 0 // CHECK-apple: [[METADATA_RESPONSE:%[0-9]+]] = insertvalue %swift.metadata_response [[PARTIAL_METADATA_RESPONSE]], [[INT]] 0, 1 // CHECK-apple: ret %swift.metadata_response [[METADATA_RESPONSE]] // CHECK: } -// CHECK: define linkonce_odr hidden swiftcc %swift.metadata_response @"$s4main9Ancestor1[[UNIQUE_ID_1]]CySSGMb"([[INT]] {{%[0-9]+}}) +// CHECK: define linkonce_odr hidden swiftcc %swift.metadata_response @"$s4main9Ancestor1[[UNIQUE_ID_1]]LLCySSGMb"([[INT]] {{%[0-9]+}}) -// CHECK: define linkonce_odr hidden swiftcc %swift.metadata_response @"$s4main9Ancestor2[[UNIQUE_ID_1]]CySiGMb"([[INT]] {{%[0-9]+}}) +// CHECK: define linkonce_odr hidden swiftcc %swift.metadata_response @"$s4main9Ancestor2[[UNIQUE_ID_1]]LLCySiGMb"([[INT]] {{%[0-9]+}})