From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/incremental/hashes/if_expressions.rs | 228 -------------------------- 1 file changed, 228 deletions(-) delete mode 100644 src/test/incremental/hashes/if_expressions.rs (limited to 'src/test/incremental/hashes/if_expressions.rs') diff --git a/src/test/incremental/hashes/if_expressions.rs b/src/test/incremental/hashes/if_expressions.rs deleted file mode 100644 index cff557dcb..000000000 --- a/src/test/incremental/hashes/if_expressions.rs +++ /dev/null @@ -1,228 +0,0 @@ -// This test case tests the incremental compilation hash (ICH) implementation -// for if expressions. - -// The general pattern followed here is: Change one thing between rev1 and rev2 -// and make sure that the hash has changed, then change nothing between rev2 and -// rev3 and make sure that the hash has not changed. - -// build-pass (FIXME(62277): could be check-pass?) -// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6 -// compile-flags: -Z query-dep-graph -O -// [cfail1]compile-flags: -Zincremental-ignore-spans -// [cfail2]compile-flags: -Zincremental-ignore-spans -// [cfail3]compile-flags: -Zincremental-ignore-spans -// [cfail4]compile-flags: -Zincremental-relative-spans -// [cfail5]compile-flags: -Zincremental-relative-spans -// [cfail6]compile-flags: -Zincremental-relative-spans - -#![allow(warnings)] -#![feature(rustc_attrs)] -#![crate_type="rlib"] - -// Change condition (if) -#[cfg(any(cfail1,cfail4))] -pub fn change_condition(x: bool) -> u32 { - if x { - return 1 - } - - return 0 -} - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")] -#[rustc_clean(cfg="cfail6")] -pub fn change_condition(x: bool) -> u32 { - if !x { - return 1 - } - - return 0 -} - -// Change then branch (if) -#[cfg(any(cfail1,cfail4))] -pub fn change_then_branch(x: bool) -> u32 { - if x { - return 1 - } - - return 0 -} - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir")] -#[rustc_clean(cfg="cfail6")] -pub fn change_then_branch(x: bool) -> u32 { - if x { - return 2 - } - - return 0 -} - - - -// Change else branch (if) -#[cfg(any(cfail1,cfail4))] -pub fn change_else_branch(x: bool) -> u32 { - if x { - 1 - } else { - 2 - } -} - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir")] -#[rustc_clean(cfg="cfail6")] -pub fn change_else_branch(x: bool) -> u32 { - if x { - 1 - } else { - 3 - } -} - - - -// Add else branch (if) -#[cfg(any(cfail1,cfail4))] -pub fn add_else_branch(x: bool) -> u32 { - let mut ret = 1; - - if x { - ret = 2; - /*----*/ - } - - ret -} - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,typeck")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,typeck")] -#[rustc_clean(cfg="cfail6")] -pub fn add_else_branch(x: bool) -> u32 { - let mut ret = 1; - - if x { - ret = 2; - } else { - } - - ret -} - - - -// Change condition (if let) -#[cfg(any(cfail1,cfail4))] -pub fn change_condition_if_let(x: Option) -> u32 { - if let Some(_x) = x { - return 1 - } - - 0 -} - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")] -#[rustc_clean(cfg="cfail6")] -pub fn change_condition_if_let(x: Option) -> u32 { - if let Some(_ ) = x { - return 1 - } - - 0 -} - - - -// Change then branch (if let) -#[cfg(any(cfail1,cfail4))] -pub fn change_then_branch_if_let(x: Option) -> u32 { - if let Some(x) = x { - return x //- - } - - 0 -} - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")] -#[rustc_clean(cfg="cfail6")] -pub fn change_then_branch_if_let(x: Option) -> u32 { - if let Some(x) = x { - return x + 1 - } - - 0 -} - - - -// Change else branch (if let) -#[cfg(any(cfail1,cfail4))] -pub fn change_else_branch_if_let(x: Option) -> u32 { - if let Some(x) = x { - x - } else { - 1 - } -} - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir")] -#[rustc_clean(cfg="cfail6")] -pub fn change_else_branch_if_let(x: Option) -> u32 { - if let Some(x) = x { - x - } else { - 2 - } -} - - - -// Add else branch (if let) -#[cfg(any(cfail1,cfail4))] -pub fn add_else_branch_if_let(x: Option) -> u32 { - let mut ret = 1; - - if let Some(x) = x { - ret = x; - /*----*/ - } - - ret -} - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,typeck")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,typeck,optimized_mir")] -#[rustc_clean(cfg="cfail6")] -pub fn add_else_branch_if_let(x: Option) -> u32 { - let mut ret = 1; - - if let Some(x) = x { - ret = x; - } else { - } - - ret -} -- cgit v1.2.3