[llvm-branch-commits] [compiler-rt-branch] r196871 - Merging r196799:

[Bill Wendling]

Author: void
Date: Mon Dec  9 22:30:36 2013
New Revision: 196871

URL: http://llvm.org/viewvc/llvm-project?rev=196871&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_34/   (props changed)
    compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp

Propchange: compiler-rt/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  9 22:30:36 2013
@@ -1 +1 @@
-/compiler-rt/trunk:195427,195433-195434,195436,195442,195570,195642-195643,195652,195791,196501,196612
+/compiler-rt/trunk:195427,195433-195434,195436,195442,195570,195642-195643,195652,195791,196501,196612,196799

Modified: compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp?rev=196871&r1=196870&r2=196871&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp (original)
+++ compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp Mon Dec  9 22:30:36 2013
@@ -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;