From 8a09787a795d29e36b0309e0956fef47fe417249 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Wed, 7 Feb 2018 21:27:37 +0200 Subject: [PATCH] test: use the right amount of CGUs in sepcomp-cci-copies to ensure deterministic splitting. --- src/test/run-make/sepcomp-cci-copies/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/run-make/sepcomp-cci-copies/Makefile b/src/test/run-make/sepcomp-cci-copies/Makefile index ccd4e1b0e715a..36f913ff3faac 100644 --- a/src/test/run-make/sepcomp-cci-copies/Makefile +++ b/src/test/run-make/sepcomp-cci-copies/Makefile @@ -2,9 +2,11 @@ # Check that cross-crate inlined items are inlined in all compilation units # that refer to them, and not in any other compilation units. +# Note that we have to pass `-C codegen-units=6` because up to two CGUs may be +# created for each source module (see `rustc_mir::monomorphize::partitioning`). all: $(RUSTC) cci_lib.rs - $(RUSTC) foo.rs --emit=llvm-ir -C codegen-units=3 \ + $(RUSTC) foo.rs --emit=llvm-ir -C codegen-units=6 \ -Z inline-in-all-cgus [ "$$(cat "$(TMPDIR)"/foo.*.ll | grep -c define\ .*cci_fn)" -eq "2" ]