diff options
| author | win7-7 <win7-7@users.noreply.github.com> | 2019-06-30 12:38:18 +0300 |
|---|---|---|
| committer | win7-7 <win7-7@users.noreply.github.com> | 2019-06-30 12:38:18 +0300 |
| commit | 3051056bbb0b41b8258d91e44a4ff8ec33a98d8f (patch) | |
| tree | 435214f56383925b337cc350452485717c4ea0d1 /js/src/jsobj.cpp | |
| parent | 00812e30dfa70f9b1a752cf0d09de00f6d401c85 (diff) | |
| parent | 98f7e3b16754aedd44747261113359b8d824449f (diff) | |
| download | UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar.gz UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar.lz UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar.xz UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.zip | |
Merge branch 'master' into FrameProperties
Diffstat (limited to 'js/src/jsobj.cpp')
| -rw-r--r-- | js/src/jsobj.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp index deaa1d53e..2364f707e 100644 --- a/js/src/jsobj.cpp +++ b/js/src/jsobj.cpp @@ -43,6 +43,7 @@ #include "frontend/BytecodeCompiler.h" #include "gc/Marking.h" #include "gc/Policy.h" +#include "gc/StoreBuffer-inl.h" #include "jit/BaselineJIT.h" #include "js/MemoryMetrics.h" #include "js/Proxy.h" @@ -54,7 +55,6 @@ #include "vm/RegExpStaticsObject.h" #include "vm/Shape.h" #include "vm/TypedArrayCommon.h" -#include "vm/UnboxedObject-inl.h" #include "jsatominlines.h" #include "jsboolinlines.h" |