diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-12-10 04:30:36 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-12-10 04:30:36 +0000 |
| commit | e1a6a9aa854641f118369f478ad2b1d30c456ec8 (patch) | |
| tree | 7f98ef9a0f823331fcba49e7164df350095d03d7 | |
| parent | 48d6b10c74138db9298a2eda28d5c7f5ae72ea42 (diff) | |
| download | compiler-rt-e1a6a9aa854641f118369f478ad2b1d30c456ec8.tar.gz | |
Merging r196799:
------------------------------------------------------------------------
r196799 | wdietz2 | 2013-12-09 11:04:33 -0800 (Mon, 09 Dec 2013) | 1 line
ubsan: Fix typo in 'TypeCheck/vptr.cpp' test to resolve 32bit failure.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_34@196871 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp b/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp index bd7970a95..9095f7279 100644 --- a/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp +++ b/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp @@ -101,7 +101,7 @@ int main(int, char **argv) { // CHECK-OFFSET: vptr.cpp:[[@LINE+5]]:12: runtime error: member call on address [[PTR:0x[0-9a-f]*]] which does not point to an object of type 'U' // CHECK-OFFSET-NEXT: 0x{{[0-9a-f]*}}: note: object is base class subobject at offset {{8|16}} within object of type [[DYN_TYPE:'U']] // CHECK-OFFSET-NEXT: {{^ .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. }} - // CHECK-OFFSET-NEXT: {{^ \^ ( ~~~~~~~~~~~~)~~~~~~~~~~~ *$}} + // CHECK-OFFSET-NEXT: {{^ \^ ( ~~~~~~~~~~~~)?~~~~~~~~~~~ *$}} // CHECK-OFFSET-NEXT: {{^ ( )?vptr for}} 'T' base class of [[DYN_TYPE]] return reinterpret_cast<U*>(p)->v() - 2; |