aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2015-01-20 21:39:52 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2015-01-20 21:39:52 +0100
commit3ea36418803795d68331e688cf851eeb22bd3bf6 (patch)
tree62486ce633b46c7bf8945dc5e7352f4f545b2b55 /gcc
parentbefb1f36a71758c5fd645b1f08b8886e7f5808da (diff)
downloadgcc-3ea36418803795d68331e688cf851eeb22bd3bf6.zip
gcc-3ea36418803795d68331e688cf851eeb22bd3bf6.tar.gz
gcc-3ea36418803795d68331e688cf851eeb22bd3bf6.tar.bz2
re PR sanitizer/64632 (runtime error: member call on address 0x0000004318a8 which does not point to an object of type 'ios_base')
PR sanitizer/64632 * ubsan/ubsan_type_hash.cc: Cherry pick upstream r224972. * g++.dg/ubsan/pr64632.C: New test. From-SVN: r219912
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/ubsan/pr64632.C23
2 files changed, 26 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5988431..ee46288 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2015-01-20 Jakub Jelinek <jakub@redhat.com>
+ PR sanitizer/64632
+ * g++.dg/ubsan/pr64632.C: New test.
+
PR debug/64663
* gcc.dg/pr64663.c: New test.
diff --git a/gcc/testsuite/g++.dg/ubsan/pr64632.C b/gcc/testsuite/g++.dg/ubsan/pr64632.C
new file mode 100644
index 0000000..0d2a7aa
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ubsan/pr64632.C
@@ -0,0 +1,23 @@
+// PR sanitizer/64632
+// { dg-do run }
+// { dg-options "-fsanitize=vptr -fno-sanitize-recover=vptr" }
+
+struct S
+{
+ S () : a(0) {}
+ int a;
+ int f () { return a; }
+ virtual int v () { return 0; }
+};
+
+struct X : virtual S
+{
+ int v () { return 2; }
+};
+
+int
+main ()
+{
+ X x;
+ return x.f ();
+}