Index: src/x64/code-stubs-x64.cc |
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc |
index 61404fa2d17458e3e5816c3fc94146294da9d7b2..361edc310ad61dfaba8962e8315be80d9c4d7646 100644 |
--- a/src/x64/code-stubs-x64.cc |
+++ b/src/x64/code-stubs-x64.cc |
@@ -5953,42 +5953,45 @@ struct AheadOfTimeWriteBarrierStubList { |
}; |
+#define REG(Name) { kRegister ## Name ## Code } |
+ |
struct AheadOfTimeWriteBarrierStubList kAheadOfTime[] = { |
// Used in RegExpExecStub. |
- { rbx, rax, rdi, EMIT_REMEMBERED_SET }, |
+ { REG(Rbx), REG(Rax), REG(Rdi), EMIT_REMEMBERED_SET }, |
// Used in CompileArrayPushCall. |
- { rbx, rcx, rdx, EMIT_REMEMBERED_SET }, |
+ { REG(Rbx), REG(Rcx), REG(Rdx), EMIT_REMEMBERED_SET }, |
// Used in CompileStoreGlobal. |
- { rbx, rcx, rdx, OMIT_REMEMBERED_SET }, |
+ { REG(Rbx), REG(Rcx), REG(Rdx), OMIT_REMEMBERED_SET }, |
// Used in StoreStubCompiler::CompileStoreField and |
// KeyedStoreStubCompiler::CompileStoreField via GenerateStoreField. |
- { rdx, rcx, rbx, EMIT_REMEMBERED_SET }, |
+ { REG(Rdx), REG(Rcx), REG(Rbx), EMIT_REMEMBERED_SET }, |
// GenerateStoreField calls the stub with two different permutations of |
// registers. This is the second. |
- { rbx, rcx, rdx, EMIT_REMEMBERED_SET }, |
+ { REG(Rbx), REG(Rcx), REG(Rdx), EMIT_REMEMBERED_SET }, |
// StoreIC::GenerateNormal via GenerateDictionaryStore. |
- { rbx, r8, r9, EMIT_REMEMBERED_SET }, |
+ { REG(Rbx), REG(R8), REG(R9), EMIT_REMEMBERED_SET }, |
// KeyedStoreIC::GenerateGeneric. |
- { rbx, rdx, rcx, EMIT_REMEMBERED_SET}, |
+ { REG(Rbx), REG(Rdx), REG(Rcx), EMIT_REMEMBERED_SET}, |
// KeyedStoreStubCompiler::GenerateStoreFastElement. |
- { rdi, rbx, rcx, EMIT_REMEMBERED_SET}, |
- { rdx, rdi, rbx, EMIT_REMEMBERED_SET}, |
+ { REG(Rdi), REG(Rbx), REG(Rcx), EMIT_REMEMBERED_SET}, |
+ { REG(Rdx), REG(Rdi), REG(Rbx), EMIT_REMEMBERED_SET}, |
// ElementsTransitionGenerator::GenerateSmiOnlyToObject |
// and ElementsTransitionGenerator::GenerateSmiOnlyToObject |
// and ElementsTransitionGenerator::GenerateDoubleToObject |
- { rdx, rbx, rdi, EMIT_REMEMBERED_SET}, |
- { rdx, rbx, rdi, OMIT_REMEMBERED_SET}, |
+ { REG(Rdx), REG(Rbx), REG(Rdi), EMIT_REMEMBERED_SET}, |
+ { REG(Rdx), REG(Rbx), REG(Rdi), OMIT_REMEMBERED_SET}, |
// ElementsTransitionGenerator::GenerateSmiOnlyToDouble |
// and ElementsTransitionGenerator::GenerateDoubleToObject |
- { rdx, r11, r15, EMIT_REMEMBERED_SET}, |
+ { REG(Rdx), REG(R11), REG(R15), EMIT_REMEMBERED_SET}, |
// ElementsTransitionGenerator::GenerateDoubleToObject |
- { r11, rax, r15, EMIT_REMEMBERED_SET}, |
+ { REG(R11), REG(Rax), REG(R15), EMIT_REMEMBERED_SET}, |
// StoreArrayLiteralElementStub::Generate |
- { rbx, rax, rcx, EMIT_REMEMBERED_SET}, |
+ { REG(Rbx), REG(Rax), REG(Rcx), EMIT_REMEMBERED_SET}, |
// Null termination. |
- { no_reg, no_reg, no_reg, EMIT_REMEMBERED_SET} |
+ { REG(None), REG(None), REG(None), EMIT_REMEMBERED_SET} |
}; |
+#undef REG |
bool RecordWriteStub::IsPregenerated() { |
for (AheadOfTimeWriteBarrierStubList* entry = kAheadOfTime; |