Bug 1203287 - Fix build errors in ARM64 JIT. r=hv1989
authorJakob Olesen <jolesen@mozilla.com>
Sun, 13 Sep 2015 03:29:25 +0800
changeset 294770 e668e5f2fb8ab962908d4903662ede26ba9b6868
parent 294769 f72d4bfd281163432af96b0444d89b36e17c47b3
child 294771 3de175bd4e83775e35077d71167967fa457d0e0a
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershv1989
bugs1203287
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1203287 - Fix build errors in ARM64 JIT. r=hv1989 - A new argument was added to a jumpWithPatch(), but arm64 wasn't updated. - Add missing 'using namespace js'. This seems to be random fallout from the way source files get unified when building arm64. - Fix a 'return = foo' typo. It seems this code was never compiled.
js/src/jit/arm64/MacroAssembler-arm64.cpp
js/src/jit/arm64/MacroAssembler-arm64.h
js/src/vm/UbiNodeCensus.cpp
--- a/js/src/jit/arm64/MacroAssembler-arm64.cpp
+++ b/js/src/jit/arm64/MacroAssembler-arm64.cpp
@@ -576,15 +576,15 @@ MacroAssembler::pushFakeReturnAddress(Re
     Label fakeCallsite;
 
     Adr(ARMRegister(scratch, 64), &fakeCallsite);
     Push(scratch);
     bind(&fakeCallsite);
     uint32_t pseudoReturnOffset = currentOffset();
 
     leaveNoPool();
-    return = pseudoReturnOffset;
+    return pseudoReturnOffset;
 }
 
 //}}} check_macroassembler_style
 
 } // namespace jit
 } // namespace js
--- a/js/src/jit/arm64/MacroAssembler-arm64.h
+++ b/js/src/jit/arm64/MacroAssembler-arm64.h
@@ -1590,17 +1590,17 @@ class MacroAssemblerCompat : public vixl
         } else {
             nop();
             branch_bo = b(-1);
         }
         label->use(branch_bo.getOffset());
         return CodeOffsetJump(load_bo.getOffset(), pe.index());
     }
     CodeOffsetJump backedgeJump(RepatchLabel* label, Label* documentation = nullptr) {
-        return jumpWithPatch(label, documentation);
+        return jumpWithPatch(label, Always, documentation);
     }
     template <typename T>
     CodeOffsetJump branchPtrWithPatch(Condition cond, Register reg, T ptr, RepatchLabel* label) {
         cmpPtr(reg, ptr);
         return jumpWithPatch(label, cond);
     }
     template <typename T>
     CodeOffsetJump branchPtrWithPatch(Condition cond, Address addr, T ptr, RepatchLabel* label) {
--- a/js/src/vm/UbiNodeCensus.cpp
+++ b/js/src/vm/UbiNodeCensus.cpp
@@ -1,16 +1,18 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "js/UbiNodeCensus.h"
 
+using namespace js;
+
 namespace JS {
 namespace ubi {
 
 void
 CountDeleter::operator()(CountBase* ptr)
 {
     if (!ptr)
         return;