Commit 63225e20 authored by Noemi Erli's avatar Noemi Erli
Browse files

Merge mozilla-central to autoland a=merge on a CLOSED TREE

parents c2f99c7e 1777bccf

dom/system/OSFileConstants.cpp

+4 −8
Original line number Diff line number Diff line
@@ -249,9 +249,7 @@ nsresult OSFileConstantsService::InitOSFileConstants() { 
 * Produces a |ConstantSpec|.

 */

#define INT_CONSTANT(name) \

  {                             \

#    name, JS::Int32Value(name) \

  }

  { #name, JS::Int32Value(name) }



/**

 * Define a simple read-only property holding an unsigned integer.
@@ -262,9 +260,7 @@ nsresult OSFileConstantsService::InitOSFileConstants() { 
 * Produces a |ConstantSpec|.

 */

#define UINT_CONSTANT(name) \

  {                              \

#    name, JS::NumberValue(name) \

  }

  { #name, JS::NumberValue(name) }



/**

 * End marker for ConstantSpec

js/src/jit/CacheIRCompiler.cpp

+39 −39
Original line number Diff line number Diff line
@@ -7604,8 +7604,8 @@ bool CacheIRCompiler::emitMegamorphicStoreSlot(ObjOperandId objId, 
  volatileRegs.takeUnchecked(val);

  masm.PushRegsInMask(volatileRegs);



  using Fn = bool (*)(JSContext * cx, JSObject * obj, PropertyName * name,

                      Value * val);

  using Fn =

      bool (*)(JSContext* cx, JSObject* obj, PropertyName* name, Value* val);

  masm.setupUnalignedABICall(scratch1);

  masm.loadJSContext(scratch1);

  masm.passABIArg(scratch1);
@@ -8139,9 +8139,9 @@ bool CacheIRCompiler::emitCallRegExpMatcherResult(ObjOperandId regexpId, 
  masm.Push(input);

  masm.Push(regexp);



  using Fn = bool (*)(JSContext*, HandleObject regexp, HandleString input,

                      int32_t lastIndex, MatchPairs * pairs,

                      MutableHandleValue output);

  using Fn =

      bool (*)(JSContext*, HandleObject regexp, HandleString input,

               int32_t lastIndex, MatchPairs* pairs, MutableHandleValue output);

  callvm.call<Fn, RegExpMatcherRaw>();

  return true;

}

js/src/jit/IonCacheIRCompiler.cpp

+4 −4

File changed.

Contains only whitespace changes.