From e3e7a376c571b4ed5a175295d4a4ec720a763a80 Mon Sep 17 00:00:00 2001 From: Mitya Lyubarskiy Date: Wed, 18 Mar 2020 04:23:31 -0700 Subject: [PATCH] [nullsafe] Decouple nullsafe mode from issue calculation, Field Initialization Summary: This diff finishes work in D20491716. We removed dependency on nullsafe mode for field initialization in D20491716, so this diff just formalizes it. Reviewed By: jvillard Differential Revision: D20493164 fbshipit-source-id: 6ac612e78 --- infer/src/nullsafe/eradicateChecks.ml | 2 +- infer/src/nullsafe/typeErr.ml | 2 +- infer/src/nullsafe/typeErr.mli | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infer/src/nullsafe/eradicateChecks.ml b/infer/src/nullsafe/eradicateChecks.ml index 300885543..c5f101c05 100644 --- a/infer/src/nullsafe/eradicateChecks.ml +++ b/infer/src/nullsafe/eradicateChecks.ml @@ -305,7 +305,7 @@ let check_constructor_initialization tenv find_canonical_duplicate curr_construc () else register_error tenv find_canonical_duplicate - (TypeErr.Field_not_initialized {nullsafe_mode; field_name}) + (TypeErr.Field_not_initialized {field_name}) None ~nullsafe_mode loc curr_constructor_pdesc ; (* Check if field is over-annotated. *) match annotated_field with diff --git a/infer/src/nullsafe/typeErr.ml b/infer/src/nullsafe/typeErr.ml index ab80a6736..6fc670c78 100644 --- a/infer/src/nullsafe/typeErr.ml +++ b/infer/src/nullsafe/typeErr.ml @@ -65,7 +65,7 @@ type err_instance = ; violation_type: InheritanceRule.ReportableViolation.violation_type ; base_proc_name: Procname.t ; overridden_proc_name: Procname.t } - | Field_not_initialized of {nullsafe_mode: NullsafeMode.t; field_name: Fieldname.t} + | Field_not_initialized of {field_name: Fieldname.t} | Over_annotation of { over_annotated_violation: OverAnnotatedRule.violation ; violation_type: OverAnnotatedRule.violation_type } diff --git a/infer/src/nullsafe/typeErr.mli b/infer/src/nullsafe/typeErr.mli index f1b38e218..970f86086 100644 --- a/infer/src/nullsafe/typeErr.mli +++ b/infer/src/nullsafe/typeErr.mli @@ -41,7 +41,7 @@ type err_instance = ; violation_type: InheritanceRule.ReportableViolation.violation_type ; base_proc_name: Procname.t ; overridden_proc_name: Procname.t } - | Field_not_initialized of {nullsafe_mode: NullsafeMode.t; field_name: Fieldname.t} + | Field_not_initialized of {field_name: Fieldname.t} | Over_annotation of { over_annotated_violation: OverAnnotatedRule.violation ; violation_type: OverAnnotatedRule.violation_type }