Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog.d/8787-argument-shape-clones.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Guarded direct method calls now propagate exact class and shape facts into
eligible object arguments, including unannotated JavaScript parameters with a
unique declared-field signature. The internal tagged-ABI clones use direct
field offsets while exact runtime guards, shadow roots, and the ordinary method
fallback preserve behavior for subclasses, proxies, mutated shapes, and other
dynamic values.
300 changes: 300 additions & 0 deletions crates/perry-codegen/src/codegen/argument_shape_clone_tests.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,300 @@
//! #8774 exact-shape ordinary-argument clone ratchets.

use crate::{compile_module, AppMetadata, CompileOptions};
use perry_hir::types::Type;
use perry_hir::{Class, ClassField, Expr, Function, Module, Param, Stmt};

fn opts() -> CompileOptions {
CompileOptions {
emit_ir_only: true,
is_entry_module: true,
output_type: "executable".to_string(),
app_metadata: AppMetadata::default(),
..CompileOptions::default()
}
}

fn param(id: u32, name: &str, ty: Type) -> Param {
Param {
id,
name: name.to_string(),
ty,
default: None,
decorators: Vec::new(),
is_rest: false,
arguments_object: None,
}
}

fn function(id: u32, name: &str, params: Vec<Param>, body: Vec<Stmt>) -> Function {
Function {
id,
name: name.to_string(),
type_params: Vec::new(),
params,
return_type: Type::Void,
body,
is_async: false,
is_generator: false,
is_strict: true,
is_exported: false,
captures: Vec::new(),
decorators: Vec::new(),
was_plain_async: false,
was_unrolled: false,
}
}

fn class(id: u32, name: &str, fields: Vec<&str>, methods: Vec<Function>) -> Class {
Class {
id,
name: name.to_string(),
type_params: Vec::new(),
extends: None,
extends_name: None,
native_extends: None,
extends_expr: None,
heritage_lexically_shadowed: false,
fields: fields
.into_iter()
.map(|name| ClassField {
name: name.to_string(),
key_expr: None,
ty: Type::Any,
init: None,
is_private: false,
is_readonly: false,
decorators: Vec::new(),
})
.collect(),
constructor: None,
methods,
getters: Vec::new(),
setters: Vec::new(),
static_accessor_names: Vec::new(),
static_accessor_fn_ids: Vec::new(),
static_fields: Vec::new(),
static_methods: Vec::new(),
computed_members: Vec::new(),
decorators: Vec::new(),
is_exported: false,
is_nested: false,
alloc_width_hint: 0,
specialized_from: None,
aliases: Vec::new(),
}
}

fn field_get(local: u32, property: &str) -> Expr {
Expr::PropertyGet {
object: Box::new(Expr::LocalGet(local)),
property: property.to_string(),
byte_offset: 0,
}
}

fn fixture() -> Module {
let entity_param = 20;
let read = function(
200,
"read",
vec![param(
entity_param,
"entity",
Type::Named("Entity".to_string()),
)],
vec![Stmt::Expr(field_get(entity_param, "id"))],
);
let mut module = Module::new("argument_shape_clone.ts");
module.classes.push(class(1, "Entity", vec!["id"], vec![]));
module
.classes
.push(class(2, "Registry", vec![], vec![read]));
module.init.extend([
Stmt::Let {
id: 10,
name: "registry".to_string(),
ty: Type::Named("Registry".to_string()),
mutable: false,
init: Some(Expr::New {
class_name: "Registry".to_string(),
args: Vec::new(),
type_args: Vec::new(),
byte_offset: 0,
cap_args_appended: 0,
}),
},
Stmt::Let {
id: 11,
name: "entity".to_string(),
ty: Type::Named("Entity".to_string()),
mutable: false,
init: Some(Expr::New {
class_name: "Entity".to_string(),
args: Vec::new(),
type_args: Vec::new(),
byte_offset: 0,
cap_args_appended: 0,
}),
},
Stmt::Expr(Expr::Call {
callee: Box::new(Expr::PropertyGet {
object: Box::new(Expr::LocalGet(10)),
property: "read".to_string(),
byte_offset: 0,
}),
args: vec![Expr::LocalGet(11)],
type_args: Vec::new(),
byte_offset: 0,
}),
]);
module
}

fn function_ir<'a>(ir: &'a str, marker: &str) -> &'a str {
let start = ir
.match_indices("define ")
.find(|(index, _)| {
let end = ir[*index..]
.find('\n')
.map(|offset| index + offset)
.unwrap_or(ir.len());
ir[*index..end].contains(marker)
})
.map(|(index, _)| index)
.unwrap_or_else(|| panic!("missing function {marker}:\n{ir}"));
let end = ir[start..]
.find("\n}")
.map(|offset| start + offset)
.expect("function terminator");
&ir[start..end]
}

