diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2019-05-22 14:14:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-22 14:14:18 +0000 |
| commit | be8d03cf14455a80342582e8578fdbee590f350a (patch) | |
| tree | a1a1f60d130bf760dc86e21e0e72c04e0834bfd2 /js/src/vm/Interpreter-inl.h | |
| parent | a1f96f11d4ea35b730255249c7ae2c7e4935331e (diff) | |
| parent | 201d8ee48926569fee200fbc9b4d506554869b5d (diff) | |
| download | UXP-be8d03cf14455a80342582e8578fdbee590f350a.tar UXP-be8d03cf14455a80342582e8578fdbee590f350a.tar.gz UXP-be8d03cf14455a80342582e8578fdbee590f350a.tar.lz UXP-be8d03cf14455a80342582e8578fdbee590f350a.tar.xz UXP-be8d03cf14455a80342582e8578fdbee590f350a.zip | |
Merge pull request #1091 from MoonchildProductions/remove-unboxed
Remove unboxed objects phase 1
Diffstat (limited to 'js/src/vm/Interpreter-inl.h')
| -rw-r--r-- | js/src/vm/Interpreter-inl.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/js/src/vm/Interpreter-inl.h b/js/src/vm/Interpreter-inl.h index 5f476c4ff..710f1d89b 100644 --- a/js/src/vm/Interpreter-inl.h +++ b/js/src/vm/Interpreter-inl.h @@ -22,7 +22,6 @@ #include "vm/EnvironmentObject-inl.h" #include "vm/Stack-inl.h" #include "vm/String-inl.h" -#include "vm/UnboxedObject-inl.h" namespace js { @@ -337,14 +336,10 @@ InitGlobalLexicalOperation(JSContext* cx, LexicalEnvironmentObject* lexicalEnvAr inline bool InitPropertyOperation(JSContext* cx, JSOp op, HandleObject obj, HandleId id, HandleValue rhs) { - if (obj->is<PlainObject>() || obj->is<JSFunction>()) { - unsigned propAttrs = GetInitDataPropAttrs(op); - return NativeDefineProperty(cx, obj.as<NativeObject>(), id, rhs, nullptr, nullptr, - propAttrs); - } - - MOZ_ASSERT(obj->as<UnboxedPlainObject>().layout().lookup(id)); - return PutProperty(cx, obj, id, rhs, false); + MOZ_ASSERT(obj->is<PlainObject>() || obj->is<JSFunction>()); + unsigned propAttrs = GetInitDataPropAttrs(op); + return NativeDefineProperty(cx, obj.as<NativeObject>(), id, rhs, + nullptr, nullptr, propAttrs); } inline bool |