diff --git a/Cargo.lock b/Cargo.lock index 83297edfba5d7..ba1326a5d9a31 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12270,9 +12270,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -12302,9 +12302,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -15886,9 +15886,9 @@ dependencies = [ [[package]] name = "strum" -version = "0.26.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" [[package]] name = "strum_macros" @@ -16733,7 +16733,7 @@ dependencies = [ "prost 0.12.3", "rustls-native-certs 0.7.0", "rustls-pemfile 2.1.1", - "strum 0.26.3", + "strum 0.26.2", "strum_macros 0.26.4", "tokio", "tokio-rustls 0.26.0", diff --git a/third_party/move/move-compiler-v2/src/experiments.rs b/third_party/move/move-compiler-v2/src/experiments.rs index ceea7b65d8403..aff135a87e099 100644 --- a/third_party/move/move-compiler-v2/src/experiments.rs +++ b/third_party/move/move-compiler-v2/src/experiments.rs @@ -166,7 +166,7 @@ pub static EXPERIMENTS: Lazy> = Lazy::new(|| { Experiment { name: Experiment::CFG_SIMPLIFICATION.to_string(), description: "Whether to do the control flow graph simplification".to_string(), - default: Inherited(Experiment::OPTIMIZE_WAITING_FOR_COMPARE_TESTS.to_string()), + default: Inherited(Experiment::OPTIMIZE.to_string()), }, Experiment { name: Experiment::COPY_PROPAGATION.to_string(), diff --git a/third_party/move/move-compiler-v2/src/lib.rs b/third_party/move/move-compiler-v2/src/lib.rs index ae0f454fc95e5..68a1a9300b287 100644 --- a/third_party/move/move-compiler-v2/src/lib.rs +++ b/third_party/move/move-compiler-v2/src/lib.rs @@ -163,6 +163,7 @@ pub fn run_move_compiler_for_analysis( options.whole_program = true; // will set `treat_everything_as_target` options = options.set_experiment(Experiment::SPEC_REWRITE, true); options = options.set_experiment(Experiment::ATTACH_COMPILED_MODULE, true); + options = options.set_experiment(Experiment::CFG_SIMPLIFICATION, false); let (env, _units) = run_move_compiler(error_writer, options)?; // Reset for subsequent analysis env.treat_everything_as_target(false);