make quepingkong happy

WeBankBlockchain · Nov 12, 2021 · 1e89735 · 1e89735
1 parent be8b88e
commit 1e89735
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/analyzer/callbacks.rs b/src/analyzer/callbacks.rs
@@ -257,6 +257,11 @@ impl AnalysisCallbacks {
             conflict_fields.dedup();
             let mut composed_conflict_fields: Vec<FieldDesc> = vec![];
             let mut add_to_composed = |field_to_add: FieldDesc| {
+                if field_to_add.kind == field_kind::LEN {
+                    composed_conflict_fields.push(field_to_add);
+                    return;
+                }
+
                 if composed_conflict_fields
                     .iter()
                     .rposition(|field| {

diff --git a/src/analyzer/ifds/problems/conflict_fields.rs b/src/analyzer/ifds/problems/conflict_fields.rs
@@ -1070,7 +1070,9 @@ impl<'tcx, 'graph> IfdsProblem<'tcx> for ConflictFields<'tcx, 'graph> {
                                     results.insert(ConflictField::Field {
                                         container: *container,
                                         key: Key::Len,
-                                        read_only: true,
+                                        read_only: matches!(fn_name,
+                                            KnownNames::LiquidStorageCollectionsMappingLen
+                                            | KnownNames::LiquidStorageCollectionsMappingIsEmpty),
                                     });
                                 }
                                 results