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

Side by Side Diff: test/cctest/wasm/test-wasm-stack.cc

Issue 2071563002: [wasm] Make reported "column number" 1-based (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@decode-function-offsets-table
Patch Set: Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « src/runtime/runtime-internal.cc ('k') | test/cctest/wasm/test-wasm-trap-position.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 the V8 project authors. All rights reserved. 1 // Copyright 2016 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/wasm/wasm-macro-gen.h" 5 #include "src/wasm/wasm-macro-gen.h"
6 6
7 #include "test/cctest/cctest.h" 7 #include "test/cctest/cctest.h"
8 #include "test/cctest/compiler/value-helper.h" 8 #include "test/cctest/compiler/value-helper.h"
9 #include "test/cctest/wasm/test-signatures.h" 9 #include "test/cctest/wasm/test-signatures.h"
10 #include "test/cctest/wasm/wasm-run-utils.h" 10 #include "test/cctest/wasm/wasm-run-utils.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 Isolate* isolate = js_wasm_wrapper->GetIsolate(); 103 Isolate* isolate = js_wasm_wrapper->GetIsolate();
104 isolate->SetCaptureStackTraceForUncaughtExceptions(true, 10, 104 isolate->SetCaptureStackTraceForUncaughtExceptions(true, 10,
105 v8::StackTrace::kOverview); 105 v8::StackTrace::kOverview);
106 Handle<Object> global(isolate->context()->global_object(), isolate); 106 Handle<Object> global(isolate->context()->global_object(), isolate);
107 MaybeHandle<Object> maybe_exc; 107 MaybeHandle<Object> maybe_exc;
108 Handle<Object> args[] = {js_wasm_wrapper}; 108 Handle<Object> args[] = {js_wasm_wrapper};
109 MaybeHandle<Object> returnObjMaybe = 109 MaybeHandle<Object> returnObjMaybe =
110 Execution::TryCall(isolate, js_trampoline, global, 1, args, &maybe_exc); 110 Execution::TryCall(isolate, js_trampoline, global, 1, args, &maybe_exc);
111 CHECK(returnObjMaybe.is_null()); 111 CHECK(returnObjMaybe.is_null());
112 112
113 // Line number is 1-based, with 0 == kNoLineNumberInfo. 113 // The column is 1-based, so add 1 to the actual byte offset.
114 ExceptionInfo expected_exceptions[] = { 114 ExceptionInfo expected_exceptions[] = {
115 {"a", 3, 8}, // - 115 {"a", 3, 8}, // -
116 {"js", 4, 2}, // - 116 {"js", 4, 2}, // -
117 {"<WASM UNNAMED>", static_cast<int>(wasm_index), 2}, // - 117 {"<WASM UNNAMED>", static_cast<int>(wasm_index), 3}, // -
118 {"<WASM UNNAMED>", static_cast<int>(wasm_index_2), 1}, // - 118 {"<WASM UNNAMED>", static_cast<int>(wasm_index_2), 2}, // -
119 {"callFn", 1, 24} // - 119 {"callFn", 1, 24} // -
120 }; 120 };
121 CheckExceptionInfos(isolate, maybe_exc.ToHandleChecked(), 121 CheckExceptionInfos(isolate, maybe_exc.ToHandleChecked(),
122 expected_exceptions); 122 expected_exceptions);
123 } 123 }
124 124
125 // Trigger a trap in WASM, stack should be JS -> WASM -> WASM. 125 // Trigger a trap in WASM, stack should be JS -> WASM -> WASM.
126 TEST(CollectDetailedWasmStack_WasmError) { 126 TEST(CollectDetailedWasmStack_WasmError) {
127 TestSignatures sigs; 127 TestSignatures sigs;
128 TestingModule module; 128 TestingModule module;
(...skipping 19 matching lines...) Expand all
148 Isolate* isolate = js_wasm_wrapper->GetIsolate(); 148 Isolate* isolate = js_wasm_wrapper->GetIsolate();
149 isolate->SetCaptureStackTraceForUncaughtExceptions(true, 10, 149 isolate->SetCaptureStackTraceForUncaughtExceptions(true, 10,
150 v8::StackTrace::kOverview); 150 v8::StackTrace::kOverview);
151 Handle<Object> global(isolate->context()->global_object(), isolate); 151 Handle<Object> global(isolate->context()->global_object(), isolate);
152 MaybeHandle<Object> maybe_exc; 152 MaybeHandle<Object> maybe_exc;
153 Handle<Object> args[] = {js_wasm_wrapper}; 153 Handle<Object> args[] = {js_wasm_wrapper};
154 MaybeHandle<Object> maybe_return_obj = 154 MaybeHandle<Object> maybe_return_obj =
155 Execution::TryCall(isolate, js_trampoline, global, 1, args, &maybe_exc); 155 Execution::TryCall(isolate, js_trampoline, global, 1, args, &maybe_exc);
156 CHECK(maybe_return_obj.is_null()); 156 CHECK(maybe_return_obj.is_null());
157 157
158 // Line number is 1-based, with 0 == kNoLineNumberInfo. 158 // The column is 1-based, so add 1 to the actual byte offset.
159 ExceptionInfo expected_exceptions[] = { 159 ExceptionInfo expected_exceptions[] = {
160 {"<WASM UNNAMED>", static_cast<int>(wasm_index), 1}, // - 160 {"<WASM UNNAMED>", static_cast<int>(wasm_index), 2}, // -
161 {"<WASM UNNAMED>", static_cast<int>(wasm_index_2), 1}, // - 161 {"<WASM UNNAMED>", static_cast<int>(wasm_index_2), 2}, // -
162 {"callFn", 1, 24} //- 162 {"callFn", 1, 24} //-
163 }; 163 };
164 CheckExceptionInfos(isolate, maybe_exc.ToHandleChecked(), 164 CheckExceptionInfos(isolate, maybe_exc.ToHandleChecked(),
165 expected_exceptions); 165 expected_exceptions);
166 } 166 }
OLDNEW
« no previous file with comments | « src/runtime/runtime-internal.cc ('k') | test/cctest/wasm/test-wasm-trap-position.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698