Index: src/arm64/macro-assembler-arm64.cc |
diff --git a/src/arm64/macro-assembler-arm64.cc b/src/arm64/macro-assembler-arm64.cc |
index 68ba6092d727fb275f1c74c3e10255dd9e4173ea..906418c99d922b8eb30c4b8641f55864656c1d33 100644 |
--- a/src/arm64/macro-assembler-arm64.cc |
+++ b/src/arm64/macro-assembler-arm64.cc |
@@ -3050,8 +3050,12 @@ |
// For the JSEntry handler, we must preserve the live registers x0-x4. |
// (See JSEntryStub::GenerateBody().) |
- // Set up the index for pushing. |
- Mov(x11, handler_index); |
+ unsigned state = |
+ StackHandler::IndexField::encode(handler_index) | |
+ StackHandler::KindField::encode(kind); |
+ |
+ // Set up the state for pushing. |
+ Mov(x11, state); |
// Push the context and state. |
if (kind == StackHandler::JS_ENTRY) { |