diff options
| author | Michael Woerister <michaelwoerister@posteo> | 2018-09-12 12:46:48 +0200 |
|---|---|---|
| committer | Michael Woerister <michaelwoerister@posteo> | 2018-09-12 12:46:48 +0200 |
| commit | 3beb762dcf2ff721f2c30534ab6ce6b94c3aebaf (patch) | |
| tree | 77e88e2794da1982b8583bc1c6103eb0d49d9b9e /src/test/codegen-units | |
| parent | a2b991b5305b770c7d5288ab3aa231428511c530 (diff) | |
| download | rust-3beb762dcf2ff721f2c30534ab6ce6b94c3aebaf.tar.gz rust-3beb762dcf2ff721f2c30534ab6ce6b94c3aebaf.zip | |
Really make CGU names unique across crates.
Diffstat (limited to 'src/test/codegen-units')
| -rw-r--r-- | src/test/codegen-units/partitioning/extern-generic.rs | 4 | ||||
| -rw-r--r-- | src/test/codegen-units/partitioning/shared-generics.rs | 2 |
2 files changed, 3 insertions, 3 deletions
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]<u16> @@ shared_generics_aux.volatile[External] + //~ MONO_ITEM fn shared_generics_aux::generic_fn[0]<u16> @@ 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 |