Fix internal error from command line with unbalanced --start-lib/--end-lib.

The problem is that while the command line isn't trivially empty,
it contains no input files. As gold tries to configure the number
of threads to use based on the number of input files, this causes
the assertion failure above. Fix this problem by making the logic
in gold.cc more robust and also adding a better error message
about --start-lib to options.cc.

gold/
	PR gold/22406
	* gold.cc (queue_initial_tasks) Check for number of real input files.
	* options.cc (Command_line::process) Check for unterminated --start-lib
	options.
	* testsuite/Makefile.am: Add new test script.
	* testsuite/Makefile.in: Regenerate.
	* testsuite/check_empty_command_lines.sh: New test script.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index e4b890e5f3af13a7f1eb08733bc55a1e324a7bc2..bb84efa790d281b2c827fb81064277cb50d7c404 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,13 @@
+2017-12-01  Benjamin Peterson  <bp@benjamin.pe>
+
+       PR gold/22406
+       * gold.cc (queue_initial_tasks) Check for number of real input files.
+       * options.cc (Command_line::process) Check for unterminated --start-lib
+       options.
+       * testsuite/Makefile.am: Add new test script.
+       * testsuite/Makefile.in: Regenerate.
+       * testsuite/check_empty_command_lines.sh: New test script.
+
 2017-11-17  Stephen Crane  <sjc@immunant.com>
 
        PR gold/22448

diff --git a/gold/gold.cc b/gold/gold.cc
index a76d155f940a178a992e98e24805bd9eb154f0c6..3916f892c9c8f19ee45e73df7b24a003dd553e71 100644 (file)
--- a/gold/gold.cc
+++ b/gold/gold.cc
@@ -175,7 +175,7 @@ queue_initial_tasks(const General_options& options,
                    Workqueue* workqueue, Input_objects* input_objects,
                    Symbol_table* symtab, Layout* layout, Mapfile* mapfile)
 {
-  if (cmdline.begin() == cmdline.end())
+  if (cmdline.number_of_input_files() == 0)
     {
       bool is_ok = false;
       if (options.printed_version())

diff --git a/gold/options.cc b/gold/options.cc
index ed63b6f04feb08b1f6c75d7ada86d1d0eb1f2bdb..f54fb9b1cb4946a177fbda740915f3086896fa12 100644 (file)
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -1569,6 +1569,12 @@ Command_line::process(int argc, const char** argv)
       usage();
     }
 
+  if (this->inputs_.in_lib())
+    {
+      fprintf(stderr, _("%s: missing lib end\n"), program_name);
+      usage();
+    }
+
   // Normalize the options and ensure they don't contradict each other.
   this->options_.finalize();
 }

diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index d8426db62f67a28c80b92d8241ace6aef6c19faa..5f7f66ff4b42759db548b06c353d4b852531f3eb 100644 (file)
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -157,6 +157,10 @@ endif NATIVE_OR_CROSS_LINKER
 if NATIVE_LINKER
 if GCC
 
+# Test empty command line error conditions.
+check_SCRIPTS += empty_command_line_test.sh
+empty_command_line_test.sh: gcctestdir/ld
+
 # Each of these .o's is a useful, small complete program.  They're
 # particularly useful for making sure ld-new's flags do what they're
 # supposed to (hence their names), but are used for many tests that

diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index c42c47279567f6ab518f2d2e7cd239916e4e09af..9bb3b56ddc15c96b8c3b0df552a11bb34de321cd 100644 (file)
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -74,7 +74,20 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 @NATIVE_OR_CROSS_LINKER_TRUE@am__append_1 = object_unittest \
 @NATIVE_OR_CROSS_LINKER_TRUE@  binary_unittest leb128_unittest \
 @NATIVE_OR_CROSS_LINKER_TRUE@  overflow_unittest
-@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_2 = incremental_test.sh \
+
+# ---------------------------------------------------------------------
+# These tests test the output of gold (end-to-end tests).  In
+# particular, they make sure that gold can link "difficult" object
+# files, and the resulting object files run correctly.  These can only
+# run if we've built ld-new for the native architecture (that is,
+# we're not cross-compiling it), since we run ld-new as part of these
+# tests.  We use the gcc-specific flag '-B' to use our linker instead
+# of the default linker, which is why we only run our tests under gcc.
+
+# Test empty command line error conditions.
+@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_2 =  \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ empty_command_line_test.sh \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ gc_comdat_test.sh gc_tls_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ gc_orphan_section_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ pr14265.sh pr20717.sh \
@@ -5137,6 +5150,8 @@ check-html recheck-html:
        rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \
        $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
        exit $$rv
+empty_command_line_test.sh.log: empty_command_line_test.sh
+       @p='empty_command_line_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 incremental_test.sh.log: incremental_test.sh
        @p='incremental_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 gc_comdat_test.sh.log: gc_comdat_test.sh
@@ -5906,15 +5921,7 @@ uninstall-am:
 @GCC_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@        (cd gcctestdir && $(LN_S) $(abs_top_builddir)/../gas/as-new as)
 @NATIVE_OR_CROSS_LINKER_TRUE@overflow_unittest.o: overflow_unittest.cc
 @NATIVE_OR_CROSS_LINKER_TRUE@  $(CXXCOMPILE) -O3 -c -o $@ $<
-
-# ---------------------------------------------------------------------
-# These tests test the output of gold (end-to-end tests).  In
-# particular, they make sure that gold can link "difficult" object
-# files, and the resulting object files run correctly.  These can only
-# run if we've built ld-new for the native architecture (that is,
-# we're not cross-compiling it), since we run ld-new as part of these
-# tests.  We use the gcc-specific flag '-B' to use our linker instead
-# of the default linker, which is why we only run our tests under gcc.
+@GCC_TRUE@@NATIVE_LINKER_TRUE@empty_command_line_test.sh: gcctestdir/ld
 
 # Each of these .o's is a useful, small complete program.  They're
 # particularly useful for making sure ld-new's flags do what they're

diff --git a/gold/testsuite/empty_command_line_test.sh b/gold/testsuite/empty_command_line_test.sh
new file mode 100755 (executable)
index 0000000..ab6a0d8
--- /dev/null
+++ b/gold/testsuite/empty_command_line_test.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# empty_command_line_test.sh -- test various command lines with no inputs
+
+# Copyright (C) 2017 Free Software Foundation, Inc.
+# Written by Benjamin Peterson <bp@benjamin.pe>
+
+# This file is part of gold.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+check()
+{
+    expected_msg="$1"
+    shift
+    echo "checking empty command line '$@'"
+    err=$(gcctestdir/ld "$@" 2>&1)
+    if [ $? != 1 ]; then
+        echo "gold didn't fail"
+        exit 1
+    fi
+    echo "$err" | grep -q "$expected_msg" || {
+        echo "unexpected error message: $err"
+        exit 1
+    }
+}
+
+check "no input files"
+check "missing lib end" --start-lib
+check "missing group end" --start-group