module: Explicit virtualization of NativeMeth and NativeFunc

Summary:
Like we did a couple diffs ago for attributes, replace the `&dyn NativeMeth` with a `NativeMeth` that stores a function pointer and the one data field that's needed

As a part of that, on the macro side, stop emitting a struct and just generate functions

Reviewed By: Nero5023

Differential Revision: D73726006

fbshipit-source-id: af0f2450c334fb7202fdbc38b7e118e4e77555a3

Author: JakobDegen

starlark/src/environment/globals.rs

@@ -31,6 +31,7 @@ use crate::docs::DocModule;
 use crate::docs::DocString;
 use crate::docs::DocStringKind;
 use crate::docs::DocType;
+use crate::eval::ParametersSpec;
 use crate::stdlib;
 pub use crate::stdlib::LibraryExtension;
 use crate::typing::Ty;
@@ -41,6 +42,7 @@ use crate::values::FrozenStringValue;
 use crate::values::FrozenValue;
 use crate::values::Value;
 use crate::values::function::NativeFunc;
+use crate::values::function::NativeFuncFn;
 use crate::values::function::SpecialBuiltinFunction;
 use crate::values::namespace::FrozenNamespace;
 use crate::values::namespace::value::MaybeDocHiddenValue;
@@ -282,21 +284,20 @@ impl GlobalsBuilder {
 
     /// Set a method. This function is usually called from code
     /// generated by `starlark_derive` and rarely needs to be called manually.
-    pub fn set_function<F>(
+    pub fn set_function(
         &mut self,
         name: &str,
         components: NativeCallableComponents,
+        sig: ParametersSpec<FrozenValue>,
         as_type: Option<(Ty, DocType)>,
         ty: Option<Ty>,
         special_builtin_function: Option<SpecialBuiltinFunction>,
-        f: F,
-    ) where
-        F: NativeFunc,
-    {
+        f: NativeFuncFn,
+    ) {
         self.set(
             name,
             NativeFunction {
-                function: Box::new(f),
+                function: NativeFunc(f, sig),
                 name: name.to_owned(),
                 speculative_exec_safe: components.speculative_exec_safe,
                 as_type: as_type.as_ref().map(|x| x.0.dupe()),

starlark/src/environment/methods.rs

@@ -24,16 +24,17 @@ use crate::collections::symbol::map::SymbolMap;
 use crate::collections::symbol::symbol::Symbol;
 use crate::docs::DocType;
 use crate::environment::common_documentation;
+use crate::eval::ParametersSpec;
 use crate::typing::Ty;
 use crate::values::AllocFrozenValue;
 use crate::values::FrozenHeap;
 use crate::values::FrozenHeapRef;
-use crate::values::FrozenRef;
 use crate::values::FrozenValue;
 use crate::values::Heap;
 use crate::values::Value;
 use crate::values::function::NativeAttribute;
 use crate::values::function::NativeMeth;
+use crate::values::function::NativeMethFn;
 use crate::values::function::NativeMethod;
 use crate::values::types::unbound::UnboundValue;
 
@@ -205,22 +206,22 @@ impl MethodsBuilder {
         );
     }
 
-    /// Set a method. This function is usually called from code
-    /// generated by `starlark_derive` and rarely needs to be called manually.
-    pub fn set_method<F>(&mut self, name: &str, components: NativeCallableComponents, f: F)
-    where
-        F: NativeMeth,
-    {
+    /// Set a method. Only used by `starlark_module` macro
+    #[doc(hidden)]
+    pub fn set_method(
+        &mut self,
+        name: &str,
+        components: NativeCallableComponents,
+        sig: ParametersSpec<FrozenValue>,
+        f: NativeMethFn,
+    ) {
         // TODO(nga): do not unwrap.
         let ty = Ty::from_native_callable_components(&components, None).unwrap();
 
-        let function = FrozenRef::<dyn NativeMeth + 'static>::new(
-            self.heap.alloc_any_debug_type_name(f).as_ref(),
-        );
         self.members.insert(
             name,
             UnboundValue::Method(self.heap.alloc_simple_typed(NativeMethod {
-                function,
+                function: NativeMeth(f, sig),
                 name: name.to_owned(),
                 speculative_exec_safe: components.speculative_exec_safe,
                 docs: components.into_docs(None),

starlark/src/eval/bc/native_function.rs

@@ -20,7 +20,6 @@ use dupe::Dupe;
 
 use crate::eval::Arguments;
 use crate::eval::Evaluator;
-use crate::values::FrozenRef;
 use crate::values::FrozenValueTyped;
 use crate::values::Value;
 use crate::values::function::NativeFunc;
@@ -31,13 +30,15 @@ use crate::values::function::NativeFunction;
 pub(crate) struct BcNativeFunction {
     fun: FrozenValueTyped<'static, NativeFunction>,
     /// Copy function here from `fun` to avoid extra dereference when calling.
-    imp: FrozenRef<'static, dyn NativeFunc>,
+    imp: &'static NativeFunc,
 }
 
 impl BcNativeFunction {
     pub(crate) fn new(fun: FrozenValueTyped<'static, NativeFunction>) -> BcNativeFunction {
-        let imp = fun.as_frozen_ref().map(|f| &*f.function);
-        BcNativeFunction { fun, imp }
+        BcNativeFunction {
+            fun,
+            imp: &fun.as_ref().function,
+        }
     }
 
     #[inline]

starlark/src/tests/bc/golden/call.golden

@@ -27,5 +27,5 @@ Instructions:
    96: Const 50 ->&7
   120: CallFrozenNative noop {&3..&8 2 p q r *&0 **&1} instrs.star.bzl:2:5-10:6 ->&2
         # instrs.star.bzl:2:5-10:6
-  208: ReturnConst None
-  224: End
+  200: ReturnConst None
+  216: End

starlark/src/tests/bc/golden/def_inline_const_args_inlined.golden

@@ -20,5 +20,5 @@ Instructions:
    24: Const 10 ->&2
    48: CallFrozenNativePos noop &1..&3 instrs.star.bzl:2:12-22 ->&0
         # instrs.star.bzl:6:5-25
-  104: Return &0
-  112: End
+   96: Return &0
+  104: End

starlark/src/tests/bc/golden/def_inline_locals_inlined.golden

@@ -18,5 +18,5 @@ Instructions:
        # instrs.star.bzl:6:5-21
    0: CallFrozenNativePos noop &0..&2 instrs.star.bzl:2:12-22 ->&2
        # instrs.star.bzl:6:5-21
-  56: Return &2
-  64: End
+  48: Return &2
+  56: End

starlark/src/tests/bc/golden/definitely_assigned_mov_is_used.golden

@@ -10,10 +10,10 @@ def test(x, y): noop(y, x)
 
 Max stack size: 3
 Instructions:
-        # instrs.star.bzl:1:17-27
-    0: Mov &y ->&3
-   16: Mov &x ->&4
-   32: CallFrozenNativePos noop &3..&5 instrs.star.bzl:1:17-27 ->&2
-        # instrs.star.bzl:1:17-27
-   88: ReturnConst None
-  104: End
+       # instrs.star.bzl:1:17-27
+   0: Mov &y ->&3
+  16: Mov &x ->&4
+  32: CallFrozenNativePos noop &3..&5 instrs.star.bzl:1:17-27 ->&2
+       # instrs.star.bzl:1:17-27
+  80: ReturnConst None
+  96: End

starlark/src/tests/bc/golden/definitely_assigned_slot_range_in_call.golden

@@ -13,5 +13,5 @@ Instructions:
        # instrs.star.bzl:1:17-27
    0: CallFrozenNativePos noop &0..&2 instrs.star.bzl:1:17-27 ->&2
        # instrs.star.bzl:1:17-27
-  56: ReturnConst None
-  72: End
+  48: ReturnConst None
+  64: End

starlark/src/tests/bc/golden/expr_call_maybe_known_method.golden

@@ -14,5 +14,5 @@ Instructions:
     0: Const 1 ->&2
    24: CallMaybeKnownMethodPos &x append <m> &2..&3 instrs.star.bzl:1:14-25 ->&1
         # instrs.star.bzl:1:14-25
-  120: ReturnConst None
-  136: End
+  112: ReturnConst None
+  128: End

starlark/src/tests/bc/golden/for.golden

@@ -13,10 +13,10 @@ def test(x):
 Max stack size: 2
 Instructions:
         # instrs.star.bzl:2:3-3:12
-     0: Iter &x 0 ->&2 ->&i 104
+     0: Iter &x 0 ->&2 ->&i 96
           # instrs.star.bzl:3:5-12
   >   24: CallFrozenNativePos noop &1..&2 instrs.star.bzl:3:5-12 ->&3
           # instrs.star.bzl:3:5-12
-      80: Continue &2 0 ->&i 24 104
-  >104: ReturnConst None
-   120: End
+      72: Continue &2 0 ->&i 24 96
+  > 96: ReturnConst None
+   112: End