mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
Khem Raj
671a00b977
Chromium/CEF reveals these warnings which are then treated as errors which has been fixed on gcc_5 branch upsteam. We backport the relevant commits Change-Id: I088a1480d49cdb439c72f0e159bee6de8ba94258 (From OE-Core rev: a8a5c58ec753a8bddc824eb15b06ad4cc8bd021e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
90 lines
3.1 KiB
Diff
90 lines
3.1 KiB
Diff
From 346ee8b5c2bf3bf0f0e681b2df5755f299aa1a68 Mon Sep 17 00:00:00 2001
|
|
From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
|
|
Date: Thu, 30 Apr 2015 16:31:36 +0000
|
|
Subject: [PATCH] /cp 2015-04-30 Paolo Carlini <paolo.carlini@oracle.com>
|
|
|
|
PR c++/65801
|
|
* typeck2.c (check_narrowing): In C++11 mode too, -Wno-narrowing
|
|
suppresses the diagnostic.
|
|
|
|
2015-04-30 Paolo Carlini <paolo.carlini@oracle.com>
|
|
|
|
PR c++/65801
|
|
* doc/invoke.texi ([-Wnarrowing]): Update.
|
|
|
|
/testsuite
|
|
2015-04-30 Paolo Carlini <paolo.carlini@oracle.com>
|
|
|
|
PR c++/65801
|
|
* g++.dg/cpp0x/Wnarrowing2.C: New.
|
|
|
|
|
|
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@222636 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
---
|
|
Upstream-Status: Backport
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
gcc/ChangeLog | 5 +++++
|
|
gcc/cp/ChangeLog | 6 ++++++
|
|
gcc/cp/typeck2.c | 10 +++++++---
|
|
gcc/doc/invoke.texi | 8 ++++----
|
|
gcc/testsuite/ChangeLog | 5 +++++
|
|
gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C | 5 +++++
|
|
6 files changed, 32 insertions(+), 7 deletions(-)
|
|
create mode 100644 gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C
|
|
|
|
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
|
|
index 80a6939..884957b 100644
|
|
--- a/gcc/cp/typeck2.c
|
|
+++ b/gcc/cp/typeck2.c
|
|
@@ -957,9 +957,13 @@ check_narrowing (tree type, tree init, tsubst_flags_t complain)
|
|
}
|
|
}
|
|
else if (complain & tf_error)
|
|
- error_at (EXPR_LOC_OR_LOC (init, input_location),
|
|
- "narrowing conversion of %qE from %qT to %qT inside { }",
|
|
- init, ftype, type);
|
|
+ {
|
|
+ global_dc->pedantic_errors = 1;
|
|
+ pedwarn (EXPR_LOC_OR_LOC (init, input_location), OPT_Wnarrowing,
|
|
+ "narrowing conversion of %qE from %qT to %qT inside { }",
|
|
+ init, ftype, type);
|
|
+ global_dc->pedantic_errors = flag_pedantic_errors;
|
|
+ }
|
|
}
|
|
|
|
return cxx_dialect == cxx98 || ok;
|
|
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
|
|
index 520c2c5..4ef8f7f 100644
|
|
--- a/gcc/doc/invoke.texi
|
|
+++ b/gcc/doc/invoke.texi
|
|
@@ -2703,10 +2703,10 @@ int i = @{ 2.2 @}; // error: narrowing from double to int
|
|
|
|
This flag is included in @option{-Wall} and @option{-Wc++11-compat}.
|
|
|
|
-With @option{-std=c++11}, @option{-Wno-narrowing} suppresses for
|
|
-non-constants the diagnostic required by the standard. Note that this
|
|
-does not affect the meaning of well-formed code; narrowing conversions
|
|
-are still considered ill-formed in SFINAE context.
|
|
+With @option{-std=c++11}, @option{-Wno-narrowing} suppresses the diagnostic
|
|
+required by the standard. Note that this does not affect the meaning
|
|
+of well-formed code; narrowing conversions are still considered
|
|
+ill-formed in SFINAE context.
|
|
|
|
@item -Wnoexcept @r{(C++ and Objective-C++ only)}
|
|
@opindex Wnoexcept
|
|
diff --git a/gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C b/gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C
|
|
new file mode 100644
|
|
index 0000000..fc806f9
|
|
--- /dev/null
|
|
+++ b/gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C
|
|
@@ -0,0 +1,5 @@
|
|
+// PR c++/65801
|
|
+// { dg-do compile { target c++11 } }
|
|
+// { dg-options "-Wno-narrowing" }
|
|
+
|
|
+static struct zai { unsigned int x; } x = {-1};
|
|
--
|
|
2.1.4
|
|
|