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

Unified Diff: src/compiler/arm/code-generator-arm.cc

Issue 2738683003: [wasm][arm] Emit MaybeCheckConstPool in the trap code generation (Closed)
Patch Set: Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/compiler/arm/code-generator-arm.cc
diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc
index 75dea85194876168828cb6d28cdf877d930dda6b..07a35920a63b3e9fa295f63c39e37518cb2a541f 100644
--- a/src/compiler/arm/code-generator-arm.cc
+++ b/src/compiler/arm/code-generator-arm.cc
@@ -2135,6 +2135,8 @@ void CodeGenerator::AssembleArchTrap(Instruction* instr,
private:
void GenerateCallToTrap(Builtins::Name trap_id) {
+ // Ensure to emit the constant pool first if necessary.
+ __ MaybeCheckConstPool();
jbramley 2017/03/07 14:24:08 What is special about this location? I would have
if (trap_id == Builtins::builtin_count) {
// We cannot test calls to the runtime in cctest/test-run-wasm.
// Therefore we emit a call to C here instead of a call to the runtime.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698