Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: src/messages.cc

Issue 2161953003: Remove stack overflow boilerplate (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/messages.cc
diff --git a/src/messages.cc b/src/messages.cc
index 9809be58571a1b72800dde7ccc926ca58eb3bb6f..327f91f7c6933168c7cc4a2707a6d68b363fca3e 100644
--- a/src/messages.cc
+++ b/src/messages.cc
@@ -5,6 +5,7 @@
#include "src/messages.h"
#include "src/api.h"
+#include "src/bootstrapper.h"
#include "src/execution.h"
#include "src/isolate-inl.h"
#include "src/keys.h"
@@ -447,6 +448,50 @@ MaybeHandle<String> MessageTemplate::FormatMessage(int template_index,
return builder.Finish();
}
+Object* ConstructError(Isolate* isolate, Handle<JSFunction> target,
Yang 2016/07/19 15:06:47 Let's return a MaybeHandle<Object> here.
jgruber 2016/07/20 14:48:39 Done.
+ Handle<Object> new_target, Handle<Object> message) {
+ // 1. If NewTarget is undefined, let newTarget be the active function object,
+ // else let newTarget be NewTarget.
+
+ Handle<JSReceiver> new_target_recv =
+ new_target->IsJSReceiver() ? Handle<JSReceiver>::cast(new_target)
+ : Handle<JSReceiver>::cast(target);
+
+ // 2. Let O be ? OrdinaryCreateFromConstructor(newTarget, "%ErrorPrototype%",
+ // « [[ErrorData]] »).
+ Handle<JSObject> err;
+ ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, err,
+ JSObject::New(target, new_target_recv));
+
+ // 3. If message is not undefined, then
+ // a. Let msg be ? ToString(message).
+ // b. Let msgDesc be the PropertyDescriptor{[[Value]]: msg, [[Writable]]:
+ // true, [[Enumerable]]: false, [[Configurable]]: true}.
+ // c. Perform ! DefinePropertyOrThrow(O, "message", msgDesc).
+ // 4. Return O.
+
+ if (!message->IsUndefined(isolate)) {
+ Handle<String> msg_string;
+ ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, msg_string,
+ Object::ToString(isolate, message));
+ RETURN_FAILURE_ON_EXCEPTION(
+ isolate,
+ JSObject::SetOwnPropertyIgnoreAttributes(
+ err, isolate->factory()->message_string(), msg_string, DONT_ENUM));
+ }
+
+ // Capture the stack trace unless we're setting up.
+ if (!isolate->bootstrapper()->IsActive()) {
+ // Optionally capture a more detailed stack trace for the message.
+ RETURN_FAILURE_ON_EXCEPTION(isolate,
+ isolate->CaptureAndSetDetailedStackTrace(err));
+ // Capture a simple stack trace for the stack property.
+ RETURN_FAILURE_ON_EXCEPTION(isolate,
+ isolate->CaptureAndSetSimpleStackTrace(err));
+ }
+
+ return *err;
+}
} // namespace internal
} // namespace v8

Powered by Google App Engine
This is Rietveld 408576698