Improve handling of revision magic comments

Author: jieyouxu

src/tools/compiletest/src/header.rs

@@ -6,6 +6,7 @@ use std::io::BufReader;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
+use regex::Regex;
 use tracing::*;
 
 use crate::common::{Config, Debugger, FailMode, Mode, PassMode};
@@ -47,7 +48,7 @@ impl EarlyProps {
     pub fn from_reader<R: Read>(config: &Config, testfile: &Path, rdr: R) -> Self {
         let mut props = EarlyProps::default();
         let mut poisoned = false;
-        iter_header(config.mode, &mut poisoned, testfile, rdr, &mut |_, ln, _| {
+        iter_header(config.mode, &mut poisoned, testfile, rdr, &mut |_, _, ln, _| {
             config.push_name_value_directive(ln, directives::AUX_BUILD, &mut props.aux, |r| {
                 r.trim().to_string()
             });
@@ -315,7 +316,7 @@ impl TestProps {
 
             let mut poisoned = false;
 
-            iter_header(config.mode, &mut poisoned, testfile, file, &mut |revision, ln, _| {
+            iter_header(config.mode, &mut poisoned, testfile, file, &mut |revision, _, ln, _| {
                 if revision.is_some() && revision != cfg {
                     return;
                 }
@@ -647,7 +648,7 @@ fn iter_header<R: Read>(
     poisoned: &mut bool,
     testfile: &Path,
     rdr: R,
-    it: &mut dyn FnMut(Option<&str>, &str, usize),
+    it: &mut dyn FnMut(Option<&str>, &str, &str, usize),
 ) {
     iter_header_extra(mode, poisoned, testfile, rdr, &[], it)
 }
@@ -658,7 +659,7 @@ fn iter_header_extra(
     testfile: &Path,
     rdr: impl Read,
     extra_directives: &[&str],
-    it: &mut dyn FnMut(Option<&str>, &str, usize),
+    it: &mut dyn FnMut(Option<&str>, &str, &str, usize),
 ) {
     if testfile.is_dir() {
         return;
@@ -667,7 +668,7 @@ fn iter_header_extra(
     // Process any extra directives supplied by the caller (e.g. because they
     // are implied by the test mode), with a dummy line number of 0.
     for directive in extra_directives {
-        it(None, directive, 0);
+        it(None, directive, directive, 0);
     }
 
     let comment = if testfile.extension().is_some_and(|e| e == "rs") {
@@ -680,6 +681,8 @@ fn iter_header_extra(
     let mut ln = String::new();
     let mut line_number = 0;
 
+    let revision_magic_comment = Regex::new("//(\\[.*\\])~.*").unwrap();
+
     loop {
         line_number += 1;
         ln.clear();
@@ -690,14 +693,18 @@ fn iter_header_extra(
         // Assume that any directives will be found before the first
         // module or function. This doesn't seem to be an optimization
         // with a warm page cache. Maybe with a cold one.
+        let orig_ln = &ln;
         let ln = ln.trim();
         if ln.starts_with("fn") || ln.starts_with("mod") {
             return;
 
         // First try to accept `ui_test` style comments
         } else if let Some((lncfg, ln)) = line_directive(comment, ln) {
-            it(lncfg, ln, line_number);
-        } else if mode == Mode::Ui && matches!(line_directive("//", ln), Some((Some(_), _))) {
+            it(lncfg, orig_ln, ln, line_number);
+        } else if mode == Mode::Ui
+            && !revision_magic_comment.is_match(ln)
+            && matches!(line_directive("//", ln), Some((Some(_), _)))
+        {
             // We have a comment that's *successfully* parsed as an legacy-style directive.
             // We emit an error here to warn the user.
             *poisoned = true;
@@ -993,7 +1000,7 @@ pub fn make_test_description<R: Read>(
         path,
         src,
         extra_directives,
-        &mut |revision, ln, line_number| {
+        &mut |revision, orig_ln, ln, line_number| {
             if revision.is_some() && revision != cfg {
                 return;
             }
@@ -1021,7 +1028,7 @@ pub fn make_test_description<R: Read>(
             // Do not handle `// ignore-tidy` or `// ignore-tidy-*` because they are tidy directives,
             // not compiletest directives (which would begin with `//@` for UI tests).
             if config.mode == Mode::Ui {
-                let split = og_ln.trim_start().split_once("//");
+                let split = orig_ln.trim_start().split_once("//");
                 if !split
                     .map(|(pre, post)| {
                         pre.is_empty() && post.trim_start().starts_with("ignore-tidy")