Always build with -H:+RemoveSaturatedTypeFlows

Author: eregon

ci.jsonnet

@@ -198,11 +198,6 @@ local part_definitions = {
         HOST_VM_CONFIG: "graal-enterprise",
       },
     } + svm,
-    native_RemoveSaturatedTypeFlows: $.env.native + {
-      environment+: {
-        EXTRA_IMAGE_BUILDER_ARGUMENTS: "-H:+RemoveSaturatedTypeFlows",
-      },
-    },
   },
 
   jdk: {
@@ -501,12 +496,12 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
       "ruby-test-compiler-graal-enterprise":    $.platform.linux + $.jdk.v8 +  $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
       "ruby-test-compiler-graal-enterprise-11": $.platform.linux + $.jdk.v11 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
 
-      "ruby-test-svm-graal-core-linux":        $.platform.linux  + $.jdk.v8  + $.env.native_RemoveSaturatedTypeFlows + gate + native_tests,
-      "ruby-test-svm-graal-core-linux-11":     $.platform.linux  + $.jdk.v11 + $.env.native                          + gate + native_tests,
-      "ruby-test-svm-graal-core-darwin":       $.platform.darwin + $.jdk.v8  + $.env.native_RemoveSaturatedTypeFlows + gate + native_tests,
-      "ruby-test-svm-graal-core-darwin-11":    $.platform.darwin + $.jdk.v11 + $.env.native                          + gate + native_tests,
-      "ruby-test-svm-graal-enterprise-linux":  $.platform.linux  + $.jdk.v8  + $.env.native_ee                       + gate + native_tests,
-      "ruby-test-svm-graal-enterprise-darwin": $.platform.darwin + $.jdk.v8  + $.env.native_ee                       + gate + native_tests,
+      "ruby-test-svm-graal-core-linux":        $.platform.linux  + $.jdk.v8  + $.env.native    + gate + native_tests,
+      "ruby-test-svm-graal-core-linux-11":     $.platform.linux  + $.jdk.v11 + $.env.native    + gate + native_tests,
+      "ruby-test-svm-graal-core-darwin":       $.platform.darwin + $.jdk.v8  + $.env.native    + gate + native_tests,
+      "ruby-test-svm-graal-core-darwin-11":    $.platform.darwin + $.jdk.v11 + $.env.native    + gate + native_tests,
+      "ruby-test-svm-graal-enterprise-linux":  $.platform.linux  + $.jdk.v8  + $.env.native_ee + gate + native_tests,
+      "ruby-test-svm-graal-enterprise-darwin": $.platform.darwin + $.jdk.v8  + $.env.native_ee + gate + native_tests,
     },
 
   local other_rubies = {

mx.truffleruby/mx_truffleruby.py

@@ -227,6 +227,7 @@ def verify_ci(args):
                 '-H:+DumpThreadStacksOnSignal',
                 '-H:+DetectUserDirectoriesInImageHeap',
                 '-H:+TruffleCheckBlackListedMethods',
+                '-H:+RemoveSaturatedTypeFlows',
             ],
             language='ruby',
             links=['bin/<exe:ruby>'],