dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm] Make use of exception helpers.

Browse Source 
TEST=ci
Change-Id: Icdfaef665756bc12e25fba58afcd6cd1bde8525a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/254760
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Markov <alexmarkov@google.com>
This commit is contained in:
Ryan Macnak
2022-08-11 18:52:22 +00:00
committed by Commit Bot
parent c1e67ac84f
commit b6a57b7cf9
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/lib/isolate.cc
+5 -14
View File
@@ -1116,11 +1116,8 @@ DEFINE_NATIVE_ENTRY(Isolate_registerKernelBlob, 0, 1) {
arguments->NativeArgAt(0));
auto register_kernel_blob_callback = Isolate::RegisterKernelBlobCallback();
if (register_kernel_blob_callback == nullptr) {
const auto& error =
String::Handle(zone, String::New("Registration of kernel blobs is not "
"supported by this Dart embedder.\n"));
Exceptions::ThrowArgumentError(error);
UNREACHABLE();
Exceptions::ThrowUnsupportedError(
"Registration of kernel blobs is not supported by this Dart embedder.");
}
bool is_kernel = false;
{
@@ -1143,10 +1140,7 @@ DEFINE_NATIVE_ENTRY(Isolate_registerKernelBlob, 0, 1) {
kernel_blob.LengthInBytes());
}
if (uri == nullptr) {
const Instance& exception = Instance::Handle(
thread->isolate_group()->object_store()->out_of_memory());
Exceptions::Throw(thread, exception);
UNREACHABLE();
Exceptions::ThrowOOM();
}
return String::New(uri);
}
@@ -1157,11 +1151,8 @@ DEFINE_NATIVE_ENTRY(Isolate_unregisterKernelBlob, 0, 1) {
auto unregister_kernel_blob_callback =
Isolate::UnregisterKernelBlobCallback();
if (unregister_kernel_blob_callback == nullptr) {
const auto& error =
String::Handle(zone, String::New("Registration of kernel blobs is not "
"supported by this Dart embedder.\n"));
Exceptions::ThrowArgumentError(error);
UNREACHABLE();
Exceptions::ThrowUnsupportedError(
"Registration of kernel blobs is not supported by this Dart embedder.");
}
unregister_kernel_blob_callback(kernel_blob_uri.ToCString());
return Object::null();
runtime/vm/runtime_entry.cc
+2 -6
View File
@@ -356,9 +356,7 @@ DEFINE_RUNTIME_ENTRY(AllocateArray, 2) {
Array::kMaxElements);
}
if (len > Array::kMaxElements) {
const Instance& exception = Instance::Handle(
zone, thread->isolate_group()->object_store()->out_of_memory());
Exceptions::Throw(thread, exception);
Exceptions::ThrowOOM();
}
const Array& array = Array::Handle(
@@ -432,9 +430,7 @@ DEFINE_RUNTIME_ENTRY(AllocateTypedData, 2) {
if (len < 0) {
Exceptions::ThrowRangeError("length", Integer::Cast(length), 0, max);
} else if (len > max) {
const Instance& exception = Instance::Handle(
zone, thread->isolate_group()->object_store()->out_of_memory());
Exceptions::Throw(thread, exception);
Exceptions::ThrowOOM();
}
const auto& typed_data =
TypedData::Handle(zone, TypedData::New(cid, static_cast<intptr_t>(len)));