mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-06-13 11:59:51 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- more pointer style... take away, put again... (640edf447) - Bug 1139683 - Rewrite SetExistingProperty with comments and references to the standard. r=efaust. (0da1e634b) - Bug 1142775 - Rename NativeSet -> NativeSetExistingDataProperty and simplify it since it is only called for data properties. Delete Shape::set. Add comments. No change in behavior. r=efaust. (1fec7be0a) - Bug 1142794 - Change 'receiver' argument to SetProperty functions and ProxyHandler::set methods to be a HandleValue. r=Waldo. (032f78c22) - Bug 1149377 - Disable PGO on ICCallStubCompiler::guardFunApply. r=jandem (aa0617c41) - Revert Bug 1137180 - Allow unboxed objects to be extended with new properties, r=jandem. (1970f92f0) - Bug 1137180 - Add most functionality necessary for extensible unboxed objects, r=jandem. (30768aa93) - Bug 1137180 - Add baseline caches for extensible unboxed objects, and enable extensible unboxed objects (still off by default), r=jandem. (8c6aa02f9) - Bug 1143011 - Extract the has/add/take logic out of the register sets to distinguish between allocatable and live sets. r=jandem,Waldo (430b0830f) - Bug 1143011 - Use AllocatableSet or LiveSet for all register set uses. r=jandem (69dc22ad9) - Bug 1150384 - IonMonkey: MIPS: Fix build failure caused by Bug 1143011. r=rankov (f532d5095) - Bug 1145811 - Remove simdSet argument of PushRegsInMask. r=bbouvier (7c1dd4847) - Bug 1148880 - Make Trampoline-arm.cpp compile with Clang again. r=nbp (b89564285) - Bump the XDR version two more to account for yet more branch-versioning oddities. No bug, r=me as trivial, DONTBUILD because really building bytecode-bumping patchwork twice is just too much for an opaque identifier that we already built once, pushing in a CLOSED TREE because version bumps are risk-free and these versions are needed for a branch backport and otherwise I'm spinning wheels waiting on the tree to reopen right now (ab7ac9762) - partial of Bug 1144366 - Switch SpiderMonkey and XPConnect style from |T *t| to |T* t|. r=jorendorff (9e27b1ba4) - Bug 1134626 part 1 - Move all x86-shared files into their own directory. r=jandem (6267cdb05) - Bug 1134626 part 2 - Move x86 & x64 Architecture into a shared file. r=jandem (467731dfc)
This commit is contained in:
@@ -922,8 +922,8 @@ ScriptedDirectProxyHandler::get(JSContext* cx, HandleObject proxy, HandleObject
|
||||
|
||||
// ES6 draft rev 32 (2015 Feb 2) 9.5.9 Proxy.[[Set]](P, V, Receiver)
|
||||
bool
|
||||
ScriptedDirectProxyHandler::set(JSContext *cx, HandleObject proxy, HandleObject receiver,
|
||||
HandleId id, MutableHandleValue vp, ObjectOpResult &result) const
|
||||
ScriptedDirectProxyHandler::set(JSContext *cx, HandleObject proxy, HandleId id, HandleValue v,
|
||||
HandleValue receiver, ObjectOpResult &result) const
|
||||
{
|
||||
// step 2-3 (Steps 1 and 4 are irrelevant assertions.)
|
||||
RootedObject handler(cx, GetDirectProxyHandlerObject(proxy));
|
||||
@@ -940,7 +940,7 @@ ScriptedDirectProxyHandler::set(JSContext *cx, HandleObject proxy, HandleObject
|
||||
|
||||
// step 8
|
||||
if (trap.isUndefined())
|
||||
return SetProperty(cx, target, receiver, id, vp, result);
|
||||
return SetProperty(cx, target, id, v, receiver, result);
|
||||
|
||||
// step 9-10
|
||||
RootedValue value(cx);
|
||||
@@ -949,8 +949,8 @@ ScriptedDirectProxyHandler::set(JSContext *cx, HandleObject proxy, HandleObject
|
||||
Value argv[] = {
|
||||
ObjectOrNullValue(target),
|
||||
value,
|
||||
vp.get(),
|
||||
ObjectValue(*receiver)
|
||||
v.get(),
|
||||
receiver.get()
|
||||
};
|
||||
RootedValue trapResult(cx);
|
||||
if (!Invoke(cx, ObjectValue(*handler), trap, ArrayLength(argv), argv, &trapResult))
|
||||
@@ -969,7 +969,7 @@ ScriptedDirectProxyHandler::set(JSContext *cx, HandleObject proxy, HandleObject
|
||||
if (desc.object()) {
|
||||
if (desc.isDataDescriptor() && !desc.configurable() && !desc.writable()) {
|
||||
bool same;
|
||||
if (!SameValue(cx, vp, desc.value(), &same))
|
||||
if (!SameValue(cx, v, desc.value(), &same))
|
||||
return false;
|
||||
if (!same) {
|
||||
JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_SET_NW_NC);
|
||||
|
||||
Reference in New Issue
Block a user