foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(ops): fallback when FastApiOneByteString is not utf8 (#18518)

Browse source 
Fixes https://github.com/denoland/deno/issues/18255
This commit is contained in:
Divy Srivastava 2023-03-31 21:16:25 +05:30 committed by GitHub
parent b9a3790932
commit feab94ff51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 64 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -5270,9 +5270,9 @@ dependencies = [
[[package]]
name = "v8"
version = "0.67.0"
version = "0.68.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7bf30312144d97d3fb61a0c8893eec02f4fa53ec2b691a8d05da9605ab26024"
checksum = "81c69410b7435f1b74e82e243ba906d71e8b9bb350828291418b9311dbd77222"
dependencies = [
"bitflags",
"fslock",

2
Cargo.toml
View file

@ -43,7 +43,7 @@ license = "MIT"
repository = "https://github.com/denoland/deno"
[workspace.dependencies]
v8 = { version = "0.67.0", default-features = false }
v8 = { version = "0.68.0", default-features = false }
deno_ast = { version = "0.25.0", features = ["transpiling"] }
deno_core = { version = "0.177.0", path = "./core" }

29
ops/optimizer.rs
View file

@ -200,13 +200,33 @@ impl Transform {
*ty = parse_quote! { *const #core::v8::fast_api::FastApiOneByteString };
match str_ty {
StringType::Ref => q!(Vars { var: &ident }, {
let var = unsafe { &*var }.as_str();
let var = match ::std::str::from_utf8(unsafe { &*var }.as_bytes()) {
Ok(v) => v,
Err(_) => {
unsafe { &mut *fast_api_callback_options }.fallback = true;
return Default::default();
}
};
}),
StringType::Cow => q!(Vars { var: &ident }, {
let var = ::std::borrow::Cow::Borrowed(unsafe { &*var }.as_str());
let var = ::std::borrow::Cow::Borrowed(
match ::std::str::from_utf8(unsafe { &*var }.as_bytes()) {
Ok(v) => v,
Err(_) => {
unsafe { &mut *fast_api_callback_options }.fallback = true;
return Default::default();
}
},
);
}),
StringType::Owned => q!(Vars { var: &ident }, {
let var = unsafe { &*var }.as_str().to_owned();
let var = match ::std::str::from_utf8(unsafe { &*var }.as_bytes()) {
Ok(v) => v.to_owned(),
Err(_) => {
unsafe { &mut *fast_api_callback_options }.fallback = true;
return Default::default();
}
};
}),
}
}
@ -718,6 +738,7 @@ impl Optimizer {
let segment = single_segment(segments)?;
match segment {
PathSegment { ident, .. } if ident == "str" => {
self.needs_fast_callback_option = true;
self.fast_parameters.push(FastValue::SeqOneByteString);
assert!(self
.transforms
@ -742,6 +763,7 @@ impl Optimizer {
if let Some(val) = get_fast_scalar(ident.to_string().as_str()) {
self.fast_parameters.push(val);
} else if ident == "String" {
self.needs_fast_callback_option = true;
// Is `T` an owned String?
self.fast_parameters.push(FastValue::SeqOneByteString);
assert!(self
@ -775,6 +797,7 @@ impl Optimizer {
}
// Is `T` a str?
PathSegment { ident, .. } if ident == "str" => {
self.needs_fast_callback_option = true;
self.fast_parameters.push(FastValue::SeqOneByteString);
assert!(self
.transforms

2
ops/optimizer_tests/cow_str.expected
View file

@ -3,7 +3,7 @@ returns_result: false
has_ref_opstate: false
has_rc_opstate: false
has_fast_callback_option: false
needs_fast_callback_option: false
needs_fast_callback_option: true
fast_result: Some(Void)
fast_parameters: [V8Value, SeqOneByteString]
transforms: {0: Transform { kind: SeqOneByteString(Cow), index: 0 }}

13
ops/optimizer_tests/cow_str.out
View file

@ -31,7 +31,7 @@ impl op_cow_str {
use deno_core::v8::fast_api::CType;
Some(
deno_core::v8::fast_api::FastFunction::new(
&[V8Value, SeqOneByteString],
&[V8Value, SeqOneByteString, CallbackOptions],
CType::Void,
op_cow_str_fast_fn as *const ::std::ffi::c_void,
),
@ -77,10 +77,19 @@ impl op_cow_str {
fn op_cow_str_fast_fn<'scope>(
_: deno_core::v8::Local<deno_core::v8::Object>,
c: *const deno_core::v8::fast_api::FastApiOneByteString,
fast_api_callback_options: *mut deno_core::v8::fast_api::FastApiCallbackOptions,
) -> () {
use deno_core::v8;
use deno_core::_ops;
let c = ::std::borrow::Cow::Borrowed(unsafe { &*c }.as_str());
let c = ::std::borrow::Cow::Borrowed(
match ::std::str::from_utf8(unsafe { &*c }.as_bytes()) {
Ok(v) => v,
Err(_) => {
unsafe { &mut *fast_api_callback_options }.fallback = true;
return Default::default();
}
},
);
let result = op_cow_str::call(c);
result
}

2
ops/optimizer_tests/op_blob_revoke_object_url.expected
View file

@ -3,7 +3,7 @@ returns_result: true
has_ref_opstate: true
has_rc_opstate: false
has_fast_callback_option: false
needs_fast_callback_option: false
needs_fast_callback_option: true
fast_result: Some(Void)
fast_parameters: [V8Value, SeqOneByteString]
transforms: {1: Transform { kind: SeqOneByteString(Owned), index: 1 }}

2
ops/optimizer_tests/op_print.expected
View file

@ -3,7 +3,7 @@ returns_result: true
has_ref_opstate: true
has_rc_opstate: false
has_fast_callback_option: false
needs_fast_callback_option: false
needs_fast_callback_option: true
fast_result: Some(Void)
fast_parameters: [V8Value, SeqOneByteString, Bool]
transforms: {1: Transform { kind: SeqOneByteString(Ref), index: 1 }}

2
ops/optimizer_tests/owned_string.expected
View file

@ -3,7 +3,7 @@ returns_result: false
has_ref_opstate: false
has_rc_opstate: false
has_fast_callback_option: false
needs_fast_callback_option: false
needs_fast_callback_option: true
fast_result: Some(U32)
fast_parameters: [V8Value, SeqOneByteString]
transforms: {0: Transform { kind: SeqOneByteString(Owned), index: 0 }}

11
ops/optimizer_tests/owned_string.out
View file

@ -31,7 +31,7 @@ impl op_string_length {
use deno_core::v8::fast_api::CType;
Some(
deno_core::v8::fast_api::FastFunction::new(
&[V8Value, SeqOneByteString],
&[V8Value, SeqOneByteString, CallbackOptions],
CType::Uint32,
op_string_length_fast_fn as *const ::std::ffi::c_void,
),
@ -89,10 +89,17 @@ impl op_string_length {
fn op_string_length_fast_fn<'scope>(
_: deno_core::v8::Local<deno_core::v8::Object>,
string: *const deno_core::v8::fast_api::FastApiOneByteString,
fast_api_callback_options: *mut deno_core::v8::fast_api::FastApiCallbackOptions,
) -> u32 {
use deno_core::v8;
use deno_core::_ops;
let string = unsafe { &*string }.as_str().to_owned();
let string = match ::std::str::from_utf8(unsafe { &*string }.as_bytes()) {
Ok(v) => v.to_owned(),
Err(_) => {
unsafe { &mut *fast_api_callback_options }.fallback = true;
return Default::default();
}
};
let result = op_string_length::call(string);
result
}

2
ops/optimizer_tests/strings.expected
View file

@ -3,7 +3,7 @@ returns_result: false
has_ref_opstate: false
has_rc_opstate: false
has_fast_callback_option: false
needs_fast_callback_option: false
needs_fast_callback_option: true
fast_result: Some(U32)
fast_parameters: [V8Value, SeqOneByteString]
transforms: {0: Transform { kind: SeqOneByteString(Ref), index: 0 }}

11
ops/optimizer_tests/strings.out
View file

@ -31,7 +31,7 @@ impl op_string_length {
use deno_core::v8::fast_api::CType;
Some(
deno_core::v8::fast_api::FastFunction::new(
&[V8Value, SeqOneByteString],
&[V8Value, SeqOneByteString, CallbackOptions],
CType::Uint32,
op_string_length_fast_fn as *const ::std::ffi::c_void,
),
@ -90,10 +90,17 @@ impl op_string_length {
fn op_string_length_fast_fn<'scope>(
_: deno_core::v8::Local<deno_core::v8::Object>,
string: *const deno_core::v8::fast_api::FastApiOneByteString,
fast_api_callback_options: *mut deno_core::v8::fast_api::FastApiCallbackOptions,
) -> u32 {
use deno_core::v8;
use deno_core::_ops;
let string = unsafe { &*string }.as_str();
let string = match ::std::str::from_utf8(unsafe { &*string }.as_bytes()) {
Ok(v) => v,
Err(_) => {
unsafe { &mut *fast_api_callback_options }.fallback = true;
return Default::default();
}
};
let result = op_string_length::call(string);
result
}

2
ops/optimizer_tests/strings_result.expected
View file

@ -3,7 +3,7 @@ returns_result: true
has_ref_opstate: false
has_rc_opstate: false
has_fast_callback_option: false
needs_fast_callback_option: false
needs_fast_callback_option: true
fast_result: Some(U32)
fast_parameters: [V8Value, SeqOneByteString]
transforms: {0: Transform { kind: SeqOneByteString(Ref), index: 0 }}