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

Unified Diff: src/messages.cc

Issue 2493823003: [wasm] Allocate a single script per wasm module (Closed)
Patch Set: Fix signed/unsigned issues Created 4 years, 1 month 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
« no previous file with comments | « src/messages.h ('k') | src/objects.h » ('j') | src/objects.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/messages.cc
diff --git a/src/messages.cc b/src/messages.cc
index 2726055c2ca8bdab7a43a28965105d0921413eac..7016aa61d02ead4c85e8bc9ae232d7f020d081b9 100644
--- a/src/messages.cc
+++ b/src/messages.cc
@@ -635,7 +635,9 @@ Handle<Object> WasmStackFrame::GetFunction() const {
}
Handle<Object> WasmStackFrame::GetFunctionName() {
- return wasm::GetWasmFunctionNameOrNull(isolate_, wasm_instance_,
+ Handle<wasm::WasmCompiledModule> compiled_module(
+ wasm::GetCompiledModule(JSObject::cast(*wasm_instance_)), isolate_);
+ return wasm::GetWasmFunctionNameOrNull(isolate_, compiled_module,
wasm_func_index_);
}
@@ -683,18 +685,15 @@ Handle<Object> AsmJsWasmStackFrame::GetFunction() const {
Handle<Object> AsmJsWasmStackFrame::GetFileName() {
Handle<Script> script =
- wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
+ wasm::GetScript(Handle<JSObject>::cast(wasm_instance_));
+ DCHECK_EQ(Script::TYPE_NORMAL, script->type());
return handle(script->name(), isolate_);
}
-Handle<Object> AsmJsWasmStackFrame::GetFunctionName() {
- return wasm::GetWasmFunctionNameOrNull(isolate_, wasm_instance_,
- wasm_func_index_);
-}
-
Handle<Object> AsmJsWasmStackFrame::GetScriptNameOrSourceUrl() {
Handle<Script> script =
- wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
+ wasm::GetScript(Handle<JSObject>::cast(wasm_instance_));
+ DCHECK_EQ(Script::TYPE_NORMAL, script->type());
return ScriptNameOrSourceUrl(script, isolate_);
}
@@ -708,14 +707,16 @@ int AsmJsWasmStackFrame::GetPosition() const {
int AsmJsWasmStackFrame::GetLineNumber() {
DCHECK_LE(0, GetPosition());
Handle<Script> script =
- wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
+ wasm::GetScript(Handle<JSObject>::cast(wasm_instance_));
+ DCHECK_EQ(Script::TYPE_NORMAL, script->type());
return Script::GetLineNumber(script, GetPosition()) + 1;
}
int AsmJsWasmStackFrame::GetColumnNumber() {
DCHECK_LE(0, GetPosition());
Handle<Script> script =
- wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
+ wasm::GetScript(Handle<JSObject>::cast(wasm_instance_));
+ DCHECK_EQ(Script::TYPE_NORMAL, script->type());
return Script::GetColumnNumber(script, GetPosition()) + 1;
}
« no previous file with comments | « src/messages.h ('k') | src/objects.h » ('j') | src/objects.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698