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/statics.rs | 186 --------------------------------- 1 file changed, 186 deletions(-) delete mode 100644 src/test/incremental/hashes/statics.rs (limited to 'src/test/incremental/hashes/statics.rs') diff --git a/src/test/incremental/hashes/statics.rs b/src/test/incremental/hashes/statics.rs deleted file mode 100644 index 67d87f5c4..000000000 --- a/src/test/incremental/hashes/statics.rs +++ /dev/null @@ -1,186 +0,0 @@ -// This test case tests the incremental compilation hash (ICH) implementation -// for statics. - -// 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)] -#![feature(linkage)] -#![feature(thread_local)] -#![crate_type="rlib"] - - -// Change static visibility -#[cfg(any(cfail1,cfail4))] -static STATIC_VISIBILITY: u8 = 0; - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes")] -#[rustc_clean(cfg="cfail6")] -pub static STATIC_VISIBILITY: u8 = 0; - - -// Change static mutability -#[cfg(any(cfail1,cfail4))] -static STATIC_MUTABILITY: u8 = 0; - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes")] -#[rustc_clean(cfg="cfail6")] -static mut STATIC_MUTABILITY: u8 = 0; - - -// Add linkage attribute -#[cfg(any(cfail1,cfail4))] -static STATIC_LINKAGE: u8 = 0; - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5")] -#[rustc_clean(cfg="cfail6")] -#[linkage="weak_odr"] -static STATIC_LINKAGE: u8 = 0; - - -// Add no_mangle attribute -#[cfg(any(cfail1,cfail4))] -static STATIC_NO_MANGLE: u8 = 0; - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5")] -#[rustc_clean(cfg="cfail6")] -#[no_mangle] -static STATIC_NO_MANGLE: u8 = 0; - - -// Add thread_local attribute -#[cfg(any(cfail1,cfail4))] -static STATIC_THREAD_LOCAL: u8 = 0; - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5")] -#[rustc_clean(cfg="cfail6")] -#[thread_local] -static STATIC_THREAD_LOCAL: u8 = 0; - - -// Change type from i16 to u64 -#[cfg(any(cfail1,cfail4))] -static STATIC_CHANGE_TYPE_1: i16 = 0; - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,type_of")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,type_of")] -#[rustc_clean(cfg="cfail6")] -static STATIC_CHANGE_TYPE_1: u64 = 0; - - -// Change type from Option to Option -#[cfg(any(cfail1,cfail4))] -static STATIC_CHANGE_TYPE_2: Option = None; - -#[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,type_of")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,type_of")] -#[rustc_clean(cfg="cfail6")] -static STATIC_CHANGE_TYPE_2: Option = None; - - -// Change value between simple literals -#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")] -#[rustc_clean(cfg="cfail6")] -static STATIC_CHANGE_VALUE_1: i16 = { - #[cfg(any(cfail1,cfail4))] - { 1 } - - #[cfg(not(any(cfail1,cfail4)))] - { 2 } -}; - - -// Change value between expressions -#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")] -#[rustc_clean(cfg="cfail6")] -static STATIC_CHANGE_VALUE_2: i16 = { - #[cfg(any(cfail1,cfail4))] - { 1 + 1 } - - #[cfg(not(any(cfail1,cfail4)))] - { 1 + 2 } -}; - -#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")] -#[rustc_clean(cfg="cfail6")] -static STATIC_CHANGE_VALUE_3: i16 = { - #[cfg(any(cfail1,cfail4))] - { 2 + 3 } - - #[cfg(not(any(cfail1,cfail4)))] - { 2 * 3 } -}; - -#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")] -#[rustc_clean(cfg="cfail3")] -#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")] -#[rustc_clean(cfg="cfail6")] -static STATIC_CHANGE_VALUE_4: i16 = { - #[cfg(any(cfail1,cfail4))] - { 1 + 2 * 3 } - - #[cfg(not(any(cfail1,cfail4)))] - { 1 + 2 * 4 } -}; - - -// Change type indirectly -struct ReferencedType1; -struct ReferencedType2; - -mod static_change_type_indirectly { - #[cfg(any(cfail1,cfail4))] - use super::ReferencedType1 as Type; - - #[cfg(not(any(cfail1,cfail4)))] - use super::ReferencedType2 as Type; - - #[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,type_of")] - #[rustc_clean(cfg="cfail3")] - #[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,type_of")] - #[rustc_clean(cfg="cfail6")] - static STATIC_CHANGE_TYPE_INDIRECTLY_1: Type = Type; - - #[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,type_of")] - #[rustc_clean(cfg="cfail3")] - #[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,type_of")] - #[rustc_clean(cfg="cfail6")] - static STATIC_CHANGE_TYPE_INDIRECTLY_2: Option = None; -} -- cgit v1.2.3