* [gold commit] PR 21841: Workaround GCC 7 bug with debug line numbers
@ 2017-12-02 6:58 Cary Coutant
0 siblings, 0 replies; only message in thread
From: Cary Coutant @ 2017-12-02 6:58 UTC (permalink / raw)
To: Binutils
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
I've committed the following patch to workaround a GCC 7 bug with
debug line numbers that is causing a debug_msg.sh failure.
-cary
2017-12-01 Cary Coutant <ccoutant@gmail.com>
gold/
PR gold/21841
* testsuite/debug_msg.sh: Adjust expected line numbers.
* testsuite/odr_violation2.cc (DummyFunction): New function.
[-- Attachment #2: pr21841.patch --]
[-- Type: application/octet-stream, Size: 2596 bytes --]
Workaround GCC 7 bug with debug line numbers causing debug_msg.sh failure.
2017-12-01 Cary Coutant <ccoutant@gmail.com>
gold/
PR gold/21841
* testsuite/debug_msg.sh: Adjust expected line numbers.
* testsuite/odr_violation2.cc (DummyFunction): New function.
diff --git a/gold/testsuite/debug_msg.sh b/gold/testsuite/debug_msg.sh
index 032397bb59..5668d8e9f4 100755
--- a/gold/testsuite/debug_msg.sh
+++ b/gold/testsuite/debug_msg.sh
@@ -88,7 +88,7 @@ check_missing debug_msg.err "odr_violation1.cc:1[6-8]"
check_missing debug_msg.err "odr_violation2.cc:2[3-5]"
check debug_msg.err ": symbol 'SometimesInlineFunction(int)' defined in multiple places (possible ODR violation):"
check debug_msg.err "debug_msg.cc:6[89]"
-check debug_msg.err "odr_violation2.cc:2[7-9]"
+check debug_msg.err "odr_violation2.cc:3[0-7]"
# Check for the same error messages when using --compressed-debug-sections.
if test -r debug_msg_cdebug.err
@@ -114,7 +114,7 @@ then
check_missing debug_msg_cdebug.err "odr_violation2.cc:2[3-5]"
check debug_msg_cdebug.err ": symbol 'SometimesInlineFunction(int)' defined in multiple places (possible ODR violation):"
check debug_msg_cdebug.err "debug_msg.cc:6[89]"
- check debug_msg_cdebug.err "odr_violation2.cc:2[7-9]"
+ check debug_msg_cdebug.err "odr_violation2.cc:3[0-7]"
fi
# When linking together .so's, we don't catch the line numbers, but we
@@ -132,7 +132,7 @@ check_missing debug_msg_so.err "odr_violation1.cc:1[6-8]"
check_missing debug_msg_so.err "odr_violation2.cc:2[3-5]"
check debug_msg_so.err ": symbol 'SometimesInlineFunction(int)' defined in multiple places (possible ODR violation):"
check debug_msg_so.err "debug_msg.cc:6[89]"
-check debug_msg_so.err "odr_violation2.cc:2[7-9]"
+check debug_msg_so.err "odr_violation2.cc:3[0-7]"
# These messages shouldn't need any debug info to detect:
check debug_msg_ndebug.err "debug_msg_ndebug.so: error: undefined reference to 'undef_fn1()'"
diff --git a/gold/testsuite/odr_violation2.cc b/gold/testsuite/odr_violation2.cc
index e3d30f3949..aa9868fc27 100644
--- a/gold/testsuite/odr_violation2.cc
+++ b/gold/testsuite/odr_violation2.cc
@@ -23,6 +23,14 @@ void SortDescending(int array[], int size) {
extern "C" int OverriddenCFunction(int i) {
return i * i;
}
+
+// Extra lines to put SometimeInlineFunction at line 30+.
+
+// And a dummy function to workaround a GCC 7 bug with debug line numbers.
+int DummyFunction(int i) {
+ return i ^ 0x5555;
+}
+
// This is inline in debug_msg.cc, which makes it a weak symbol too.
int SometimesInlineFunction(int i) {
return i * i;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-12-02 6:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-02 6:58 [gold commit] PR 21841: Workaround GCC 7 bug with debug line numbers Cary Coutant
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).