Skip to content

Revert "[IRGen testing] Fix bogus FileCheck check-prefix "-SAME" usage" #31843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2020
Merged

Revert "[IRGen testing] Fix bogus FileCheck check-prefix "-SAME" usage" #31843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions test/IRGen/class_resilience.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
// CHECK: @"$s16class_resilience27ClassWithResilientThenEmptyC9resilient0H7_struct0E3IntVvpWvd" = hidden global [[INT]] 0,

// CHECK: @"$s16class_resilience26ClassWithResilientPropertyCMo" = {{(protected )?}}{{(dllexport )?}}constant [[BOUNDS]]
// CHECK-32-SAME: { [[INT]] 52, i32 2, i32 13 }
// CHECK-64-SAME: { [[INT]] 80, i32 2, i32 14 }
// CHECK-SAME-32: { [[INT]] 52, i32 2, i32 13 }
// CHECK-SAME-64: { [[INT]] 80, i32 2, i32 10 }

// CHECK: @"$s16class_resilience28ClassWithMyResilientPropertyC1rAA0eF6StructVvpWvd" = hidden constant [[INT]] {{8|16}}
// CHECK: @"$s16class_resilience28ClassWithMyResilientPropertyC5colors5Int32VvpWvd" = hidden constant [[INT]] {{12|20}}
Expand Down Expand Up @@ -101,20 +101,20 @@
// CHECK-native-SAME: i32 0

// CHECK: @"$s16class_resilience17MyResilientParentCMo" = {{(protected )?}}{{(dllexport )?}}constant [[BOUNDS]]
// CHECK-32-SAME: { [[INT]] 52, i32 2, i32 13 }
// CHECK-64-SAME: { [[INT]] 80, i32 2, i32 12 }
// CHECK-SAME-32: { [[INT]] 52, i32 2, i32 13 }
// CHECK-SAME-64: { [[INT]] 80, i32 2, i32 10 }

// CHECK: @"$s16class_resilience16MyResilientChildCMo" = {{(protected )?}}{{(dllexport )?}}constant [[BOUNDS]]
// CHECK-32-SAME: { [[INT]] 60, i32 2, i32 15 }
// CHECK-64-SAME: { [[INT]] 96, i32 2, i32 13 }
// CHECK-SAME-32: { [[INT]] 60, i32 2, i32 15 }
// CHECK-SAME-64: { [[INT]] 96, i32 2, i32 12 }

// CHECK: @"$s16class_resilience24MyResilientGenericParentCMo" = {{(protected )?}}{{(dllexport )?}}constant [[BOUNDS]]
// CHECK-32-SAME: { [[INT]] 52, i32 2, i32 13 }
// CHECK-64-SAME: { [[INT]] 80, i32 2, i32 13 }
// CHECK-SAME-32: { [[INT]] 52, i32 2, i32 13 }
// CHECK-SAME-64: { [[INT]] 80, i32 2, i32 10 }

// CHECK: @"$s16class_resilience24MyResilientConcreteChildCMo" = {{(protected )?}}{{(dllexport )?}}constant [[BOUNDS]]
// CHECK-32-SAME: { [[INT]] 64, i32 2, i32 16 }
// CHECK-64-SAME: { [[INT]] 104, i32 2, i32 15 }
// CHECK-SAME-32: { [[INT]] 64, i32 2, i32 16 }
// CHECK-SAME-64: { [[INT]] 104, i32 2, i32 13 }

// CHECK: @"$s16class_resilience27ClassWithEmptyThenResilientC5emptyAA0E0VvpWvd" = hidden constant [[INT]] 0,
// CHECK: @"$s16class_resilience27ClassWithResilientThenEmptyC5emptyAA0G0VvpWvd" = hidden constant [[INT]] 0,
Expand Down
61 changes: 30 additions & 31 deletions test/IRGen/generic_classes.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// RUN: %empty-directory(%t)
// RUN: %{python} %utils/chex.py < %s > %t/generic_classes.sil
// RUN: %target-swift-frontend %t/generic_classes.sil -emit-ir -enable-objc-interop | %FileCheck %t/generic_classes.sil --check-prefixes=CHECK,CHECK-objc,CHECK-%target-import-type
// RUN: %target-swift-frontend %t/generic_classes.sil -emit-ir -disable-objc-interop | %FileCheck %t/generic_classes.sil --check-prefixes=CHECK,CHECK-native,CHECK-%target-import-type
// RUN: %target-swift-frontend %t/generic_classes.sil -emit-ir | %FileCheck %t/generic_classes.sil --check-prefix=CHECK --check-prefix=CHECK-%target-runtime -check-prefix CHECK-%target-import-type
// RUN: %target-swift-frontend -Osize %t/generic_classes.sil -emit-ir | %FileCheck %t/generic_classes.sil --check-prefix=OSIZE

