Clear exceptions in Invoke instead of JSEntryStub

src/messages.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/messages.h"
 
 #include <memory>
 
 #include "src/api.h"
 #include "src/execution.h"
@@ skipping 866 matching lines @@
   return msg;
 }
 
 }  // namespace
 
 // static
 MaybeHandle<Object> ErrorUtils::MakeGenericError(
     Isolate* isolate, Handle<JSFunction> constructor, int template_index,
     Handle<Object> arg0, Handle<Object> arg1, Handle<Object> arg2,
     FrameSkipMode mode) {
-  // This function used to be implemented in JavaScript, and JSEntryStub clears
-  // any pending exceptions - so whenever we'd call this from C++, pending
-  // exceptions would be cleared. Preserve this behavior.
-  isolate->clear_pending_exception();
+  if (FLAG_clear_exceptions_on_js_entry) {
+    // This function used to be implemented in JavaScript, and JSEntryStub
+    // clears
+    // any pending exceptions - so whenever we'd call this from C++, pending
+    // exceptions would be cleared. Preserve this behavior.
+    isolate->clear_pending_exception();
+  }
 
   DCHECK(mode != SKIP_UNTIL_SEEN);
 
   Handle<Object> no_caller;
   Handle<String> msg = FormatMessage(isolate, template_index, arg0, arg1, arg2);
   return ErrorUtils::Construct(isolate, constructor, constructor, msg, mode,
                                no_caller, false);
 }
 
 #define SET_CALLSITE_PROPERTY(target, key, value)                        \
@@ skipping 276 matching lines @@
   builder.AppendCString(" (");
   RETURN_ON_EXCEPTION(
       isolate, AppendFileLocation(isolate, recv, &call_site, &builder), String);
   builder.AppendCString(")");
 
   RETURN_RESULT(isolate, builder.Finish(), String);
 }
 
 }  // namespace internal
 }  // namespace v8