Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/test/cctest/wasm/test-wasm-trap-position.cc b/test/cctest/wasm/test-wasm-trap-position.cc
index 13f2929..30f5d48 100644
--- a/test/cctest/wasm/test-wasm-trap-position.cc
+++ b/test/cctest/wasm/test-wasm-trap-position.cc
@@ -38,10 +38,10 @@
};
template <int N>
-void CheckExceptionInfos(Isolate* isolate, Handle<Object> exc,
+void CheckExceptionInfos(Handle<Object> exc,
const ExceptionInfo (&excInfos)[N]) {
// Check that it's indeed an Error object.
- CHECK(Object::IsErrorObject(isolate, exc));
+ CHECK(exc->IsJSError());
// Extract stack frame from the exception.
Local<v8::Value> localExc = Utils::ToLocal(exc);
@@ -88,12 +88,12 @@
Execution::TryCall(isolate, js_trampoline, global, 1, args, &maybe_exc);
CHECK(returnObjMaybe.is_null());
+ // The column is 1-based, so add 1 to the actual byte offset.
ExceptionInfo expected_exceptions[] = {
- {"<WASM>", static_cast<int>(wasm_index), 1}, // --
- {"callFn", 1, 24} // --
+ {"<WASM UNNAMED>", static_cast<int>(wasm_index), 2}, // --
+ {"callFn", 1, 24} // --
};
- CheckExceptionInfos(isolate, maybe_exc.ToHandleChecked(),
- expected_exceptions);
+ CheckExceptionInfos(maybe_exc.ToHandleChecked(), expected_exceptions);
}
// Trigger a trap for loading from out-of-bounds.
@@ -129,12 +129,11 @@
Execution::TryCall(isolate, js_trampoline, global, 1, args, &maybe_exc);
CHECK(returnObjMaybe.is_null());
- // Line number is 1-based, with 0 == kNoLineNumberInfo.
+ // The column is 1-based, so add 1 to the actual byte offset.
ExceptionInfo expected_exceptions[] = {
- {"<WASM>", static_cast<int>(wasm_index), 6}, // --
- {"<WASM>", static_cast<int>(wasm_index_2), 2}, // --
- {"callFn", 1, 24} // --
+ {"<WASM UNNAMED>", static_cast<int>(wasm_index), 7}, // --
+ {"<WASM UNNAMED>", static_cast<int>(wasm_index_2), 3}, // --
+ {"callFn", 1, 24} // --
};
- CheckExceptionInfos(isolate, maybe_exc.ToHandleChecked(),
- expected_exceptions);
+ CheckExceptionInfos(maybe_exc.ToHandleChecked(), expected_exceptions);
}