From 3beb762dcf2ff721f2c30534ab6ce6b94c3aebaf Mon Sep 17 00:00:00 2001 From: Michael Woerister Date: Wed, 12 Sep 2018 12:46:48 +0200 Subject: Really make CGU names unique across crates. --- src/test/codegen-units/partitioning/extern-generic.rs | 4 ++-- src/test/codegen-units/partitioning/shared-generics.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/test/codegen-units') diff --git a/src/test/codegen-units/partitioning/extern-generic.rs b/src/test/codegen-units/partitioning/extern-generic.rs index a774376690a..e604d6a92c2 100644 --- a/src/test/codegen-units/partitioning/extern-generic.rs +++ b/src/test/codegen-units/partitioning/extern-generic.rs @@ -58,5 +58,5 @@ mod mod3 { // Make sure the two generic functions from the extern crate get instantiated // once for the current crate -//~ MONO_ITEM fn cgu_generic_function::foo[0]<&str> @@ cgu_generic_function.volatile[External] -//~ MONO_ITEM fn cgu_generic_function::bar[0]<&str> @@ cgu_generic_function.volatile[External] +//~ MONO_ITEM fn cgu_generic_function::foo[0]<&str> @@ cgu_generic_function-in-extern_generic.volatile[External] +//~ MONO_ITEM fn cgu_generic_function::bar[0]<&str> @@ cgu_generic_function-in-extern_generic.volatile[External] diff --git a/src/test/codegen-units/partitioning/shared-generics.rs b/src/test/codegen-units/partitioning/shared-generics.rs index 880361fac2e..8c261f967ca 100644 --- a/src/test/codegen-units/partitioning/shared-generics.rs +++ b/src/test/codegen-units/partitioning/shared-generics.rs @@ -19,7 +19,7 @@ extern crate shared_generics_aux; //~ MONO_ITEM fn shared_generics::foo[0] pub fn foo() { - //~ MONO_ITEM fn shared_generics_aux::generic_fn[0] @@ shared_generics_aux.volatile[External] + //~ MONO_ITEM fn shared_generics_aux::generic_fn[0] @@ shared_generics_aux-in-shared_generics.volatile[External] let _ = shared_generics_aux::generic_fn(0u16, 1u16); // This should not generate a monomorphization because it's already -- cgit 1.4.1-3-g733a5