Address coderrabit comments

Author: mborland

src/pending_changes/gh-252-extern-inline-definitions.txt

@@ -25,6 +25,10 @@ with --c++17:
   #include "a.h"
   int g2() { return A<int>().f(); }  // Linking with a.cpp previously failed.
 
+  // c.cpp
+  #include "a.h"
+  template struct A<int>;
+
 The same problem affected GNU C89 "extern inline" functions, functions with
 the gnu_inline attribute in C99 and later C modes (which lost the "extern"
 keyword), and such definitions of functions with an ellipsis (which were not

tests/tests/regressions/gh-252/.test.rto/default.1.1.txt

@@ -1,4 +1,7 @@
-eccp -DTEST_NUMBER=1 --c++17 Test_name.c use.C inst.C
+./check_defs -DTEST_NUMBER=1 --c++17 Test_name.c use.C inst.C
 Test_name.c:
 use.C:
 inst.C:
+Test_name.o:
+use.o:
+inst.o: _ZN1AIiE1fEv _ZN1AIiE1gEiz

tests/tests/regressions/gh-252/.test.rto/default.2.1.txt

@@ -1,4 +1,7 @@
-eccp -DTEST_NUMBER=2 --c++17 --g++ Test_name.c use.C inst.C
+./check_defs -DTEST_NUMBER=2 --c++17 --g++ Test_name.c use.C inst.C
 Test_name.c:
 use.C:
 inst.C:
+Test_name.o:
+use.o:
+inst.o: _ZN1AIiE1fEv _ZN1AIiE1gEiz

tests/tests/regressions/gh-252/.test.rto/default.3.1.txt

@@ -1,4 +1,7 @@
-eccp -DTEST_NUMBER=3 --c++17 --g++ -tused Test_name.c use.C inst.C
+./check_defs -DTEST_NUMBER=3 --c++17 --g++ -tused Test_name.c use.C inst.C
 Test_name.c:
 use.C:
 inst.C:
+Test_name.o:
+use.o:
+inst.o: _ZN1AIiE1fEv _ZN1AIiE1gEiz

tests/tests/regressions/gh-252/.test.rto/default.4.1.txt

@@ -1,4 +1,7 @@
-eccp -DTEST_NUMBER=4 --c++17 --clang Test_name.c use.C inst.C
+./check_defs -DTEST_NUMBER=4 --c++17 --clang Test_name.c use.C inst.C
 Test_name.c:
 use.C:
 inst.C:
+Test_name.o:
+use.o:
+inst.o: _ZN1AIiE1fEv _ZN1AIiE1gEiz

tests/tests/regressions/gh-252/check_defs

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Compile each source file to an object file, check that only inst.o (the
+# explicit instantiation) defines A<int>::f and A<int>::g, and then link the
+# object files.
+opts=
+objs=
+for arg in "$@"; do
+  case $arg in
+    *.c | *.C) objs="$objs ${arg%.*}.o" ;;
+    *) opts="$opts $arg" ;;
+  esac
+done
+eccp -c "$@" || exit $?
+status=0
+for obj in $objs; do
+  defs=`nm -g --defined-only $obj | grep -o '_ZN1AIiE1[fg]E[a-z]*' | sort`
+  defs=`echo $defs`
+  echo $obj: $defs
+  expected=
+  if [ $obj = inst.o ]; then
+    expected="_ZN1AIiE1fEv _ZN1AIiE1gEiz"
+  fi
+  if [ "$defs" != "$expected" ]; then
+    echo "FAIL: Expected '$expected'."
+    status=1
+  fi
+done
+if [ $status -ne 0 ]; then
+  exit $status
+fi
+exec eccp $opts $objs

tests/tests/regressions/gh-252/test.mft.cpp

@@ -1,6 +1,7 @@
 //type:rp
 //options:--c++17:--c++17 --g++:--c++17 --g++ -tused:--c++17 --clang
 //source_files:a.h use.C inst.C
+//script:./check_defs
 // The members of A<int> are used here and in use.C, but only inst.C may
 // define them; each object used to contain an external definition.
 #include "a.h"