diff options
| author | John McCall <rjmccall@apple.com> | 2010-08-23 01:21:21 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-08-23 01:21:21 +0000 |
| commit | 7a9aac2d9ff5a08c080833aa002b8c3e0f99178c (patch) | |
| tree | d681e5ff8312e728bef7c082396551daa1942da4 /clang/test/CodeGenCXX/pointers-to-data-members.cpp | |
| parent | aa4149a2aa50ae26caccf35f869ddbcae09658a4 (diff) | |
| download | bcm5719-llvm-7a9aac2d9ff5a08c080833aa002b8c3e0f99178c.tar.gz bcm5719-llvm-7a9aac2d9ff5a08c080833aa002b8c3e0f99178c.zip | |
Abstract out everything having to do with member pointers into the ABI
class; they should just be completely opaque throughout IR gen now,
although I haven't really audited that.
Fix a bug apparently inherited from gcc-4.2 where we failed to null-check
member data pointers when performing derived-to-base or base-to-derived
conversions on them.
llvm-svn: 111789
Diffstat (limited to 'clang/test/CodeGenCXX/pointers-to-data-members.cpp')
| -rw-r--r-- | clang/test/CodeGenCXX/pointers-to-data-members.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/clang/test/CodeGenCXX/pointers-to-data-members.cpp b/clang/test/CodeGenCXX/pointers-to-data-members.cpp index 70308c6abc5..60c1661e060 100644 --- a/clang/test/CodeGenCXX/pointers-to-data-members.cpp +++ b/clang/test/CodeGenCXX/pointers-to-data-members.cpp @@ -65,15 +65,21 @@ int A::*pa; int C::*pc; void f() { - // CHECK: store i64 -1, i64* @_ZN5Casts2paE + // CHECK: store i64 -1, i64* @_ZN5Casts2paE pa = 0; - // CHECK: [[ADJ:%[a-zA-Z0-9\.]+]] = add nsw i64 {{.*}}, 4 - // CHECK: store i64 [[ADJ]], i64* @_ZN5Casts2pcE + // CHECK-NEXT: [[TMP:%.*]] = load i64* @_ZN5Casts2paE, align 8 + // CHECK-NEXT: [[ADJ:%.*]] = add nsw i64 [[TMP]], 4 + // CHECK-NEXT: [[ISNULL:%.*]] = icmp eq i64 [[TMP]], -1 + // CHECK-NEXT: [[RES:%.*]] = select i1 [[ISNULL]], i64 [[TMP]], i64 [[ADJ]] + // CHECK-NEXT: store i64 [[RES]], i64* @_ZN5Casts2pcE pc = pa; - // CHECK: [[ADJ:%[a-zA-Z0-9\.]+]] = sub nsw i64 {{.*}}, 4 - // CHECK: store i64 [[ADJ]], i64* @_ZN5Casts2paE + // CHECK-NEXT: [[TMP:%.*]] = load i64* @_ZN5Casts2pcE, align 8 + // CHECK-NEXT: [[ADJ:%.*]] = sub nsw i64 [[TMP]], 4 + // CHECK-NEXT: [[ISNULL:%.*]] = icmp eq i64 [[TMP]], -1 + // CHECK-NEXT: [[RES:%.*]] = select i1 [[ISNULL]], i64 [[TMP]], i64 [[ADJ]] + // CHECK-NEXT: store i64 [[RES]], i64* @_ZN5Casts2paE pa = static_cast<int A::*>(pc); } |
