From 8b066eb1d1aafb559890836e254ebf1ebd7de9a5 Mon Sep 17 00:00:00 2001 From: Caroline Tice Date: Sat, 28 Jan 2017 11:06:17 -0800 Subject: Fix GCC bug PR 46639, for kernel security The kernel security team asked us to fix this bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46639 This CL does that. Note: This CL depends on https://android-review.googlesource.com/329799 Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46639 Test: Ran build.py for all toolchain versions; used resulting compilers to build bullhead, angler and fugu plaform images. Ran checkbuild.py. Change-Id: I1e1abf594cff56c6ed6dc228a1d084da18c11420 --- gcc-4.9/gcc/testsuite/gcc.dg/tree-ssa/vrp87.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gcc-4.9/gcc/testsuite/gcc.dg/tree-ssa/vrp87.c') diff --git a/gcc-4.9/gcc/testsuite/gcc.dg/tree-ssa/vrp87.c b/gcc-4.9/gcc/testsuite/gcc.dg/tree-ssa/vrp87.c index ab399b50e..9d1471bb4 100644 --- a/gcc-4.9/gcc/testsuite/gcc.dg/tree-ssa/vrp87.c +++ b/gcc-4.9/gcc/testsuite/gcc.dg/tree-ssa/vrp87.c @@ -2,7 +2,7 @@ when evaluating an && condition. VRP is not able to optimize this. */ /* { dg-do compile { target { ! { logical_op_short_circuit || { m68k*-*-* mmix*-*-* mep*-*-* bfin*-*-* v850*-*-* picochip*-*-* moxie*-*-* cris*-*-* m32c*-*-* fr30*-*-* mcore*-*-* powerpc*-*-* xtensa*-*-* hppa*-*-* } } } } } */ -/* { dg-options "-O2 -fdump-tree-vrp2-details -fdump-tree-cddce2-details" } */ +/* { dg-options "-O2 -fdump-tree-vrp1-details -fdump-tree-cddce1-details" } */ struct bitmap_head_def; typedef struct bitmap_head_def *bitmap; @@ -75,10 +75,9 @@ bitmap_ior_into (bitmap a, const_bitmap b) } /* Verify that VRP simplified an "if" statement. */ -/* { dg-final { scan-tree-dump "Folded into: if.*" "vrp2"} } */ -/* Verify that DCE after VRP2 eliminates a dead conversion +/* { dg-final { scan-tree-dump "Folded into: if.*" "vrp1"} } */ +/* Verify that DCE after VRP1 eliminates a dead conversion to a (Bool). */ -/* { dg-final { scan-tree-dump "Deleting.*_Bool.*;" "cddce2"} } */ -/* { dg-final { cleanup-tree-dump "vrp2" } } */ -/* { dg-final { cleanup-tree-dump "cddce2" } } */ - +/* { dg-final { scan-tree-dump "Deleting.*_Bool.*;" "cddce1"} } */ +/* { dg-final { cleanup-tree-dump "vrp1" } } */ +/* { dg-final { cleanup-tree-dump "cddce1" } } */ -- cgit v1.2.3