Use correct variable in mini_get_cpu_features (mono/mono#17436)
authorFilip Navara <navara@emclient.com>
Sun, 20 Oct 2019 05:26:44 +0000 (07:26 +0200)
committerZoltan Varga <vargaz@gmail.com>
Sun, 20 Oct 2019 05:26:44 +0000 (01:26 -0400)
* Use correct variable in mini_get_cpu_features

* Address PR feedback

Commit migrated from https://github.com/mono/mono/commit/bc678a2c10b98d8624bc55da1e4409be13a265f4

src/mono/mono/mini/mini.c

index 4df4a68..954761d 100644 (file)
@@ -4318,7 +4318,5 @@ mini_get_cpu_features (MonoCompile* cfg)
 #endif
 
        // apply parameters passed via -mattr
-       features = (MonoCPUFeatures) (features | mono_cpu_features_enabled);
-       features = (MonoCPUFeatures) (features & ~mono_cpu_features_disabled);
-       return features;
+       return (features | mono_cpu_features_enabled) & ~mono_cpu_features_disabled;
 }