summaryrefslogtreecommitdiff
path: root/js/src/vm
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-03-18 19:59:51 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-03-18 20:00:50 +0100
commitd7989f939fb672608d490aee5d3b404d5c2c8405 (patch)
treee0e3d292f97727050af4bfa6a4cd82e5fb83ce65 /js/src/vm
parentdd71a7cd2973da95453895b7ee60e287c20d8f0c (diff)
parent4843c47f1397e346ecb405412dd3d435bc9f8175 (diff)
downloadaura-central-d7989f939fb672608d490aee5d3b404d5c2c8405.tar.gz
Remove strict arguments poison pill for "caller" property per ES2017
This resolves %79. Merged remote-tracking branch 'janek/js_strict_arguments_caller_removed_1'
Diffstat (limited to 'js/src/vm')
-rw-r--r--js/src/vm/ArgumentsObject.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/js/src/vm/ArgumentsObject.cpp b/js/src/vm/ArgumentsObject.cpp
index d01121ef0..717aa1050 100644
--- a/js/src/vm/ArgumentsObject.cpp
+++ b/js/src/vm/ArgumentsObject.cpp
@@ -676,7 +676,7 @@ UnmappedArgumentsObject::obj_resolve(JSContext* cx, HandleObject obj, HandleId i
if (argsobj->hasOverriddenLength())
return true;
} else {
- if (!JSID_IS_ATOM(id, cx->names().callee) && !JSID_IS_ATOM(id, cx->names().caller))
+ if (!JSID_IS_ATOM(id, cx->names().callee))
return true;
attrs = JSPROP_PERMANENT | JSPROP_GETTER | JSPROP_SETTER | JSPROP_SHARED;
@@ -709,10 +709,6 @@ UnmappedArgumentsObject::obj_enumerate(JSContext* cx, HandleObject obj)
if (!HasProperty(cx, argsobj, id, &found))
return false;
- id = NameToId(cx->names().caller);
- if (!HasProperty(cx, argsobj, id, &found))
- return false;
-
id = SYMBOL_TO_JSID(cx->wellKnownSymbols().iterator);
if (!HasProperty(cx, argsobj, id, &found))
return false;