diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 22:42:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 22:42:31 +0200 |
| commit | 3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d (patch) | |
| tree | 2ef4b78c728a2e1a323babc75205b19911a5ffc0 /js/src/vm/Runtime.cpp | |
| parent | 175efcbab02bbfea84e565cdea9ee96d6436a08f (diff) | |
| parent | 2860601772b392f3f6d2977269f11061f4e970ee (diff) | |
| download | UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.gz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.lz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.xz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.zip | |
Merge branch 'intl-ICU-emoji-work'
Diffstat (limited to 'js/src/vm/Runtime.cpp')
| -rw-r--r-- | js/src/vm/Runtime.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp index 0d6a3922c..174e23594 100644 --- a/js/src/vm/Runtime.cpp +++ b/js/src/vm/Runtime.cpp @@ -213,11 +213,6 @@ JSRuntime::JSRuntime(JSRuntime* parentRuntime) warningReporter(nullptr), buildIdOp(nullptr), propertyRemovals(0), -#if !EXPOSE_INTL_API - thousandsSeparator(0), - decimalSeparator(0), - numGrouping(0), -#endif keepAtoms_(0), trustedPrincipals_(nullptr), beingDestroyed_(false), @@ -330,8 +325,7 @@ JSRuntime::init(uint32_t maxbytes, uint32_t maxNurseryBytes) /* The garbage collector depends on everything before this point being initialized. */ gcInitialized = true; - if (!InitRuntimeNumberState(this)) - return false; + InitRuntimeNumberState(this); JS::ResetTimeZone(); @@ -425,10 +419,6 @@ JSRuntime::destroyRuntime() */ FreeScriptData(this, lock); -#if !EXPOSE_INTL_API - FinishRuntimeNumberState(this); -#endif - gc.finish(); atomsCompartment_ = nullptr; |