#[test]
fn guarded_call_routes_to_shadow_rooted_direct_field_clone() {
// Native statepoint roots are the host default. Pin the shadow-stack
// lowering because this assertion specifically ratchets the portable
// tagged-slot fallback required by the clone ABI.
let _shadow = crate::codegen::helpers::NativeRootsPin::shadow();
let ir = String::from_utf8(compile_module(&fixture(), opts()).expect("module compiles"))
.expect("LLVM IR is UTF-8");
let clone_name = "perry_method_argument_shape_clone_ts__Registry__read$pshape_args";
let clone = function_ir(&ir, &format!("@{clone_name}("));
let generic = function_ir(
&ir,
"@perry_method_argument_shape_clone_ts__Registry__read(",
);

assert!(
ir.contains(&format!("call double @{clone_name}(")),
"the guarded call site must route to the argument clone:\n{ir}"
);
assert!(
ir.contains("pshape_arg.fallback")
&& ir.contains("call double @perry_method_argument_shape_clone_ts__Registry__read("),
"guard failure must retain the ordinary method body:\n{ir}"
);
assert!(
clone.contains("@js_shadow_slot_bind(")
&& clone.find("@js_shadow_slot_bind(")
< clone
.find("getelementptr double")
.or_else(|| clone.find("inttoptr i64")),
"the tagged parameter slot must be bound before fixed-offset access:\n{clone}"
);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
assert!(
clone.contains("inttoptr i64") && clone.contains("getelementptr double"),
"the clone must use direct declared-field addressing:\n{clone}"
);
assert!(
!clone.contains("js_typed_feedback_class_field_get_guard")
&& !clone.contains("shape_descriptor_by_id"),
"the clone fast body must not rebuild the field IC diamond:\n{clone}"
);
assert!(
generic.contains("js_typed_feedback_class_field_get_guard")
|| generic.contains("js_object_get_field"),
"the generic fallback must retain guarded field semantics:\n{generic}"
);
}

#[test]
fn routed_argument_is_a_contained_ptr_shape_win_in_the_opt_report() {
let session = crate::opt_report::test_support::Session::start();
compile_module(&fixture(), opts()).expect("module compiles");
let entries = session.entries();
let entity_entries: Vec<_> = entries
.iter()
.filter(|entry| entry.name == "entity" && entry.local_id == Some(11))
.collect();

assert!(
entity_entries
.iter()
.any(|entry| entry.outcome == crate::opt_report::Outcome::Selected),
"the guarded argument route must preserve the caller's Ptr<Shape> fact: {entries:#?}"
);
assert!(
entity_entries.iter().all(|entry| {
entry.outcome != crate::opt_report::Outcome::Denied
|| !entry
.reason
.as_deref()
.unwrap_or("")
.contains("passed as a call argument")
}),
"the retired call-argument denial must not survive a selected clone route: {entries:#?}"
);
}

#[test]
fn unannotated_parameter_uses_the_runtime_validated_class_overlay() {
let mut module = fixture();
module.classes[1].methods[0].params[0].ty = Type::Any;
let ir = String::from_utf8(compile_module(&module, opts()).expect("module compiles"))
.expect("LLVM IR is UTF-8");
let clone = function_ir(&ir, "Registry__read$pshape_args(");
assert!(
clone.contains("getelementptr double") && clone.contains("inttoptr i64"),
"the exact runtime guard must recover the class layout for an unannotated parameter:\n{clone}"
);
assert!(
!clone.contains("js_typed_feedback_class_field_get_guard")
&& !clone.contains("shape_descriptor_by_id"),
"the unannotated clone must not rebuild the field IC diamond:\n{clone}"
);
}

#[test]
fn ambiguous_unannotated_field_signature_stays_generic() {
let mut module = fixture();
module.classes[1].methods[0].params[0].ty = Type::Any;
module
.classes
.push(class(3, "OtherEntity", vec!["id"], vec![]));
let ir = String::from_utf8(compile_module(&module, opts()).expect("module compiles"))
.expect("LLVM IR is UTF-8");
assert!(
!ir.contains("Registry__read$pshape_args"),
"an unannotated field signature matching multiple classes must not nominate either:\n{ir}"
);
}

#[test]
fn aliased_or_reassigned_parameter_does_not_get_a_clone() {
let mut module = fixture();
let method = &mut module.classes[1].methods[0];
method.body.insert(
0,
Stmt::Expr(Expr::LocalSet(
method.params[0].id,
Box::new(Expr::Undefined),
)),
);
let ir = String::from_utf8(compile_module(&module, opts()).expect("module compiles"))
.expect("LLVM IR is UTF-8");
assert!(
!ir.contains("Registry__read$pshape_args"),
"a reassigned parameter must keep only generic semantics:\n{ir}"
);
}
Loading
Loading