fix (aptos-labs#18292)

Author: rahxephon89

aptos-move/aptos-release-builder/src/components/framework.rs

@@ -107,7 +107,11 @@ pub fn generate_upgrade_proposals(
             with_error_map: true,
             skip_fetch_latest_git_deps: false,
             bytecode_version: Some(config.bytecode_version),
-            experiments: vec!["extended-framework-optimizations=on".to_string()],
+            // enable inline optimization for framework packages
+            experiments: vec![
+                "optimize-extra=on".to_string(),
+                "extended-framework-optimizations=on".to_string(),
+            ],
             ..BuildOptions::default()
         };
         let package = BuiltPackage::build(package_path, options)?;

aptos-move/framework/src/aptos.rs

@@ -126,7 +126,11 @@ impl ReleaseTarget {
                     output_format: None,
                 }),
                 skip_fetch_latest_git_deps: true,
-                experiments: vec!["extended-framework-optimizations=on".to_string()],
+                // enable inline optimization for framework packages
+                experiments: vec![
+                    "optimize-extra=on".to_string(),
+                    "extended-framework-optimizations=on".to_string(),
+                ],
                 ..BuildOptions::default()
             },
             packages: packages

third_party/move/move-compiler-v2/src/experiments.rs

@@ -109,7 +109,7 @@ pub static EXPERIMENTS: Lazy<BTreeMap<String, Experiment>> = Lazy::new(|| {
         Experiment {
             name: Experiment::INLINING_OPTIMIZATION.to_string(),
             description: "Turns on or off inlining optimizations".to_string(),
-            default: Inherited(Experiment::EXTENDED_FRAMEWORK_OPTIMIZATIONS.to_string()),
+            default: Inherited(Experiment::OPTIMIZE_EXTRA.to_string()),
         },
         Experiment {
             name: Experiment::ACROSS_PACKAGE_INLINING.to_string(),
@@ -155,7 +155,7 @@ pub static EXPERIMENTS: Lazy<BTreeMap<String, Experiment>> = Lazy::new(|| {
         Experiment {
             name: Experiment::OPTIMIZE_EXTRA.to_string(),
             description: "Use extra optimizations".to_string(),
-            default: Inherited(Experiment::EXTENDED_FRAMEWORK_OPTIMIZATIONS.to_string()),
+            default: Given(false),
         },
         Experiment {
             name: Experiment::OPTIMIZE_WAITING_FOR_COMPARE_TESTS.to_string(),
@@ -300,7 +300,7 @@ pub static EXPERIMENTS: Lazy<BTreeMap<String, Experiment>> = Lazy::new(|| {
         },
         Experiment {
             name: Experiment::EXTENDED_FRAMEWORK_OPTIMIZATIONS.to_string(),
-            description: "Turns on or off extended framework optimizations".to_string(),
+            description: "Set of optimizations that are safe to perform on the framework, but are disabled otherwise".to_string(),
             default: Given(false),
         },
     ];