Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/d8.cc b/src/d8.cc
index c58c172..7c9a24f 100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -26,15 +26,12 @@
#include "include/v8-testing.h"
#endif // V8_SHARED
-#if !defined(V8_SHARED) && defined(ENABLE_GDB_JIT_INTERFACE)
-#include "src/gdb-jit.h"
-#endif
-
#ifdef ENABLE_VTUNE_JIT_INTERFACE
#include "src/third_party/vtune/v8-vtune.h"
#endif
#include "src/d8.h"
+#include "src/ostreams.h"
#include "include/libplatform/libplatform.h"
#ifndef V8_SHARED
@@ -375,6 +372,7 @@
bool report_exceptions, SourceType source_type) {
HandleScope handle_scope(isolate);
TryCatch try_catch(isolate);
+ try_catch.SetVerbose(true);
MaybeLocal<Value> maybe_result;
{
@@ -1247,6 +1245,10 @@
return global_template;
}
+static void EmptyMessageCallback(Local<Message> message, Local<Value> error) {
+ // Nothing to be done here, exceptions thrown up to the shell will be reported
+ // separately by {Shell::ReportException} after they are caught.
+}
void Shell::Initialize(Isolate* isolate) {
#ifndef V8_SHARED
@@ -1254,6 +1256,8 @@
if (i::StrLength(i::FLAG_map_counters) != 0)
MapCounters(isolate, i::FLAG_map_counters);
#endif // !V8_SHARED
+ // Disable default message reporting.
+ isolate->AddMessageListener(EmptyMessageCallback);
}
@@ -2459,11 +2463,6 @@
Shell::array_buffer_allocator = &shell_array_buffer_allocator;
}
create_params.array_buffer_allocator = Shell::array_buffer_allocator;
-#if !defined(V8_SHARED) && defined(ENABLE_GDB_JIT_INTERFACE)
- if (i::FLAG_gdbjit) {
- create_params.code_event_handler = i::GDBJITInterface::EventHandler;
- }
-#endif
#ifdef ENABLE_VTUNE_JIT_INTERFACE
create_params.code_event_handler = vTune::GetVtuneCodeEventHandler();
#endif