// REQUIRES: CPU=x86_64
Expand Down Expand Up @@ -53,20 +52,21 @@ import Swift
// -- flags
// CHECK_SAME: i32 3,
// -- immediate pattern size
// CHECK-native-SAME: i16 0,
// CHECK-objc-SAME: i16 5,
// CHECK-SAME: i16 0,
// -- immediate pattern target offset
// CHECK-SAME: i16 0,
// CHECK-SAME: i16 0,
// -- extra data size
// CHECK-native-SAME: i16 0,
// CHECK-objc-SAME: i16 14,
// CHECK-SAME-native: i16 0,
// CHECK-SAME-objc: i16 23,
// -- class ro-data offset
// CHECK-native-SAME: i16 0
// CHECK-objc-SAME: i16 0,
// CHECK-SAME-native: i16 0,
// CHECK-SAME-objc: i16 5,
// -- metaclass object offset
// CHECK-objc-SAME: i16 0,
// CHECK-SAME-native: i16 0,
// CHECK-SAME-objc: i16 0,
// -- class ro-data offset
// CHECK-objc-SAME: i16 23
// CHECK-SAME-native: i16 0
// CHECK-SAME-objc: i16 14,
// CHECK-SAME: }>

// -- Check that offset vars are emitted for fixed-layout generics
Expand Down Expand Up @@ -94,15 +94,15 @@ import Swift
// CHECK-SAME: void (%T15generic_classes14RootNonGenericC*)* @"$s15generic_classes14RootNonGenericCfD",
// CHECK-DIRECT-SAME: i8** @"$sBoWV",
// CHECK-INDIRECT-SAME: i8** null,
// CHECK-native-SAME: i64 0,
// CHECK-native-SAME: %swift.type* null,
// CHECK-native-SAME: %swift.opaque* null,
// CHECK-objc-SAME: i64 ptrtoint (%objc_class* @"$s15generic_classes14RootNonGenericCMm" to i64),
// CHECK-objc-SAME: %objc_class* @"OBJC_CLASS_$_{{(_TtCs12_)?}}SwiftObject",
// CHECK-objc-SAME: %swift.opaque* @_objc_empty_cache,
// CHECK-SAME-native: i64 0,
// CHECK-SAME-native: %swift.type* null,
// CHECK-SAME-native: %swift.opaque* null,
// CHECK-SAME-objc: i64 ptrtoint (%objc_class* @"$s15generic_classes14RootNonGenericCMm" to i64),
// CHECK-SAME-objc: %objc_class* @"OBJC_CLASS_$_{{(_TtCs12_)?}}SwiftObject",
// CHECK-SAME-objc: %swift.opaque* @_objc_empty_cache,
// CHECK-SAME: %swift.opaque* null,
// CHECK-native-SAME: i64 1,
// CHECK-objc-SAME: @_DATA__TtC15generic_classes14RootNonGeneric
// CHECK-SAME-native: i64 1,
// CHECK-SAME-objc: @_DATA__TtC15generic_classes14RootNonGeneric
// CHECK-SAME: i32 33,
// CHECK-SAME: i16 7,
// CHECK-SAME: i16 0,
Expand All @@ -117,30 +117,29 @@ import Swift
// -- template instantiation function
// CHECK-SAME: %swift.type* (%swift.type_descriptor*, i8**, i8*)* @"$s15generic_classes015GenericInheritsC0CMi"
// -- pattern flags (1 == has extra data pattern)
// CHECK-native-SAME: i32 0,
// CHECK-objc-SAME: i32 1,
// CHECK-SAME-native: i32 0,
// CHECK-SAME-objc: i32 1,
// -- heap destructor
// CHECK-SAME: @"$s15generic_classes015GenericInheritsC0CfD"
// -- ivar destroyer
// CHECK-SAME: i32 0,
// -- class flags
// CHECK_SAME: i32 3,
// -- extra data pattern offset
// CHECK-objc-SAME: i16 5,
// CHECK-SAME-objc: i16 0,
// -- extra data pattern size
// CHECK-objc-SAME: i16 0,
// CHECK-SAME-objc: i16 23,
// -- class ro-data offset
// CHECK-native-SAME: i16 0,
// CHECK-objc-SAME: i16 14,
// CHECK-SAME-native: i16 0,
// CHECK-SAME-objc: i16 5,
// -- metaclass object offset
// CHECK-native-SAME: i16 0,
// CHECK-objc-SAME: i16 0,
// CHECK-SAME-native: i16 0,
// CHECK-SAME-objc: i16 0,
// -- class ro-data offset
// CHECK-native-SAME: i16 0,
// CHECK-objc-SAME: i16 0,
// CHECK-SAME-native: i16 0,
// CHECK-SAME-objc: i16 14,
// -- reserved
// CHECK-native-SAME: i16 0
// CHECK-objc-SAME: i16 23
// CHECK-SAME: i16 0
// CHECK-SAME: }

// CHECK: @"$s15generic_classes018GenericInheritsNonC0CMP"
Expand Down