From e10284a86908751b753803cfec779ffb9978da82 Mon Sep 17 00:00:00 2001 From: Sean Stangl Date: Thu, 2 Jul 2015 15:23:47 -0700 Subject: [PATCH] Bug 1180013 - Fix irregexp on ARM64. r=efaust --- js/src/irregexp/NativeRegExpMacroAssembler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.cpp b/js/src/irregexp/NativeRegExpMacroAssembler.cpp index 0da8cc0094fe..326998bf0ad8 100644 --- a/js/src/irregexp/NativeRegExpMacroAssembler.cpp +++ b/js/src/irregexp/NativeRegExpMacroAssembler.cpp @@ -123,7 +123,7 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only) #ifdef JS_CODEGEN_ARM64 // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing. MOZ_ASSERT(!masm.GetStackPointer64().Is(sp)); - masm.moveStackPtrTo(masm.getStackPointer()); + masm.Mov(masm.GetStackPointer64(), sp); #endif // Push non-volatile registers which might be modified by jitcode.