From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 21 Jan 2019 19:53:04 +0000 (+0000)
Subject: 	PR sanitizer/88901
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99bf4b63215812e3d189e99ba50e90256f432a65;p=thirdparty%2Fgcc.git

	PR sanitizer/88901
	* typeck.c (cp_build_binary_op): Don't instrument
	SANITIZE_POINTER_COMPARE if processing_template_decl.
	(pointer_diff): Similarly for SANITIZE_POINTER_SUBTRACT.

	* g++.dg/asan/pr88901.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@268122 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4292930daf38..e5ce94c75e8e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2019-01-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/88901
+	* typeck.c (cp_build_binary_op): Don't instrument
+	SANITIZE_POINTER_COMPARE if processing_template_decl.
+	(pointer_diff): Similarly for SANITIZE_POINTER_SUBTRACT.
+
 2019-01-18  Jason Merrill  <jason@redhat.com>
 
 	PR c++/88875 - error with explicit list constructor.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 47e407d1faae..ec722a360357 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -5233,6 +5233,7 @@ cp_build_binary_op (const op_location_t &location,
 	}
 
       if ((code0 == POINTER_TYPE || code1 == POINTER_TYPE)
+	  && !processing_template_decl
 	  && sanitize_flags_p (SANITIZE_POINTER_COMPARE))
 	{
 	  op0 = save_expr (op0);
@@ -5650,7 +5651,8 @@ pointer_diff (location_t loc, tree op0, tree op1, tree ptrtype,
   else
     inttype = restype;
 
-  if (sanitize_flags_p (SANITIZE_POINTER_SUBTRACT))
+  if (!processing_template_decl
+      && sanitize_flags_p (SANITIZE_POINTER_SUBTRACT))
     {
       op0 = save_expr (op0);
       op1 = save_expr (op1);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6a483214c558..ba5285fc7104 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/88901
+	* g++.dg/asan/pr88901.C: New test.
+
 2019-01-21  Tamar Christina  <tamar.christina@arm.com>
 
 	* g++.dg/vect/simd-clone-7.cc: Fix assembler scan.
diff --git a/gcc/testsuite/g++.dg/asan/pr88901.C b/gcc/testsuite/g++.dg/asan/pr88901.C
new file mode 100644
index 000000000000..fa5d949fe3ad
--- /dev/null
+++ b/gcc/testsuite/g++.dg/asan/pr88901.C
@@ -0,0 +1,13 @@
+// PR sanitizer/88901
+// { dg-do compile }
+// { dg-options "-fsanitize=address -fsanitize=pointer-compare" }
+
+template <typename T>
+struct A {
+  void foo() {
+    auto d = [](char *x, char *y) {
+      for (char *p = x; p + sizeof(T) <= y; p += sizeof(T))
+        reinterpret_cast<T *>(p)->~T();
+    };
+  }
+};