Skip to content

Commit

Permalink
Add regression test for issue #64153.
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelwoerister committed Oct 22, 2019
1 parent e369d87 commit 412cec2
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
22 changes: 22 additions & 0 deletions src/test/run-make-fulldeps/issue-64153/Makefile
@@ -0,0 +1,22 @@
-include ../tools.mk

# Staticlibs don't include Rust object files from upstream crates if the same
# code was already pulled into the lib via LTO. However, the bug described in
# https://github.com/rust-lang/rust/issues/64153 lead to this exclusion not
# working properly if the upstream crate was compiled with an explicit filename
# (via `-o`).
#
# This test makes sure that functions defined in the upstream crates do not
# appear twice in the final staticlib when listing all the symbols from it.

all:
$(RUSTC) --crate-type rlib upstream.rs -o $(TMPDIR)/libupstream.rlib -Ccodegen-units=1
$(RUSTC) --crate-type staticlib downstream.rs -Clto -Ccodegen-units=1 -o $(TMPDIR)/libdownstream.a
# Dump all the symbols from the staticlib into `syms`
"$(LLVM_BIN_DIR)"/llvm-objdump -t $(TMPDIR)/libdownstream.a > $(TMPDIR)/syms
# Count the global instances of `issue64153_test_function`. There'll be 2
# if the `upstream` object file got erronously included twice.
# The line we are testing for with the regex looks something like:
# 0000000000000000 g F .text.issue64153_test_function 00000023 issue64153_test_function
grep -c -e "[[:space:]]g[[:space:]]*F[[:space:]].*issue64153_test_function" $(TMPDIR)/syms > $(TMPDIR)/count
[ "$$(cat $(TMPDIR)/count)" -eq "1" ]
6 changes: 6 additions & 0 deletions src/test/run-make-fulldeps/issue-64153/downstream.rs
@@ -0,0 +1,6 @@
extern crate upstream;

#[no_mangle]
pub extern "C" fn foo() {
print!("1 + 1 = {}", upstream::issue64153_test_function(1));
}
6 changes: 6 additions & 0 deletions src/test/run-make-fulldeps/issue-64153/upstream.rs
@@ -0,0 +1,6 @@
// Make this function extern "C", public, and no-mangle, so that it gets
// exported from the downstream staticlib.
#[no_mangle]
pub extern "C" fn issue64153_test_function(x: u32) -> u32 {
x + 1
}

0 comments on commit 412cec2

Please sign in to comment.