Remove the FrozenDef alias

Summary: `FrozenDef` is a leftover `'static` spelling from the heap-brand migration: the freeze machinery already carries defs as branded `ValueTyped<'fv, Def<'fv>>`, and the alias survives only as a name for two call sites. Spell those directly instead and delete it: the frozen-def registration check compares `TypeId`s through `AnyLifetime::static_type_id`, which never names a `'static` instantiation; the bytecode golden test downcasts through `Def` and lets the owned carrier fix the brand.

Reviewed By: JakobDegen

Differential Revision: D119373674

fbshipit-source-id: 249979d353eda27d47a644c1bc1406428f72b67d

Author: jtbraun

starlark/src/eval/compiler/def.rs

@@ -721,8 +721,6 @@ impl Display for Def<'_> {
     }
 }
 
-pub(crate) type FrozenDef = Def<'static>;
-
 impl<'v> AllocValue<'v> for Def<'v> {
     fn alloc_value(self, heap: Heap<'v>) -> Value<'v> {
         heap.alloc_complex_branded(self)

starlark/src/tests/bc/golden.rs

@@ -21,7 +21,7 @@ use std::mem;
 use starlark_syntax::golden_test_template::golden_test_template;
 
 use crate::assert::Assert;
-use crate::eval::compiler::def::FrozenDef;
+use crate::eval::compiler::def::Def;
 use crate::syntax::Dialect;
 
 fn test_function_bytecode(program: &str) -> String {
@@ -33,7 +33,7 @@ fn test_function_bytecode(program: &str) -> String {
         .module("instrs.star", program)
         .get_owned("test")
         .unwrap()
-        .downcast_starlark::<FrozenDef>()
+        .downcast_starlark::<Def>()
         .unwrap();
 
     let mut golden = String::new();

starlark/src/values/layout/avalues/complex_branded.rs

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-use std::any::TypeId;
 use std::marker::PhantomData;
 use std::mem;
 
 use super::simple::AValueSimple;
-use crate::eval::compiler::def::FrozenDef;
+use crate::any::AnyLifetime;
+use crate::eval::compiler::def::Def;
 use crate::private::Private;
 use crate::values::FreezeBranded;
 use crate::values::FreezeResult;
@@ -73,9 +73,8 @@ where
                 AValueHeader::overwrite_with_forward::<Self::StarlarkValue>(me, r.forward_ptr());
             let res = x.freeze(freezer)?;
             let fv = r.fill(res);
-            if TypeId::of::<T::Frozen<'static>>() == TypeId::of::<FrozenDef>() {
-                let frozen_def =
-                    ValueTyped::new(fv).expect("`fv` was just filled with a `FrozenDef`");
+            if T::Frozen::<'fv>::static_type_id() == Def::static_type_id() {
+                let frozen_def = ValueTyped::new(fv).expect("`fv` was just filled with a `Def`");
                 freezer.frozen_defs.borrow_mut().push(frozen_def);
             }
             Ok(fv)