Skip to content

Commit f88f0a8

Browse files
committed
Remove a footgun-y feature / relic of the past from the compiletest DSL
1 parent 613bdd4 commit f88f0a8

File tree

2 files changed

+30
-38
lines changed

2 files changed

+30
-38
lines changed

src/tools/compiletest/src/header.rs

-8
Original file line numberDiff line numberDiff line change
@@ -882,14 +882,6 @@ fn iter_header(
882882
}
883883
let ln = ln.trim();
884884

885-
// Assume that any directives will be found before the first module or function. This
886-
// doesn't seem to be an optimization with a warm page cache. Maybe with a cold one.
887-
// FIXME(jieyouxu): this will cause `//@` directives in the rest of the test file to
888-
// not be checked.
889-
if ln.starts_with("fn") || ln.starts_with("mod") {
890-
return;
891-
}
892-
893885
let Some(directive_line) = line_directive(line_number, comment, ln) else {
894886
continue;
895887
};

tests/assembly/small_data_threshold.rs

+30-30
Original file line numberDiff line numberDiff line change
@@ -58,35 +58,35 @@ static mut Z: u64 = 0;
5858
// Currently, only MIPS and RISCV successfully put any objects in the small data
5959
// sections so the U/V/W/X tests are skipped on Hexagon and M68K
6060

61-
//@ RISCV: .section .sdata
62-
//@ RISCV-NOT: .section
63-
//@ RISCV: U:
64-
//@ RISCV: .section .sbss
65-
//@ RISCV-NOT: .section
66-
//@ RISCV: V:
67-
//@ RISCV: .section .sdata
68-
//@ RISCV-NOT: .section
69-
//@ RISCV: W:
70-
//@ RISCV: .section .sbss
71-
//@ RISCV-NOT: .section
72-
//@ RISCV: X:
61+
// RISCV: .section .sdata
62+
// RISCV-NOT: .section
63+
// RISCV: U:
64+
// RISCV: .section .sbss
65+
// RISCV-NOT: .section
66+
// RISCV: V:
67+
// RISCV: .section .sdata
68+
// RISCV-NOT: .section
69+
// RISCV: W:
70+
// RISCV: .section .sbss
71+
// RISCV-NOT: .section
72+
// RISCV: X:
7373

74-
//@ MIPS: .section .sdata
75-
//@ MIPS-NOT: .section
76-
//@ MIPS: U:
77-
//@ MIPS: .section .sbss
78-
//@ MIPS-NOT: .section
79-
//@ MIPS: V:
80-
//@ MIPS: .section .sdata
81-
//@ MIPS-NOT: .section
82-
//@ MIPS: W:
83-
//@ MIPS: .section .sbss
84-
//@ MIPS-NOT: .section
85-
//@ MIPS: X:
74+
// MIPS: .section .sdata
75+
// MIPS-NOT: .section
76+
// MIPS: U:
77+
// MIPS: .section .sbss
78+
// MIPS-NOT: .section
79+
// MIPS: V:
80+
// MIPS: .section .sdata
81+
// MIPS-NOT: .section
82+
// MIPS: W:
83+
// MIPS: .section .sbss
84+
// MIPS-NOT: .section
85+
// MIPS: X:
8686

87-
//@ CHECK: .section .data.Y,
88-
//@ CHECK-NOT: .section
89-
//@ CHECK: Y:
90-
//@ CHECK: .section .bss.Z,
91-
//@ CHECK-NOT: .section
92-
//@ CHECK: Z:
87+
// CHECK: .section .data.Y,
88+
// CHECK-NOT: .section
89+
// CHECK: Y:
90+
// CHECK: .section .bss.Z,
91+
// CHECK-NOT: .section
92+
// CHECK: Z:

0 commit comments

Comments
 (0)