Merge ref 'b56aaec52bc0' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: b56aaec52bc0fa35591a872fb4aac81f606e265c
Filtered ref: 12f5e3255df658296af9fc953d8c1ab79ba91ea3

This merge was created using https://github.com/rust-lang/josh-sync.

3 files changed, 0 insertions, 169 deletions

diff --git a/tests/codegen/patchable-function-entry/patchable-function-entry-both-flags.rs b/tests/codegen/patchable-function-entry/patchable-function-entry-both-flags.rs
deleted file mode 100644
index 72204c78a49..00000000000
--- a/tests/codegen/patchable-function-entry/patchable-function-entry-both-flags.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-//@ compile-flags: -Z patchable-function-entry=15,10
-
-#![feature(patchable_function_entry)]
-#![crate_type = "lib"]
-
-// This should have the default, as set by the compile flags
-#[no_mangle]
-pub fn fun0() {}
-
-// The attribute should override the compile flags
-#[no_mangle]
-#[patchable_function_entry(prefix_nops = 1, entry_nops = 2)]
-pub fn fun1() {}
-
-// If we override an attribute to 0 or unset, the attribute should go away
-#[no_mangle]
-#[patchable_function_entry(entry_nops = 0)]
-pub fn fun2() {}
-
-// The attribute should override the compile flags
-#[no_mangle]
-#[patchable_function_entry(prefix_nops = 20, entry_nops = 1)]
-pub fn fun3() {}
-
-// The attribute should override the compile flags
-#[no_mangle]
-#[patchable_function_entry(prefix_nops = 2, entry_nops = 19)]
-pub fn fun4() {}
-
-// The attribute should override patchable-function-entry to 3 and
-// patchable-function-prefix to the default of 0, clearing it entirely
-#[no_mangle]
-#[patchable_function_entry(entry_nops = 3)]
-pub fn fun5() {}
-
-// The attribute should override patchable-function-prefix to 4
-// and patchable-function-entry to the default of 0, clearing it entirely
-#[no_mangle]
-#[patchable_function_entry(prefix_nops = 4)]
-pub fn fun6() {}
-
-// CHECK: @fun0() unnamed_addr #0
-// CHECK: @fun1() unnamed_addr #1
-// CHECK: @fun2() unnamed_addr #2
-// CHECK: @fun3() unnamed_addr #3
-// CHECK: @fun4() unnamed_addr #4
-// CHECK: @fun5() unnamed_addr #5
-// CHECK: @fun6() unnamed_addr #6
-
-// CHECK: attributes #0 = { {{.*}}"patchable-function-entry"="5"{{.*}}"patchable-function-prefix"="10" {{.*}} }
-// CHECK: attributes #1 = { {{.*}}"patchable-function-entry"="2"{{.*}}"patchable-function-prefix"="1" {{.*}} }
-
-// CHECK-NOT: attributes #2 = { {{.*}}patchable-function-entry{{.*}} }
-// CHECK-NOT: attributes #2 = { {{.*}}patchable-function-prefix{{.*}} }
-// CHECK: attributes #2 = { {{.*}} }
-
-// CHECK: attributes #3 = { {{.*}}"patchable-function-entry"="1"{{.*}}"patchable-function-prefix"="20" {{.*}} }
-// CHECK: attributes #4 = { {{.*}}"patchable-function-entry"="19"{{.*}}"patchable-function-prefix"="2" {{.*}} }
-
-// CHECK: attributes #5 = { {{.*}}"patchable-function-entry"="3"{{.*}} }
-// CHECK-NOT: attributes #5 = { {{.*}}patchable-function-prefix{{.*}} }
-
-// CHECK: attributes #6 = { {{.*}}"patchable-function-prefix"="4"{{.*}} }
-// CHECK-NOT: attributes #6 = { {{.*}}patchable-function-entry{{.*}} }
diff --git a/tests/codegen/patchable-function-entry/patchable-function-entry-no-flag.rs b/tests/codegen/patchable-function-entry/patchable-function-entry-no-flag.rs
deleted file mode 100644
index 3a7078fe551..00000000000
--- a/tests/codegen/patchable-function-entry/patchable-function-entry-no-flag.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-#![feature(patchable_function_entry)]
-#![crate_type = "lib"]
-
-// No patchable function entry should be set
-#[no_mangle]
-pub fn fun0() {}
-
-// The attribute should work even without compiler flags
-#[no_mangle]
-#[patchable_function_entry(prefix_nops = 1, entry_nops = 2)]
-pub fn fun1() {}
-
-// The attribute should work even without compiler flags
-// and only set patchable-function-entry to 3.
-#[no_mangle]
-#[patchable_function_entry(entry_nops = 3)]
-pub fn fun2() {}
-
-// The attribute should work even without compiler flags
-// and only set patchable-function-prefix to 4.
-#[no_mangle]
-#[patchable_function_entry(prefix_nops = 4)]
-pub fn fun3() {}
-
-// CHECK: @fun0() unnamed_addr #0
-// CHECK: @fun1() unnamed_addr #1
-// CHECK: @fun2() unnamed_addr #2
-// CHECK: @fun3() unnamed_addr #3
-
-// CHECK-NOT: attributes #0 = { {{.*}}patchable-function-entry{{.*}} }
-// CHECK-NOT: attributes #0 = { {{.*}}patchable-function-prefix{{.*}} }
-
-// CHECK: attributes #1 = { {{.*}}"patchable-function-entry"="2"{{.*}}"patchable-function-prefix"="1" {{.*}} }
-
-// CHECK: attributes #2 = { {{.*}}"patchable-function-entry"="3"{{.*}} }
-// CHECK-NOT: attributes #2 = { {{.*}}patchable-function-prefix{{.*}} }
-
-// CHECK: attributes #3 = { {{.*}}"patchable-function-prefix"="4"{{.*}} }
-// CHECK-NOT: attributes #3 = { {{.*}}patchable-function-entry{{.*}} }
diff --git a/tests/codegen/patchable-function-entry/patchable-function-entry-one-flag.rs b/tests/codegen/patchable-function-entry/patchable-function-entry-one-flag.rs
deleted file mode 100644
index 8bdd61e461b..00000000000
--- a/tests/codegen/patchable-function-entry/patchable-function-entry-one-flag.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-//@ compile-flags: -Z patchable-function-entry=15
-
-#![feature(patchable_function_entry)]
-#![crate_type = "lib"]
-
-// This should have the default, as set by the compile flags
-#[no_mangle]
-pub fn fun0() {}
-
-// The attribute should override the compile flags
-#[no_mangle]
-#[patchable_function_entry(prefix_nops = 1, entry_nops = 2)]
-pub fn fun1() {}
-
-// If we override an attribute to 0 or unset, the attribute should go away
-#[no_mangle]
-#[patchable_function_entry(entry_nops = 0)]
-pub fn fun2() {}
-
-// The attribute should override the compile flags
-#[no_mangle]
-#[patchable_function_entry(prefix_nops = 20, entry_nops = 1)]
-pub fn fun3() {}
-
-// The attribute should override the compile flags
-#[no_mangle]
-#[patchable_function_entry(prefix_nops = 2, entry_nops = 19)]
-pub fn fun4() {}
-
-// The attribute should override patchable-function-entry to 3
-// and patchable-function-prefix to the default of 0, clearing it entirely
-#[no_mangle]
-#[patchable_function_entry(entry_nops = 3)]
-pub fn fun5() {}
-
-// The attribute should override patchable-function-prefix to 4
-// and patchable-function-entry to the default of 0, clearing it entirely
-#[no_mangle]
-#[patchable_function_entry(prefix_nops = 4)]
-pub fn fun6() {}
-
-// CHECK: @fun0() unnamed_addr #0
-// CHECK: @fun1() unnamed_addr #1
-// CHECK: @fun2() unnamed_addr #2
-// CHECK: @fun3() unnamed_addr #3
-// CHECK: @fun4() unnamed_addr #4
-// CHECK: @fun5() unnamed_addr #5
-// CHECK: @fun6() unnamed_addr #6
-
-// CHECK: attributes #0 = { {{.*}}"patchable-function-entry"="15" {{.*}} }
-// CHECK-NOT: attributes #0 = { {{.*}}patchable-function-prefix{{.*}} }
-
-// CHECK: attributes #1 = { {{.*}}"patchable-function-entry"="2"{{.*}}"patchable-function-prefix"="1" {{.*}} }
-
-// CHECK-NOT: attributes #2 = { {{.*}}patchable-function-entry{{.*}} }
-// CHECK-NOT: attributes #2 = { {{.*}}patchable-function-prefix{{.*}} }
-// CHECK: attributes #2 = { {{.*}} }
-
-// CHECK: attributes #3 = { {{.*}}"patchable-function-entry"="1"{{.*}}"patchable-function-prefix"="20" {{.*}} }
-// CHECK: attributes #4 = { {{.*}}"patchable-function-entry"="19"{{.*}}"patchable-function-prefix"="2" {{.*}} }
-
-// CHECK: attributes #5 = { {{.*}}"patchable-function-entry"="3"{{.*}} }
-// CHECK-NOT: attributes #5 = { {{.*}}patchable-function-prefix{{.*}} }
-
-// CHECK: attributes #6 = { {{.*}}"patchable-function-prefix"="4"{{.*}} }
-// CHECK-NOT: attributes #6 = { {{.*}}patchable-function-entry{{.*}} }