fix bug in safe abstract logger

mheiber · facebook-github-bot · commit 5e7f45d82379 · 2025-03-14T13:48:53.000-07:00
Summary:
Correctly propagate information about the current method in our logger for safe abstract, which we use for collecting stats.

Fixes the bug described in the previous diff, {D71195943}

Reviewed By: vassilmladenov

Differential Revision: D71195942

fbshipit-source-id: 28db25444200f38e6866d3eaba5c92de001af024
diff --git a/hphp/hack/src/typing/tast_check/safe_abstract/safe_abstract_logger.ml b/hphp/hack/src/typing/tast_check/safe_abstract/safe_abstract_logger.ml
@@ -124,8 +124,8 @@ let handler =
       let infos = (collect_infos ~current_method:None)#on_fun_def env f in
       log_infos env infos
 
-    method! at_class_ env c =
-      let infos = (collect_infos ~current_method:None)#on_class_ env c in
+    method! at_method_ env m =
+      let infos = (collect_infos ~current_method:(Some m))#on_method_ env m in
       log_infos env infos
   end
 
diff --git a/hphp/hack/test/typecheck/safe_abstract/safe_abstract_logging_summarized/safe_abstract_logging_consts.php.class_pointer.exp b/hphp/hack/test/typecheck/safe_abstract/safe_abstract_logging_summarized/safe_abstract_logging_consts.php.class_pointer.exp
@@ -1,5 +1,4 @@
 safe_abstract_logger:{"filename":"safe_abstract_logging_consts.php","safe_news":0,"unsafe_news":0,"safe_calls":0,"unsafe_calls":0,"safe_const_accesses":0,"unsafe_const_accesses":1}
-safe_abstract_logger:{"filename":"safe_abstract_logging_consts.php","safe_news":0,"unsafe_news":0,"safe_calls":0,"unsafe_calls":0,"safe_const_accesses":0,"unsafe_const_accesses":1}
 WARN: File "safe_abstract_logging_consts.php", line 18, characters 3-13:
 Unsafe class constant access: C1::abs might not exist because the receiver might be abstract. (Warn[12018])
   File "safe_abstract_logging_consts.php", line 17, characters 27-28:
diff --git a/hphp/hack/test/typecheck/safe_abstract/safe_abstract_logging_summarized/safe_abstract_logging_consts.php.exp b/hphp/hack/test/typecheck/safe_abstract/safe_abstract_logging_summarized/safe_abstract_logging_consts.php.exp
@@ -1,5 +1,4 @@
 safe_abstract_logger:{"filename":"safe_abstract_logging_consts.php","safe_news":0,"unsafe_news":0,"safe_calls":0,"unsafe_calls":0,"safe_const_accesses":0,"unsafe_const_accesses":1}
-safe_abstract_logger:{"filename":"safe_abstract_logging_consts.php","safe_news":0,"unsafe_news":0,"safe_calls":0,"unsafe_calls":0,"safe_const_accesses":0,"unsafe_const_accesses":1}
 WARN: File "safe_abstract_logging_consts.php", line 18, characters 3-13:
 Unsafe class constant access: C1::abs might not exist because the receiver might be abstract. (Warn[12018])
   File "safe_abstract_logging_consts.php", line 17, characters 27-28:
diff --git a/hphp/hack/test/typecheck/safe_abstract/safe_abstract_logging_verbose/safe_abstract_logging_consts.php.class_pointer.exp b/hphp/hack/test/typecheck/safe_abstract/safe_abstract_logging_verbose/safe_abstract_logging_consts.php.class_pointer.exp
@@ -1,6 +1,6 @@
 safe_abstract_logger:{"pos":"(Relative_path.Dummy, \"safe_abstract_logging_consts.php\") 16:2","use_kind":"const_access","is_safe":false}
 safe_abstract_logger:{"pos":"(Relative_path.Dummy, \"safe_abstract_logging_consts.php\") 17:2","use_kind":"const_access","is_safe":true}
-safe_abstract_logger:{"pos":"(Relative_path.Dummy, \"safe_abstract_logging_consts.php\") 7:4","use_kind":"const_access","is_safe":false}
+safe_abstract_logger:{"pos":"(Relative_path.Dummy, \"safe_abstract_logging_consts.php\") 7:4","use_kind":"const_access","is_safe":true}
 WARN: File "safe_abstract_logging_consts.php", line 16, characters 3-13:
 Unsafe class constant access: C1::abs might not exist because the receiver might be abstract. (Warn[12018])
   File "safe_abstract_logging_consts.php", line 15, characters 24-25:
diff --git a/hphp/hack/test/typecheck/safe_abstract/safe_abstract_logging_verbose/safe_abstract_logging_consts.php.exp b/hphp/hack/test/typecheck/safe_abstract/safe_abstract_logging_verbose/safe_abstract_logging_consts.php.exp
@@ -1,6 +1,6 @@
 safe_abstract_logger:{"pos":"(Relative_path.Dummy, \"safe_abstract_logging_consts.php\") 16:2","use_kind":"const_access","is_safe":false}
 safe_abstract_logger:{"pos":"(Relative_path.Dummy, \"safe_abstract_logging_consts.php\") 17:2","use_kind":"const_access","is_safe":true}
-safe_abstract_logger:{"pos":"(Relative_path.Dummy, \"safe_abstract_logging_consts.php\") 7:4","use_kind":"const_access","is_safe":false}
+safe_abstract_logger:{"pos":"(Relative_path.Dummy, \"safe_abstract_logging_consts.php\") 7:4","use_kind":"const_access","is_safe":true}
 WARN: File "safe_abstract_logging_consts.php", line 16, characters 3-13:
 Unsafe class constant access: C1::abs might not exist because the receiver might be abstract. (Warn[12018])
   File "safe_abstract_logging_consts.php", line 15, characters 24-25:

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`safe_abstract_logger:{"filename":"safe_abstract_logging_consts.php","safe_news":0,"unsafe_news":0,"safe_calls":0,"unsafe_calls":0,"safe_const_accesses":0,"unsafe_const_accesses":1}`
`2`		`-safe_abstract_logger:{"filename":"safe_abstract_logging_consts.php","safe_news":0,"unsafe_news":0,"safe_calls":0,"unsafe_calls":0,"safe_const_accesses":0,"unsafe_const_accesses":1}`
`3`	`2`	`WARN: File "safe_abstract_logging_consts.php", line 18, characters 3-13:`
`4`	`3`	`Unsafe class constant access: C1::abs might not exist because the receiver might be abstract. (Warn[12018])`
`5`	`4`	`File "safe_abstract_logging_consts.php", line 17, characters 27-28:`