diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-04-30 12:37:47 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-05 12:26:41 +0100 |
commit | 478deec11f3349d61b1a922f047dc958dc07262a (patch) | |
tree | 1843907b36de2bcb8f821d49d8c9a88014ef0dc7 /meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0195-Fix-PR-c-48656.patch | |
parent | d42dccf886983ba14ccc868041d7bea0cf1a260e (diff) | |
download | poky-478deec11f3349d61b1a922f047dc958dc07262a.tar.gz |
gcc-4.6.0: Backport FSF 4.6 branch patches
This is set of bugfixes that has been done on
FSF gcc-4_2-branch since 4.6.0 was released
They will roll into 4.6.1 release once that
happens in coming approx 6 months time then
we can simply remove them thats the reason
so use a separate .inc file to define the
SRC_URI additions
(From OE-Core rev: b0d5b9f12adbce2c4a0df6059f5671188cd32293)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0195-Fix-PR-c-48656.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0195-Fix-PR-c-48656.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0195-Fix-PR-c-48656.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0195-Fix-PR-c-48656.patch new file mode 100644 index 0000000000..b1603c8453 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0195-Fix-PR-c-48656.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From 5d622f64eff4e9fa78356c24290aed131b5c519c Mon Sep 17 00:00:00 2001 | ||
2 | From: dodji <dodji@138bc75d-0d04-0410-961f-82ee72b054a4> | ||
3 | Date: Thu, 28 Apr 2011 19:46:34 +0000 | ||
4 | Subject: [PATCH 195/200] Fix PR c++/48656 | ||
5 | |||
6 | gcc/cp/ | ||
7 | |||
8 | * semantics.c (finish_call_expr): Don't forget BASELINK nodes when | ||
9 | considering call expressions involving a member function. | ||
10 | |||
11 | gcc/testsuite/ | ||
12 | |||
13 | * gcc/testsuite/g++.dg/template/inherit7.C: New test case. | ||
14 | |||
15 | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@173131 138bc75d-0d04-0410-961f-82ee72b054a4 | ||
16 | |||
17 | index 0d80771..b5c0b80 100644 | ||
18 | --- a/gcc/cp/semantics.c | ||
19 | +++ b/gcc/cp/semantics.c | ||
20 | @@ -2041,7 +2041,8 @@ finish_call_expr (tree fn, VEC(tree,gc) **args, bool disallow_virtual, | ||
21 | is not included in *ARGS even though it is considered to | ||
22 | be part of the list of arguments. Note that this is | ||
23 | related to CWG issues 515 and 1005. */ | ||
24 | - || ((TREE_CODE (TREE_TYPE (fn)) == METHOD_TYPE) | ||
25 | + || (((TREE_CODE (TREE_TYPE (fn)) == METHOD_TYPE) | ||
26 | + || BASELINK_P (fn)) | ||
27 | && current_class_ref | ||
28 | && type_dependent_expression_p (current_class_ref))) | ||
29 | { | ||
30 | new file mode 100644 | ||
31 | index 0000000..67afbca | ||
32 | --- /dev/null | ||
33 | +++ b/gcc/testsuite/g++.dg/template/inherit7.C | ||
34 | @@ -0,0 +1,21 @@ | ||
35 | +// Origin: PR c++/48656 | ||
36 | +// { dg-options "-std=c++0x" } | ||
37 | +// { dg-do compile } | ||
38 | + | ||
39 | +struct A { | ||
40 | + int f(); | ||
41 | + int f(int); | ||
42 | +}; | ||
43 | + | ||
44 | +template <typename> struct B : A | ||
45 | +{ | ||
46 | +}; | ||
47 | + | ||
48 | +template <typename T> struct C : B<T> | ||
49 | +{ | ||
50 | + void | ||
51 | + g() | ||
52 | + { | ||
53 | + A::f(); | ||
54 | + } | ||
55 | +}; | ||
56 | -- | ||
57 | 1.7.0.4 | ||
58 | |||