public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gcc] rhel-f41-base: 5.0.0-0.7
@ 2026-06-29 12:26 Jakub Jelinek
0 siblings, 0 replies; 3+ messages in thread
From: Jakub Jelinek @ 2026-06-29 12:26 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gcc
Branch : rhel-f41-base
Commit : 274be4f35145dd56ce82ebe3c1e977220fa6c442
Author : Jakub Jelinek <jakub@redhat.com>
Date : 2015-02-05T11:26:15+01:00
Stats : +2/-2 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/gcc/c/274be4f35145dd56ce82ebe3c1e977220fa6c442?branch=rhel-f41-base
Log:
5.0.0-0.7
---
diff --git a/gcc5-pr64878.patch b/gcc5-pr64878.patch
index ca23f25..e31a40e 100644
--- a/gcc5-pr64878.patch
+++ b/gcc5-pr64878.patch
@@ -8,8 +8,8 @@
* testsuite/gcc.dg/tree-ssa/ssa-dom-thread-8.c: New.
---- a/gcc/tree-ssa-threadedge.c
-+++ b/gcc/tree-ssa-threadedge.c
+--- gcc/tree-ssa-threadedge.c
++++ gcc/tree-ssa-threadedge.c
@@ -61,6 +61,7 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "params.h"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [rpms/gcc] rhel-f41-base: 5.0.0-0.7
@ 2026-06-29 12:26 Jakub Jelinek
0 siblings, 0 replies; 3+ messages in thread
From: Jakub Jelinek @ 2026-06-29 12:26 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gcc
Branch : rhel-f41-base
Commit : a6d3dcaca63e765aae6d8a352106e31833b5116f
Author : Jakub Jelinek <jakub@redhat.com>
Date : 2015-02-05T11:16:27+01:00
Stats : +513/-0 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/gcc/c/a6d3dcaca63e765aae6d8a352106e31833b5116f?branch=rhel-f41-base
Log:
5.0.0-0.7
---
diff --git a/gcc5-pr64878.patch b/gcc5-pr64878.patch
new file mode 100644
index 0000000..ca23f25
--- /dev/null
+++ b/gcc5-pr64878.patch
@@ -0,0 +1,513 @@
+2015-02-04 Sebastian Pop <s.pop@samsung.com>
+ Brian Rzycki <b.rzycki@samsung.com>
+
+ PR tree-optimization/64878
+ * tree-ssa-threadedge.c: Include tree-ssa-loop.h.
+ (fsm_find_control_statement_thread_paths): Add parameter seen_loop_phi.
+ Stop recursion at loop phi nodes after having visited a loop phi node.
+
+ * testsuite/gcc.dg/tree-ssa/ssa-dom-thread-8.c: New.
+
+--- a/gcc/tree-ssa-threadedge.c
++++ b/gcc/tree-ssa-threadedge.c
+@@ -61,6 +61,7 @@ along with GCC; see the file COPYING3. If not see
+ #include "langhooks.h"
+ #include "params.h"
+ #include "tree-ssa-threadedge.h"
++#include "tree-ssa-loop.h"
+ #include "builtins.h"
+ #include "cfg.h"
+ #include "cfganal.h"
+@@ -1006,7 +1007,8 @@ static int max_threaded_paths;
+ static void
+ fsm_find_control_statement_thread_paths (tree expr,
+ hash_set<gimple> *visited_phis,
+- vec<basic_block, va_gc> *&path)
++ vec<basic_block, va_gc> *&path,
++ bool seen_loop_phi)
+ {
+ tree var = SSA_NAME_VAR (expr);
+ gimple def_stmt = SSA_NAME_DEF_STMT (expr);
+@@ -1030,6 +1032,15 @@ fsm_find_control_statement_thread_paths (tree expr,
+ int next_path_length = 0;
+ basic_block last_bb_in_path = path->last ();
+
++ if (loop_containing_stmt (phi)->header == gimple_bb (phi))
++ {
++ /* PR64878: do not take more than a loop phi node: it may be a flip-flop
++ operation across two latch edges. */
++ if (seen_loop_phi)
++ return;
++ seen_loop_phi = true;
++ }
++
+ /* Following the chain of SSA_NAME definitions, we jumped from a definition in
+ LAST_BB_IN_PATH to a definition in VAR_BB. When these basic blocks are
+ different, append to PATH the blocks from LAST_BB_IN_PATH to VAR_BB. */
+@@ -1090,7 +1101,9 @@ fsm_find_control_statement_thread_paths (tree expr,
+ {
+ vec_safe_push (path, bbi);
+ /* Recursively follow SSA_NAMEs looking for a constant definition. */
+- fsm_find_control_statement_thread_paths (arg, visited_phis, path);
++ fsm_find_control_statement_thread_paths (arg, visited_phis, path,
++ seen_loop_phi);
++
+ path->pop ();
+ continue;
+ }
+@@ -1357,7 +1370,8 @@ thread_through_normal_block (edge e,
+ hash_set<gimple> *visited_phis = new hash_set<gimple>;
+
+ max_threaded_paths = PARAM_VALUE (PARAM_MAX_FSM_THREAD_PATHS);
+- fsm_find_control_statement_thread_paths (cond, visited_phis, bb_path);
++ fsm_find_control_statement_thread_paths (cond, visited_phis, bb_path,
++ false);
+
+ delete visited_phis;
+ vec_free (bb_path);
+--
+1.9.1
+
+--- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-8.c
++++ gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-8.c
+@@ -0,0 +1,440 @@
++/* PR 64878 */
++/* { dg-options "-O2" } */
++/* { dg-do run } */
++
++struct A { int a1; };
++struct B { char *b1; int b2; int b3; };
++struct C { char *c1; int c2; struct B *c3; };
++extern struct A *f1 (char *s);
++static struct A *f2 (struct C *x);
++__attribute__ ((noinline, noclone)) int f3 (struct A *x, struct A *z) { asm volatile ("" : : "g" (x), "g" (z) : "memory"); return 0; }
++__attribute__ ((noinline, noclone)) void f4 (struct A *x, char *y, struct A *z) { asm volatile ("" : : "g" (x), "g" (z), "g" (y) : "memory"); }
++__attribute__ ((noinline, noclone)) struct B *f5 (void) { static char b[32]; static struct B f3 = { b, 0, 32 }; return &f3; }
++__attribute__ ((noinline, noclone)) int f6 (struct B *p, char *w, int z) { asm volatile ("" : : "g" (p), "g" (w), "g" (z) : "memory"); return 0; }
++__attribute__ ((noinline, noclone)) void f7 (struct B *p) { asm volatile ("" : : "g" (p) : "memory"); }
++__attribute__ ((noinline, noclone)) void f8 (struct B *p) { asm volatile ("" : : "g" (p) : "memory"); }
++__attribute__ ((noinline, noclone)) void f9 (struct A *x) { asm volatile ("" : : "g" (x) : "memory"); }
++__attribute__ ((noinline, noclone)) struct A *f10 (void) { static struct A j; asm volatile ("" : : : "memory"); return &j; }
++__attribute__ ((noinline, noclone)) struct A *f11 (void) { static struct A j; asm volatile ("" : : : "memory"); return &j; }
++__attribute__ ((noinline, noclone)) struct A *f12 (int b) { static struct A j; asm volatile ("" : : "g" (b) : "memory"); return &j; }
++__attribute__ ((noinline, noclone)) struct A *f13 (int i) { static struct A j; asm volatile ("" : : "g" (i) : "memory"); return &j; }
++__attribute__ ((noinline, noclone)) struct A *f14 (double d) { static struct A j; asm volatile ("" : : "g" (&d) : "memory"); return &j; }
++__attribute__ ((noinline, noclone)) struct A *f15 (char *s) { static struct A j; asm volatile ("" : : "g" (s) : "memory"); return &j; }
++char *t = "0123456789abcdef";
++char *u = "0123456789.+-e";
++
++__attribute__ ((noinline, noclone)) struct A *
++f1 (char *s)
++{
++ struct C f;
++ struct A *o;
++ f.c1 = s;
++ f.c2 = 0;
++ f.c3 = f5 ();
++ o = f2 (&f);
++ f8 (f.c3);
++ return o;
++}
++
++static struct A *
++f2 (struct C *x)
++{
++ int a, b, e = 0;
++ struct A *f = 0, *o;
++ char *g = 0;
++ char h = '\0';
++ int i = 0, j = 0;
++ a = 0;
++ b = 1;
++ char c;
++ do
++ {
++ c = x->c1[x->c2];
++ switch (a)
++ {
++ case 0:
++ if (c == ' ')
++ x->c2++;
++ else if (c == '/')
++ {
++ a = 4;
++ j = x->c2++;
++ }
++ else
++ a = b;
++ break;
++ case 1:
++ switch (c)
++ {
++ case '{':
++ a = 0;
++ b = 15;
++ f = f10 ();
++ x->c2++;
++ break;
++ case '[':
++ a = 0;
++ b = 13;
++ f = f11 ();
++ x->c2++;
++ break;
++ case 'N':
++ case 'n':
++ a = 3;
++ j = x->c2++;
++ break;
++ case '"':
++ case '\'':
++ h = c;
++ f7 (x->c3);
++ a = 8;
++ j = ++x->c2;
++ break;
++ case 'T':
++ case 't':
++ case 'F':
++ case 'f':
++ a = 11;
++ j = x->c2++;
++ break;
++ case '0' ... '9':
++ case '-':
++ i = 0;
++ a = 12;
++ j = x->c2++;
++ break;
++ default:
++ e = 1;
++ goto out;
++ }
++ break;
++ case 2:
++ goto out;
++ case 3:
++ if (__builtin_strncmp ("null", x->c1 + j, x->c2 - j))
++ {
++ e = 2;
++ goto out;
++ }
++ if (x->c2 - j == 4)
++ {
++ f = 0;
++ b = 2;
++ a = 0;
++ }
++ else
++ x->c2++;
++ break;
++ case 4:
++ if (c == '*')
++ a = 5;
++ else if (c == '/')
++ a = 6;
++ else
++ {
++ e = 8;
++ goto out;
++ }
++ x->c2++;
++ break;
++ case 5:
++ if (c == '*')
++ a = 7;
++ x->c2++;
++ break;
++ case 6:
++ if (c == '\n')
++ a = 0;
++ x->c2++;
++ break;
++ case 7:
++ if (c == '/')
++ a = 0;
++ else
++ a = 5;
++ x->c2++;
++ break;
++ case 8:
++ if (c == h)
++ {
++ f6 (x->c3, x->c1 + j, x->c2 - j);
++ f = f15 (x->c3->b1);
++ b = 2;
++ a = 0;
++ }
++ else if (c == '\\')
++ {
++ b = 8;
++ a = 9;
++ }
++ x->c2++;
++ break;
++ case 9:
++ switch (c)
++ {
++ case '"':
++ case '\\':
++ f6 (x->c3, x->c1 + j, x->c2 - j - 1);
++ j = x->c2++;
++ a = b;
++ break;
++ case 'b':
++ case 'n':
++ case 'r':
++ case 't':
++ f6 (x->c3, x->c1 + j, x->c2 - j - 1);
++ if (c == 'b')
++ f6 (x->c3, "\b", 1);
++ else if (c == 'n')
++ f6 (x->c3, "\n", 1);
++ else if (c == 'r')
++ f6 (x->c3, "\r", 1);
++ else if (c == 't')
++ f6 (x->c3, "\t", 1);
++ j = ++x->c2;
++ a = b;
++ break;
++ case 'u':
++ f6 (x->c3, x->c1 + j, x->c2 - j - 1);
++ j = ++x->c2;
++ a = 10;
++ break;
++ default:
++ e = 7;
++ goto out;
++ }
++ break;
++ case 10:
++ if (__builtin_strchr (t, c))
++ {
++ x->c2++;
++ if (x->c2 - j == 4)
++ {
++ unsigned char w[3];
++ unsigned int s =
++ (((x->c1[j] <= '9') ? x->c1[j] - '0' : (x->c1[j] & 7) + 9) << 12)
++ + (((x->c1[j + 1] <= '9') ? x->c1[j + 1] - '0' : (x->c1[j + 1] & 7) + 9) << 8)
++ + (((x->c1[j + 2] <= '9') ? x->c1[j + 2] - '0' : (x->c1[j + 2] & 7) + 9) << 4)
++ + ((x->c1[j + 3] <= '9') ? x->c1[j + 3] - '0' : (x->c1[j + 3] & 7) + 9);
++ if (s < 0x80)
++ {
++ w[0] = s;
++ f6 (x->c3, (char *) w, 1);
++ }
++ else if (s < 0x800)
++ {
++ w[0] = 0xc0 | (s >> 6);
++ w[1] = 0x80 | (s & 0x3f);
++ f6 (x->c3, (char *) w, 2);
++ }
++ else
++ {
++ w[0] = 0x0 | (s >> 12);
++ w[1] = 0x80 | ((s >> 6) & 0x3f);
++ w[2] = 0x80 | (s & 0x3f);
++ f6 (x->c3, (char *) w, 3);
++ }
++ j = x->c2;
++ a = b;
++ }
++ }
++ else
++ {
++ e = 7;
++ goto out;
++ }
++ break;
++ case 11:
++ if (__builtin_strncmp ("true", x->c1 + j, x->c2 - j) == 0)
++ {
++ if (x->c2 - j == 4)
++ {
++ f = f12 (1);
++ b = 2;
++ a = 0;
++ }
++ else
++ x->c2++;
++ }
++ else if (__builtin_strncmp ("false", x->c1 + j, x->c2 - j) == 0)
++ {
++ if (x->c2 - j == 5)
++ {
++ f = f12 (0);
++ b = 2;
++ a = 0;
++ }
++ else
++ x->c2++;
++ }
++ else
++ {
++ e = 3;
++ goto out;
++ }
++ break;
++ case 12:
++ if (!c || !__builtin_strchr (u, c))
++ {
++ if (!i)
++ f = f13 (0);
++ else
++ f = f14 (0.0);
++ b = 2;
++ a = 0;
++ }
++ else
++ {
++ if (c == '.' || c == 'e')
++ i = 1;
++ x->c2++;
++ }
++ break;
++ case 13:
++ if (c == ']')
++ {
++ x->c2++;
++ b = 2;
++ a = 0;
++ }
++ else
++ {
++ o = f2 (x);
++ if (((unsigned long) o > (unsigned long) -4000L))
++ {
++ e = 5;
++ goto out;
++ }
++ f3 (f, o);
++ b = 14;
++ a = 0;
++ }
++ break;
++ case 14:
++ if (c == ']')
++ {
++ x->c2++;
++ b = 2;
++ a = 0;
++ }
++ else if (c == ',')
++ {
++ x->c2++;
++ b = 13;
++ a = 0;
++ }
++ else
++ {
++ f9 (f);
++ e = 5;
++ goto out;
++ }
++ break;
++ case 15:
++ a = 16;
++ j = x->c2;
++ break;
++ case 16:
++ if (c == '}')
++ {
++ x->c2++;
++ b = 2;
++ a = 0;
++ }
++ else if (c == '"' || c == '\'')
++ {
++ h = c;
++ f7 (x->c3);
++ a = 17;
++ j = ++x->c2;
++ }
++ else
++ {
++ e = 6;
++ goto out;
++ }
++ break;
++ case 17:
++ if (c == h)
++ {
++ f6 (x->c3, x->c1 + j, x->c2 - j);
++ g = __builtin_strdup (x->c3->b1);
++ b = 18;
++ a = 0;
++ }
++ else if (c == '\\')
++ {
++ b = 17;
++ a = 9;
++ }
++ x->c2++;
++ break;
++ case 18:
++ if (c == ':')
++ {
++ x->c2++;
++ b = 19;
++ a = 0;
++ }
++ else
++ {
++ e = -6;
++ goto out;
++ }
++ break;
++ case 19:
++ o = f2 (x);
++ if (((unsigned long) o > (unsigned long) -4000L))
++ {
++ e = 6;
++ goto out;
++ }
++ f4 (f, g, o);
++ __builtin_free (g);
++ g = 0;
++ b = 20;
++ a = 0;
++ break;
++ case 20:
++ if (c == '}')
++ {
++ x->c2++;
++ b = 2;
++ a = 0;
++ }
++ else if (c == ',')
++ {
++ x->c2++;
++ b = 15;
++ a = 0;
++ }
++ else
++ {
++ e = 6;
++ goto out;
++ }
++ break;
++ }
++ }
++ while (c);
++ if (a != 2 && b != 2)
++ e = 9;
++out:
++ __builtin_free (g);
++ if (e == 0)
++ return f;
++ f9 (f);
++ return 0;
++}
++
++int
++main ()
++{
++ asm volatile ("" : : : "memory");
++ struct A *r = f1 ("{ \"id\": null, \"blahah\": \"foobarbazbar\", \"barbar\": { \"barbarbarba\":"
++ "\"abcdefgh\", \"ijklmnopqr\": \"stuvwxyzabcdefghijklmnopqrstuv\", \"xyzxyz\":"
++ " [ \"1\" ] } }");
++ if (!r)
++ __builtin_abort ();
++ return 0;
++}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [rpms/gcc] rhel-f41-base: 5.0.0-0.7
@ 2026-06-29 12:26 Jakub Jelinek
0 siblings, 0 replies; 3+ messages in thread
From: Jakub Jelinek @ 2026-06-29 12:26 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gcc
Branch : rhel-f41-base
Commit : 2f08a3f6d83d0952ff3b2850e336b11eefea11f0
Author : Jakub Jelinek <jakub@redhat.com>
Date : 2015-02-05T11:15:05+01:00
Stats : +18/-291 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/gcc/c/2f08a3f6d83d0952ff3b2850e336b11eefea11f0?branch=rhel-f41-base
Log:
5.0.0-0.7
---
diff --git a/.gitignore b/.gitignore
index 1a413c1..46a9ee6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/gcc-5.0.0-20150123.tar.bz2
/gcc-5.0.0-20150130.tar.bz2
+/gcc-5.0.0-20150205.tar.bz2
diff --git a/gcc.spec b/gcc.spec
index aebfa3e..640f885 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,9 +1,9 @@
-%global DATE 20150130
-%global SVNREV 220295
+%global DATE 20150205
+%global SVNREV 220439
%global gcc_version 5.0.0
# Note, gcc_release must be integer, if you want to add suffixes to
# %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 0.6
+%global gcc_release 0.7
%global _unpackaged_files_terminate_build 0
%global _performance_build 1
%global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
@@ -199,8 +199,7 @@ Patch12: gcc5-libgo-p224.patch
Patch13: gcc5-aarch64-async-unw-tables.patch
Patch14: gcc5-libsanitize-aarch64-va42.patch
Patch15: gcc5-pr61925.patch
-Patch16: gcc5-pr64817.patch
-Patch17: gcc5-pr64803.patch
+Patch16: gcc5-pr64878.patch
# On ARM EABI systems, we do want -gnueabi to be part of the
# target triple.
@@ -751,8 +750,7 @@ rm -f libgo/go/crypto/elliptic/p224{,_test}.go
%patch13 -p0 -b .aarch64-async-unw-tables~
%patch14 -p0 -b .libsanitize-aarch64-va42~
%patch15 -p0 -b .pr61925~
-%patch16 -p0 -b .pr64817~
-%patch17 -p0 -b .pr64803~
+%patch16 -p0 -b .pr64878~
%if 0%{?_enable_debug_packages}
mkdir dwz-wrapper
@@ -2938,6 +2936,17 @@ fi
%doc rpm.doc/changelogs/libcc1/ChangeLog*
%changelog
+* Thu Feb 5 2015 Jakub Jelinek <jakub@redhat.com> 5.0.0-0.7
+- update from the trunk
+ - PRs ada/64349, c++/64877, c++/64901, c/64824, c/64868, fortran/64757,
+ gcov/64123, go/64836, go/64838, ipa/61548, ipa/64686, ipa/64872,
+ jit/64810, libobjc/63765, libstdc++/64467, libstdc++/64883,
+ middle-end/61225, middle-end/62103, middle-end/64922,
+ rtl-optimization/64756, rtl-optimization/64905, target/62631,
+ target/64047, target/64159, target/64231, target/64408, target/64660,
+ target/64688, target/64851, target/64882, testsuite/64796
+- FSM jump threading fix (PR tree-optimization/64878)
+
* Fri Jan 30 2015 Jakub Jelinek <jakub@redhat.com> 5.0.0-0.6
- update from the trunk
- PRs ada/64349, bootstrap/64612, bootstrap/64754, c++/49508, c++/58597,
diff --git a/gcc5-pr64803.patch b/gcc5-pr64803.patch
deleted file mode 100644
index db3558d..0000000
--- a/gcc5-pr64803.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-2015-01-30 Dodji Seketeli <dodji@redhat.com>
-
- PR preprocessor/64803
- * internal.h (cpp_reader::top_most_macro_node): New data member.
- * macro.c (enter_macro_context): Pass the location of the end of
- the top-most invocation of the function-like macro, or the
- location of the expansion point of the top-most object-like macro.
- (cpp_get_token_1): Store the top-most macro node in the new
- pfile->top_most_macro_node data member.
-
- * gcc.dg/cpp/builtin-macro-1.c: New test case.
-
---- libcpp/internal.h
-+++ libcpp/internal.h
-@@ -421,6 +421,11 @@ struct cpp_reader
- macro invocation. */
- source_location invocation_location;
-
-+ /* This is the node representing the macro being expanded at
-+ top-level. The value of this data member is valid iff
-+ in_macro_expansion_p() returns TRUE. */
-+ cpp_hashnode *top_most_macro_node;
-+
- /* Nonzero if we are about to expand a macro. Note that if we are
- really expanding a macro, the function macro_of_context returns
- the macro being expanded and this flag is set to false. Client
---- libcpp/macro.c
-+++ libcpp/macro.c
-@@ -1228,7 +1228,24 @@ enter_macro_context (cpp_reader *pfile, cpp_hashnode *node,
-
- pfile->about_to_expand_macro_p = false;
- /* Handle built-in macros and the _Pragma operator. */
-- return builtin_macro (pfile, node, location);
-+ {
-+ source_location loc;
-+ if (/* The top-level macro invocation that triggered the expansion
-+ we are looking at is with a standard macro ...*/
-+ !(pfile->top_most_macro_node->flags & NODE_BUILTIN)
-+ /* ... and it's a function-like macro invocation. */
-+ && pfile->top_most_macro_node->value.macro->fun_like)
-+ /* Then the location of the end of the macro invocation is the
-+ location of the closing parenthesis. */
-+ loc = pfile->cur_token[-1].src_loc;
-+ else
-+ /* Otherwise, the location of the end of the macro invocation is
-+ the location of the expansion point of that top-level macro
-+ invocation. */
-+ loc = location;
-+
-+ return builtin_macro (pfile, node, loc);
-+ }
- }
-
- /* De-allocate the memory used by BUFF which is an array of instances
-@@ -2460,9 +2477,13 @@ cpp_get_token_1 (cpp_reader *pfile, source_location *location)
- {
- int ret = 0;
- /* If not in a macro context, and we're going to start an
-- expansion, record the location. */
-+ expansion, record the location and the top level macro
-+ about to be expanded. */
- if (!in_macro_expansion_p (pfile))
-- pfile->invocation_location = result->src_loc;
-+ {
-+ pfile->invocation_location = result->src_loc;
-+ pfile->top_most_macro_node = node;
-+ }
- if (pfile->state.prevent_expansion)
- break;
-
---- gcc/testsuite/gcc.dg/cpp/builtin-macro-1.c
-+++ gcc/testsuite/gcc.dg/cpp/builtin-macro-1.c
-@@ -0,0 +1,28 @@
-+/* Origin PR preprocessor/64803
-+
-+ This test ensures that the value the __LINE__ macro expands to is
-+ constant and corresponds to the line of the closing parenthesis of
-+ the top-most function-like macro expansion it's part of.
-+
-+ { dg-do run }
-+ { do-options -no-integrated-cpp } */
-+
-+#include <assert.h>
-+
-+#define C(a, b) a ## b
-+#define L(x) C(L, x)
-+#define M(a) int L(__LINE__) = __LINE__; assert(L(__LINE__) == __LINE__);
-+
-+int
-+main()
-+{
-+ M(a
-+ );
-+
-+ assert(L20 == 20); /* 20 is the line number of the
-+ closing parenthesis of the
-+ invocation of the M macro. Please
-+ adjust in case the layout of this
-+ file changes. */
-+ return 0;
-+}
diff --git a/gcc5-pr64817.patch b/gcc5-pr64817.patch
deleted file mode 100644
index b1e5b37..0000000
--- a/gcc5-pr64817.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-2015-01-30 Jakub Jelinek <jakub@redhat.com>
-
- PR debug/64817
- * cfgexpand.c (deep_ter_debug_map): New variable.
- (avoid_deep_ter_for_debug): New function.
- (expand_debug_expr): If TERed SSA_NAME is in
- deep_ter_debug_map, use the corresponding DEBUG_EXPR_DECL
- instead of trying to expand SSA_NAME's def stmt.
- (expand_debug_locations): When expanding debug bind
- of a DEBUG_EXPR_DECL to corresponding SSA_NAME,
- temporarily remove the DEBUG_EXPR_DECL from deep_ter_debug_map's
- value.
- (pass_expand::execute): Call avoid_deep_ter_for_debug on
- all debug bind stmts. Delete deep_ter_debug_map after
- expand_debug_location if non-NULL and clear it.
-
- * gcc.dg/pr64817-1.c: New test.
- * gcc.dg/pr64817-2.c: New test.
-
---- gcc/cfgexpand.c.jj 2015-01-28 21:24:56.000000000 +0100
-+++ gcc/cfgexpand.c 2015-01-30 13:22:46.002579984 +0100
-@@ -3767,6 +3767,48 @@ convert_debug_memory_address (machine_mo
- return x;
- }
-
-+/* Map from SSA_NAMEs to corresponding DEBUG_EXPR_DECLs created
-+ by avoid_deep_ter_for_debug. */
-+
-+hash_map<tree, tree> *deep_ter_debug_map;
-+
-+/* Split too deep TER chains for debug stmts using debug temporaries. */
-+
-+static void
-+avoid_deep_ter_for_debug (gimple stmt, int depth)
-+{
-+ use_operand_p use_p;
-+ ssa_op_iter iter;
-+ FOR_EACH_SSA_USE_OPERAND (use_p, stmt, iter, SSA_OP_USE)
-+ {
-+ tree use = USE_FROM_PTR (use_p);
-+ if (TREE_CODE (use) != SSA_NAME || SSA_NAME_IS_DEFAULT_DEF (use))
-+ continue;
-+ gimple g = get_gimple_for_ssa_name (use);
-+ if (g == NULL)
-+ continue;
-+ if (depth > 6 && !stmt_ends_bb_p (g))
-+ {
-+ if (deep_ter_debug_map == NULL)
-+ deep_ter_debug_map = new hash_map<tree, tree>;
-+
-+ tree &vexpr = deep_ter_debug_map->get_or_insert (use);
-+ if (vexpr != NULL)
-+ continue;
-+ vexpr = make_node (DEBUG_EXPR_DECL);
-+ gimple def_temp = gimple_build_debug_bind (vexpr, use, g);
-+ DECL_ARTIFICIAL (vexpr) = 1;
-+ TREE_TYPE (vexpr) = TREE_TYPE (use);
-+ DECL_MODE (vexpr) = TYPE_MODE (TREE_TYPE (use));
-+ gimple_stmt_iterator gsi = gsi_for_stmt (g);
-+ gsi_insert_after (&gsi, def_temp, GSI_NEW_STMT);
-+ avoid_deep_ter_for_debug (def_temp, 0);
-+ }
-+ else
-+ avoid_deep_ter_for_debug (g, depth + 1);
-+ }
-+}
-+
- /* Return an RTX equivalent to the value of the parameter DECL. */
-
- static rtx
-@@ -4654,7 +4696,16 @@ expand_debug_expr (tree exp)
- gimple g = get_gimple_for_ssa_name (exp);
- if (g)
- {
-- op0 = expand_debug_expr (gimple_assign_rhs_to_tree (g));
-+ tree t = NULL_TREE;
-+ if (deep_ter_debug_map)
-+ {
-+ tree *slot = deep_ter_debug_map->get (exp);
-+ if (slot)
-+ t = *slot;
-+ }
-+ if (t == NULL_TREE)
-+ t = gimple_assign_rhs_to_tree (g);
-+ op0 = expand_debug_expr (t);
- if (!op0)
- return NULL;
- }
-@@ -4961,6 +5012,25 @@ expand_debug_locations (void)
- if (INSN_VAR_LOCATION_STATUS (insn)
- == VAR_INIT_STATUS_UNINITIALIZED)
- val = expand_debug_source_expr (value);
-+ /* The avoid_deep_ter_for_debug function inserts
-+ debug bind stmts after SSA_NAME definition, with the
-+ SSA_NAME as the whole bind location. Disable temporarily
-+ expansion of that SSA_NAME into the DEBUG_EXPR_DECL
-+ being defined in this DEBUG_INSN. */
-+ else if (deep_ter_debug_map && TREE_CODE (value) == SSA_NAME)
-+ {
-+ tree *slot = deep_ter_debug_map->get (value);
-+ if (slot)
-+ {
-+ if (*slot == INSN_VAR_LOCATION_DECL (insn))
-+ *slot = NULL_TREE;
-+ else
-+ slot = NULL;
-+ }
-+ val = expand_debug_expr (value);
-+ if (slot)
-+ *slot = INSN_VAR_LOCATION_DECL (insn);
-+ }
- else
- val = expand_debug_expr (value);
- gcc_assert (last == get_last_insn ());
-@@ -5821,6 +5891,15 @@ pass_expand::execute (function *fun)
- timevar_pop (TV_OUT_OF_SSA);
- SA.partition_to_pseudo = XCNEWVEC (rtx, SA.map->num_partitions);
-
-+ if (MAY_HAVE_DEBUG_STMTS && flag_tree_ter)
-+ {
-+ gimple_stmt_iterator gsi;
-+ FOR_EACH_BB_FN (bb, cfun)
-+ for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
-+ if (gimple_debug_bind_p (gsi_stmt (gsi)))
-+ avoid_deep_ter_for_debug (gsi_stmt (gsi), 0);
-+ }
-+
- /* Make sure all values used by the optimization passes have sane
- defaults. */
- reg_renumber = 0;
-@@ -6008,6 +6087,12 @@ pass_expand::execute (function *fun)
- if (MAY_HAVE_DEBUG_INSNS)
- expand_debug_locations ();
-
-+ if (deep_ter_debug_map)
-+ {
-+ delete deep_ter_debug_map;
-+ deep_ter_debug_map = NULL;
-+ }
-+
- /* Free stuff we no longer need after GIMPLE optimizations. */
- free_dominance_info (CDI_DOMINATORS);
- free_dominance_info (CDI_POST_DOMINATORS);
---- gcc/testsuite/gcc.dg/pr64817-1.c.jj 2015-01-30 13:33:05.061143850 +0100
-+++ gcc/testsuite/gcc.dg/pr64817-1.c 2015-01-30 13:32:33.000000000 +0100
-@@ -0,0 +1,20 @@
-+/* PR debug/64817 */
-+/* { dg-do compile } */
-+/* { dg-options "-O3 -g" } */
-+
-+int a, b, d;
-+
-+void
-+foo (void)
-+{
-+ for (b = 0; b < 9; b++)
-+ {
-+ int e;
-+ for (d = 0; d < 5; d++)
-+ {
-+ a &= 231;
-+ a ^= 14;
-+ }
-+ e = (a ^= 1) < 0;
-+ }
-+}
---- gcc/testsuite/gcc.dg/pr64817-2.c.jj 2015-01-20 10:01:16.345964420 +0100
-+++ gcc/testsuite/gcc.dg/pr64817-2.c 2015-01-30 18:37:49.055911292 +0100
-@@ -0,0 +1,13 @@
-+/* PR debug/64817 */
-+/* { dg-do compile } */
-+/* { dg-options "-O3 -g" } */
-+
-+int a;
-+
-+void
-+foo (void)
-+{
-+ int e;
-+ a = ((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((a & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) & 231) ^ 14) ^ 1;
-+ e = (a < 0);
-+}
diff --git a/sources b/sources
index b488869..0c44ba8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80ccb31c5fbade3579f4aa74758f4fd9 gcc-5.0.0-20150130.tar.bz2
+7a2f0142ef9c636fec15e8896a1b637c gcc-5.0.0-20150205.tar.bz2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-06-29 12:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-29 12:26 [rpms/gcc] rhel-f41-base: 5.0.0-0.7 Jakub Jelinek
-- strict thread matches above, loose matches on Subject: below --
2026-06-29 12:26 Jakub Jelinek
2026-06-29 12:26 Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox