11.5.0-1
Remove gcc11-pr111039.patch, which is included in the sources now. Resolves: RHEL-35635
This commit is contained in:
		
							parent
							
								
									070eb579ee
								
							
						
					
					
						commit
						294b2cc752
					
				
							
								
								
									
										2
									
								
								gcc.spec
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gcc.spec
									
									
									
									
									
								
							| @ -292,7 +292,6 @@ Patch28: gcc11-s390x-regarg-2.patch | |||||||
| Patch29: gcc11-s390x-regarg-3.patch | Patch29: gcc11-s390x-regarg-3.patch | ||||||
| Patch30: gcc11-testsuite-fixes.patch | Patch30: gcc11-testsuite-fixes.patch | ||||||
| Patch32: gcc11-testsuite-fixes-2.patch | Patch32: gcc11-testsuite-fixes-2.patch | ||||||
| Patch33: gcc11-pr111039.patch |  | ||||||
| Patch34: gcc11-pr111070.patch | Patch34: gcc11-pr111070.patch | ||||||
| Patch35: gcc11-testsuite-aarch64-add-fno-stack-protector.patch | Patch35: gcc11-testsuite-aarch64-add-fno-stack-protector.patch | ||||||
| Patch36: gcc11-libgfortran-flush.patch | Patch36: gcc11-libgfortran-flush.patch | ||||||
| @ -894,7 +893,6 @@ mark them as cross compiled. | |||||||
| %patch29 -p1 -b .s390x-regarg-3~ | %patch29 -p1 -b .s390x-regarg-3~ | ||||||
| %patch30 -p1 -b .testsuite~ | %patch30 -p1 -b .testsuite~ | ||||||
| %patch32 -p1 -b .testsuite2~ | %patch32 -p1 -b .testsuite2~ | ||||||
| %patch33 -p1 -b .pr111039~ |  | ||||||
| %patch34 -p1 -b .pr111070~ | %patch34 -p1 -b .pr111070~ | ||||||
| %patch35 -p1 -b .testsuite3~ | %patch35 -p1 -b .testsuite3~ | ||||||
| %patch36 -p1 -b .libgfortran-flush~ | %patch36 -p1 -b .libgfortran-flush~ | ||||||
|  | |||||||
| @ -1,59 +0,0 @@ | |||||||
| commit 482551a79a3d3f107f6239679ee74655cfe8707e |  | ||||||
| Author: Richard Biener <rguenther@suse.de> |  | ||||||
| Date:   Thu Aug 17 13:10:14 2023 +0200 |  | ||||||
| 
 |  | ||||||
|     tree-optimization/111039 - abnormals and bit test merging |  | ||||||
|      |  | ||||||
|     The following guards the bit test merging code in if-combine against |  | ||||||
|     the appearance of SSA names used in abnormal PHIs. |  | ||||||
|      |  | ||||||
|             PR tree-optimization/111039 |  | ||||||
|             * tree-ssa-ifcombine.cc (ifcombine_ifandif): Check for |  | ||||||
|             SSA_NAME_OCCURS_IN_ABNORMAL_PHI. |  | ||||||
|      |  | ||||||
|             * gcc.dg/pr111039.c: New testcase. |  | ||||||
| 
 |  | ||||||
| diff --git a/gcc/testsuite/gcc.dg/pr111039.c b/gcc/testsuite/gcc.dg/pr111039.c
 |  | ||||||
| new file mode 100644 |  | ||||||
| index 00000000000..bec9983b35f
 |  | ||||||
| --- /dev/null
 |  | ||||||
| +++ b/gcc/testsuite/gcc.dg/pr111039.c
 |  | ||||||
| @@ -0,0 +1,15 @@
 |  | ||||||
| +/* { dg-do compile } */
 |  | ||||||
| +/* { dg-options "-O" } */
 |  | ||||||
| +
 |  | ||||||
| +int _setjmp ();
 |  | ||||||
| +void abcd ();
 |  | ||||||
| +void abcde ();
 |  | ||||||
| +void compiler_corruption_function(int flags)
 |  | ||||||
| +{
 |  | ||||||
| +  int nowait = flags & 1048576, isexpand = flags & 8388608;
 |  | ||||||
| +  abcd();
 |  | ||||||
| +  _setjmp(flags);
 |  | ||||||
| +  if (nowait && isexpand)
 |  | ||||||
| +    flags &= 0;
 |  | ||||||
| +  abcde();
 |  | ||||||
| +}
 |  | ||||||
| --- a/gcc/tree-ssa-ifcombine.c
 |  | ||||||
| +++ b/gcc/tree-ssa-ifcombine.c
 |  | ||||||
| @@ -430,6 +430,9 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv,
 |  | ||||||
|      { |  | ||||||
|        tree t, t2; |  | ||||||
|   |  | ||||||
| +      if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1))
 |  | ||||||
| +	return false;
 |  | ||||||
| +
 |  | ||||||
|        /* Do it.  */ |  | ||||||
|        gsi = gsi_for_stmt (inner_cond); |  | ||||||
|        t = fold_build2 (LSHIFT_EXPR, TREE_TYPE (name1), |  | ||||||
| @@ -486,6 +489,10 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv,
 |  | ||||||
|        gimple_stmt_iterator gsi; |  | ||||||
|        tree t; |  | ||||||
|   |  | ||||||
| +      if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)
 |  | ||||||
| +	  || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2))
 |  | ||||||
| +	return false;
 |  | ||||||
| +
 |  | ||||||
|        /* Find the common name which is bit-tested.  */ |  | ||||||
|        if (name1 == name2) |  | ||||||
|  	; |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user