OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR sanitizer/66977 (-fsanitize=shift may introduce uninitialized variables)

Browse Source 
PR sanitizer/66977
	* typeck.c (get_member_function_from_ptrfunc): Don't sanitize
	RSHIFT_EXPR.

	* g++.dg/ubsan/pr66977.C: New test.

From-SVN: r226440
This commit is contained in:
Marek Polacek 2015-07-31 11:12:57 +00:00 committed by Marek Polacek
parent b5d3d7871c
commit ec043522ff
4 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2015-07-31 Marek Polacek <polacek@redhat.com>
PR sanitizer/66977
* typeck.c (get_member_function_from_ptrfunc): Don't sanitize
RSHIFT_EXPR.
2015-07-30 Paolo Carlini <paolo.carlini@oracle.com>
* class.c (check_for_override): Use DECL_SOURCE_LOCATION and "%qD"

7
gcc/cp/typeck.c
View File

@ -3288,6 +3288,7 @@ get_member_function_from_ptrfunc (tree *instance_ptrptr, tree function,
idx = build1 (NOP_EXPR, vtable_index_type, e3);
switch (TARGET_PTRMEMFUNC_VBIT_LOCATION)
{
int flag_sanitize_save;
case ptrmemfunc_vbit_in_pfn:
e1 = cp_build_binary_op (input_location,
BIT_AND_EXPR, idx, integer_one_node,
@ -3303,9 +3304,15 @@ get_member_function_from_ptrfunc (tree *instance_ptrptr, tree function,
e1 = cp_build_binary_op (input_location,
BIT_AND_EXPR, delta, integer_one_node,
complain);
/* Don't instrument the RSHIFT_EXPR we're about to create because
we're going to use DELTA number of times, and that wouldn't play
well with SAVE_EXPRs therein. */
flag_sanitize_save = flag_sanitize;
flag_sanitize = 0;
delta = cp_build_binary_op (input_location,
RSHIFT_EXPR, delta, integer_one_node,
complain);
flag_sanitize = flag_sanitize_save;
if (delta == error_mark_node)
return error_mark_node;
break;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2015-07-31 Marek Polacek <polacek@redhat.com>
PR sanitizer/66977
* g++.dg/ubsan/pr66977.C: New test.
2015-07-30 Marek Polacek <polacek@redhat.com>
* c-c++-common/Wtautological-compare-3.c: New test.

27
gcc/testsuite/g++.dg/ubsan/pr66977.C Normal file
View File

@ -0,0 +1,27 @@
// PR sanitizer/66977
// { dg-do compile }
// { dg-options "-fsanitize=shift -Wmaybe-uninitialized -O" }
class Foo {
private:
int a_;
public:
Foo (int a) : a_(a) {};
inline int get_a () { return a_; };
};
int bar (int (Foo::*get)()) {
Foo *A = new Foo(1);
int result = (A->*get)();
delete (A);
return result;
}
int main () {
return bar (&Foo::get_a);
}