}
+MUST_USE_RESULT static i::MaybeHandle<i::Object> CallV8HeapFunction(
+ i::Isolate* isolate, const char* name, i::Handle<i::Object> recv, int argc,
+ i::Handle<i::Object> argv[]) {
+ i::Handle<i::Object> object_fun =
+ i::Object::GetProperty(
+ isolate, isolate->js_builtins_object(), name).ToHandleChecked();
+ i::Handle<i::JSFunction> fun = i::Handle<i::JSFunction>::cast(object_fun);
+ return i::Execution::Call(isolate, fun, recv, argc, argv);
+}
+
+
+MUST_USE_RESULT static i::MaybeHandle<i::Object> CallV8HeapFunction(
+ i::Isolate* isolate, const char* name, i::Handle<i::Object> data) {
+ i::Handle<i::Object> argv[] = { data };
+ return CallV8HeapFunction(isolate, name, isolate->js_builtins_object(),
+ arraysize(argv), argv);
+}
+
+
Maybe<int> Message::GetLineNumber(Local<Context> context) const {
PREPARE_FOR_EXECUTION_PRIMITIVE(context, "v8::Message::GetLineNumber()", int);
- i::Handle<i::JSFunction> fun = isolate->message_get_line_number();
- i::Handle<i::Object> undefined = isolate->factory()->undefined_value();
- i::Handle<i::Object> args[] = {Utils::OpenHandle(this)};
i::Handle<i::Object> result;
has_pending_exception =
- !i::Execution::Call(isolate, fun, undefined, arraysize(args), args)
- .ToHandle(&result);
+ !CallV8HeapFunction(isolate, "$messageGetLineNumber",
+ Utils::OpenHandle(this)).ToHandle(&result);
RETURN_ON_FAILED_EXECUTION_PRIMITIVE(int);
return Just(static_cast<int>(result->Number()));
}
Maybe<int> Message::GetStartColumn(Local<Context> context) const {
PREPARE_FOR_EXECUTION_PRIMITIVE(context, "v8::Message::GetStartColumn()",
int);
- i::Handle<i::JSFunction> fun = isolate->message_get_column_number();
- i::Handle<i::Object> undefined = isolate->factory()->undefined_value();
- i::Handle<i::Object> args[] = {Utils::OpenHandle(this)};
- i::Handle<i::Object> result;
+ auto self = Utils::OpenHandle(this);
+ i::Handle<i::Object> start_col_obj;
has_pending_exception =
- !i::Execution::Call(isolate, fun, undefined, arraysize(args), args)
- .ToHandle(&result);
+ !CallV8HeapFunction(isolate, "$messageGetPositionInLine", self)
+ .ToHandle(&start_col_obj);
RETURN_ON_FAILED_EXECUTION_PRIMITIVE(int);
- return Just(static_cast<int>(result->Number()));
+ return Just(static_cast<int>(start_col_obj->Number()));
}
Maybe<int> Message::GetEndColumn(Local<Context> context) const {
- auto self = Utils::OpenHandle(this);
PREPARE_FOR_EXECUTION_PRIMITIVE(context, "v8::Message::GetEndColumn()", int);
- i::Handle<i::JSFunction> fun = isolate->message_get_column_number();
- i::Handle<i::Object> undefined = isolate->factory()->undefined_value();
- i::Handle<i::Object> args[] = {self};
- i::Handle<i::Object> result;
+ auto self = Utils::OpenHandle(this);
+ i::Handle<i::Object> start_col_obj;
has_pending_exception =
- !i::Execution::Call(isolate, fun, undefined, arraysize(args), args)
- .ToHandle(&result);
+ !CallV8HeapFunction(isolate, "$messageGetPositionInLine", self)
+ .ToHandle(&start_col_obj);
RETURN_ON_FAILED_EXECUTION_PRIMITIVE(int);
int start = self->start_position();
int end = self->end_position();
- return Just(static_cast<int>(result->Number()) + (end - start));
+ return Just(static_cast<int>(start_col_obj->Number()) + (end - start));
}
MaybeLocal<String> Message::GetSourceLine(Local<Context> context) const {
PREPARE_FOR_EXECUTION(context, "v8::Message::GetSourceLine()", String);
- i::Handle<i::JSFunction> fun = isolate->message_get_source_line();
- i::Handle<i::Object> undefined = isolate->factory()->undefined_value();
- i::Handle<i::Object> args[] = {Utils::OpenHandle(this)};
i::Handle<i::Object> result;
has_pending_exception =
- !i::Execution::Call(isolate, fun, undefined, arraysize(args), args)
- .ToHandle(&result);
+ !CallV8HeapFunction(isolate, "$messageGetSourceLine",
+ Utils::OpenHandle(this)).ToHandle(&result);
RETURN_ON_FAILED_EXECUTION(String);
Local<String> str;
if (result->IsString()) {
}
PREPARE_FOR_EXECUTION_PRIMITIVE(context, "v8::Value::Equals()", bool);
i::Handle<i::Object> args[] = { other };
- i::Handle<i::JSFunction> fun(i::JSFunction::cast(
- isolate->js_builtins_object()->javascript_builtin(i::Builtins::EQUALS)));
i::Handle<i::Object> result;
has_pending_exception =
- !i::Execution::Call(isolate, fun, self, arraysize(args), args)
+ !CallV8HeapFunction(isolate, "EQUALS", self, arraysize(args), args)
.ToHandle(&result);
RETURN_ON_FAILED_EXECUTION_PRIMITIVE(bool);
return Just(*result == i::Smi::FromInt(i::EQUAL));
i::Handle<i::JSArray> desc_array =
isolate->factory()->NewJSArrayWithElements(desc, i::FAST_ELEMENTS, 3);
i::Handle<i::Object> args[] = {self, key_obj, value_obj, desc_array};
- i::Handle<i::Object> undefined = isolate->factory()->undefined_value();
- i::Handle<i::JSFunction> fun = isolate->object_define_own_property();
i::Handle<i::Object> result;
has_pending_exception =
- !i::Execution::Call(isolate, fun, undefined, arraysize(args), args)
- .ToHandle(&result);
+ !CallV8HeapFunction(isolate, "$objectDefineOwnProperty",
+ isolate->factory()->undefined_value(),
+ arraysize(args), args).ToHandle(&result);
RETURN_ON_FAILED_EXECUTION_PRIMITIVE(bool);
return Just(result->BooleanValue());
}
auto obj = Utils::OpenHandle(this);
auto key_name = Utils::OpenHandle(*key);
i::Handle<i::Object> args[] = { obj, key_name };
- i::Handle<i::JSFunction> fun = isolate->object_get_own_property_descriptor();
- i::Handle<i::Object> undefined = isolate->factory()->undefined_value();
i::Handle<i::Object> result;
has_pending_exception =
- !i::Execution::Call(isolate, fun, undefined, arraysize(args), args)
- .ToHandle(&result);
+ !CallV8HeapFunction(isolate, "$objectGetOwnPropertyDescriptor",
+ isolate->factory()->undefined_value(),
+ arraysize(args), args).ToHandle(&result);
RETURN_ON_FAILED_EXECUTION(Value);
RETURN_ESCAPED(Utils::ToLocal(result));
}
INSTALL_NATIVE(JSFunction, "GetStackTraceLine", get_stack_trace_line_fun);
INSTALL_NATIVE(JSFunction, "ToCompletePropertyDescriptor",
to_complete_property_descriptor);
- INSTALL_NATIVE(JSFunction, "ObjectDefineOwnProperty",
- object_define_own_property);
- INSTALL_NATIVE(JSFunction, "ObjectGetOwnPropertyDescriptor",
- object_get_own_property_descriptor);
- INSTALL_NATIVE(JSFunction, "MessageGetLineNumber", message_get_line_number);
- INSTALL_NATIVE(JSFunction, "MessageGetColumnNumber",
- message_get_column_number);
- INSTALL_NATIVE(JSFunction, "MessageGetSourceLine", message_get_source_line);
- INSTALL_NATIVE(JSObject, "StackOverflowBoilerplate",
- stack_overflow_boilerplate);
INSTALL_NATIVE(JSFunction, "JsonSerializeAdapter", json_serialize_adapter);
INSTALL_NATIVE(JSFunction, "Error", error_function);
promise_has_user_defined_reject_handler) \
V(TO_COMPLETE_PROPERTY_DESCRIPTOR_INDEX, JSFunction, \
to_complete_property_descriptor) \
- V(OBJECT_DEFINE_OWN_PROPERTY_INDEX, JSFunction, object_define_own_property) \
- V(OBJECT_GET_OWN_PROPERTY_DESCROPTOR_INDEX, JSFunction, \
- object_get_own_property_descriptor) \
- V(MESSAGE_GET_LINE_NUMBER_INDEX, JSFunction, message_get_line_number) \
- V(MESSAGE_GET_COLUMN_NUMBER_INDEX, JSFunction, message_get_column_number) \
- V(MESSAGE_GET_SOURCE_LINE_INDEX, JSFunction, message_get_source_line) \
- V(STACK_OVERFLOW_BOILERPLATE_INDEX, JSObject, stack_overflow_boilerplate) \
V(JSON_SERIALIZE_ADAPTER_INDEX, JSFunction, json_serialize_adapter) \
V(DERIVED_HAS_TRAP_INDEX, JSFunction, derived_has_trap) \
V(DERIVED_GET_TRAP_INDEX, JSFunction, derived_get_trap) \
V(toJSON_string, "toJSON") \
V(KeyedLoadMonomorphic_string, "KeyedLoadMonomorphic") \
V(KeyedStoreMonomorphic_string, "KeyedStoreMonomorphic") \
+ V(stack_overflow_string, "$stackOverflowBoilerplate") \
V(illegal_access_string, "illegal access") \
V(cell_value_string, "%cell_value") \
V(illegal_argument_string, "illegal argument") \
// At this point we cannot create an Error object using its javascript
// constructor. Instead, we copy the pre-constructed boilerplate and
// attach the stack trace as a hidden property.
- Handle<Object> exception;
- if (bootstrapper()->IsActive()) {
- // There is no boilerplate to use during bootstrapping.
- exception = factory()->NewStringFromAsciiChecked(
- MessageTemplate::TemplateString(MessageTemplate::kStackOverflow));
- } else {
- Handle<JSObject> boilerplate = stack_overflow_boilerplate();
- Handle<JSObject> copy = factory()->CopyJSObject(boilerplate);
- CaptureAndSetSimpleStackTrace(copy, factory()->undefined_value());
- exception = copy;
- }
+ Handle<String> key = factory()->stack_overflow_string();
+ Handle<Object> boilerplate =
+ Object::GetProperty(js_builtins_object(), key).ToHandleChecked();
+ if (boilerplate->IsUndefined()) {
+ return Throw(heap()->undefined_value(), nullptr);
+ }
+ Handle<JSObject> exception =
+ factory()->CopyJSObject(Handle<JSObject>::cast(boilerplate));
Throw(*exception, nullptr);
+ CaptureAndSetSimpleStackTrace(exception, factory()->undefined_value());
#ifdef VERIFY_HEAP
if (FLAG_verify_heap && FLAG_stress_compaction) {
heap()->CollectAllAvailableGarbage("trigger compaction");
// -------------------------------------------------------------------
var $errorToString;
+var $getStackTraceLine;
var $internalErrorSymbol;
+var $messageGetPositionInLine;
+var $messageGetLineNumber;
+var $messageGetSourceLine;
+var $stackOverflowBoilerplate;
var $stackTraceSymbol;
var MakeError;
var MakeEvalError;
}
-//Returns the offset of the given position within the containing line.
-function GetColumnNumber(message) {
- var script = %MessageGetScript(message);
- var start_position = %MessageGetStartPosition(message);
- var location = script.locationFromPosition(start_position, true);
- if (location == null) return -1;
- return location.column;
-}
-
-
// Returns the source code line containing the given source
// position, or the empty string if the position is invalid.
function GetSourceLine(message) {
return location.sourceText();
}
-
/**
* Find a line number given a specific source position.
* @param {number} position The source position.
);
+// Returns the offset of the given position within the containing
+// line.
+function GetPositionInLine(message) {
+ var script = %MessageGetScript(message);
+ var start_position = %MessageGetStartPosition(message);
+ var location = script.locationFromPosition(start_position, true);
+ if (location == null) return -1;
+ return location.column;
+}
+
+
function GetStackTraceLine(recv, fun, pos, isGlobal) {
return new CallSite(recv, fun, pos, false).toString();
}
['toString', ErrorToString]);
$errorToString = ErrorToString;
+$messageGetPositionInLine = GetPositionInLine;
+$messageGetLineNumber = GetLineNumber;
+$messageGetSourceLine = GetSourceLine;
MakeError = function(type, arg0, arg1, arg2) {
return MakeGenericError(GlobalError, type, arg0, arg1, arg2);
// Boilerplate for exceptions for stack overflows. Used from
// Isolate::StackOverflow().
-var StackOverflowBoilerplate = MakeRangeError(kStackOverflow);
-%DefineAccessorPropertyUnchecked(StackOverflowBoilerplate, 'stack',
+$stackOverflowBoilerplate = MakeRangeError(kStackOverflow);
+%DefineAccessorPropertyUnchecked($stackOverflowBoilerplate, 'stack',
StackTraceGetter, StackTraceSetter,
DONT_ENUM);
to.NoSideEffectToString = NoSideEffectToString;
to.ToDetailString = ToDetailString;
to.MakeError = MakeGenericError;
- to.MessageGetLineNumber = GetLineNumber;
- to.MessageGetColumnNumber = GetColumnNumber;
- to.MessageGetSourceLine = GetSourceLine;
- to.StackOverflowBoilerplate = StackOverflowBoilerplate;
});
});
// found in the LICENSE file.
var $functionSourceString;
+var $objectDefineOwnProperty;
+var $objectGetOwnPropertyDescriptor;
(function(global, utils) {
// Exports
$functionSourceString = FunctionSourceString;
+$objectDefineOwnProperty = DefineOwnPropertyFromAPI;
+$objectGetOwnPropertyDescriptor = ObjectGetOwnPropertyDescriptor;
utils.ObjectDefineProperties = ObjectDefineProperties;
utils.ObjectDefineProperty = ObjectDefineProperty;
utils.ExportToRuntime(function(to) {
to.GlobalEval = GlobalEval;
- to.ObjectDefineOwnProperty = DefineOwnPropertyFromAPI;
- to.ObjectGetOwnPropertyDescriptor = ObjectGetOwnPropertyDescriptor;
to.ToCompletePropertyDescriptor = ToCompletePropertyDescriptor;
});