Skip to content

Fix a few more v8 issues #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rockdaboot merged 2 commits into from
Apr 24, 2025
Merged

Fix a few more v8 issues #448

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c907a06
Fix a few more v8 issues
umanwizard Apr 23, 2025
3035d80
Update interpreter/nodev8/v8.go
umanwizard Apr 24, 2025
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
16 changes: 14 additions & 2 deletions interpreter/nodev8/v8.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ type v8Data struct {
WeakFixedArray uint16 `name:"WeakFixedArray__WEAK_FIXED_ARRAY_TYPE"`
TrustedByteArray uint16 `name:"TrustedByteArray__TRUSTED_BYTE_ARRAY_TYPE" zero:""`
TrustedFixedArray uint16 `name:"TrustedFixedArray__TRUSTED_FIXED_ARRAY_TYPE" zero:""`
TrustedWeakFixedArray uint16 `name:"TrustedFixedArray__TRUSTED_WEAK_FIXED_ARRAY_TYPE" zero:""`
ProtectedFixedArray uint16 `name:"ProtectedFixedArray__PROTECTED_FIXED_ARRAY_TYPE" zero:""`
JSFunction uint16 `name:"JSFunction__JS_FUNCTION_TYPE"`
Map uint16 `name:"Map__MAP_TYPE"`
Expand Down Expand Up @@ -468,7 +469,8 @@ type v8Data struct {
// class DeoptimizationLiteralArray introduced in V8 9.8.23
// https://chromium.googlesource.com/v8/v8.git/+/refs/tags/10.2.154.1/src/objects/code.h#1090
DeoptimizationLiteralArray struct {
WeakFixedArray bool
WeakFixedArray bool
TrustedWeakFixedArray bool
}

// https://chromium.googlesource.com/v8/v8.git/+/refs/tags/9.2.230.1/src/objects/script.tq#18
Expand Down Expand Up @@ -1292,7 +1294,9 @@ func (i *v8Instance) readCode(taggedPtr libpf.Address, cookie uint32, sfi *v8SFI
// The first numSFI entries of literal array are the pointers for
// inlined function's SFI structures
expectedTag := vms.Type.FixedArray
if vms.DeoptimizationLiteralArray.WeakFixedArray {
if vms.DeoptimizationLiteralArray.TrustedWeakFixedArray {
expectedTag = vms.Type.TrustedWeakFixedArray
} else if vms.DeoptimizationLiteralArray.WeakFixedArray {
expectedTag = vms.Type.WeakFixedArray
}
literalArrayPtr := npsr.Ptr(deoptimizationData,
Expand Down Expand Up @@ -2101,6 +2105,14 @@ func (d *v8Data) readIntrospectionData(ef *pfelf.File, syms libpf.SymbolFinder)
// so we can probably get away with just hardcoding it for now.
vms.SharedFunctionInfo.FunctionData = 8
}
if d.version >= v8Ver(12, 5, 0) {
// This changed in f6c936e836b4d8ffafe790bcc3586f2ba5ffcf74
vms.DeoptimizationLiteralArray.TrustedWeakFixedArray = true
} else if d.version >= v8Ver(11, 9, 0) {
// This had been WeakFixedArray for a very long time,
// but we lost the metadata in 0698c376801dcde939850b7ad0b55c7459c83f4d.
vms.DeoptimizationLiteralArray.WeakFixedArray = true
}

for i := 0; i < vmVal.NumField(); i++ {
classVal := vmVal.Field(i)
Expand Down