Fix build_value_labels_ranges for newBE when there are no labels

2021-02-04 11:46:20 +01:00
parent 7bd96c8e2f
commit 602006ff9d
5 changed files with 8 additions and 12 deletions
--- a/cranelift/codegen/src/value_label.rs
+++ b/cranelift/codegen/src/value_label.rs
@@ -113,12 +113,8 @@ pub fn build_value_labels_ranges<T>(
 where
    T: From<SourceLoc> + Deref<Target = SourceLoc> + Ord + Copy,
 {
-    if mach_compile_result.is_some() && mach_compile_result.unwrap().value_labels_ranges.is_some() {
-        return mach_compile_result
-            .unwrap()
-            .value_labels_ranges
-            .clone()
-            .unwrap();
+    if let Some(mach_compile_result) = mach_compile_result {
+        return mach_compile_result.value_labels_ranges.clone();
    }

    let values_labels = build_value_labels_index::<T>(func);