diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 18:10:02 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 18:10:03 +0200 |
commit | ee21e513f3ed68af68e529b43c8fda94dfcc49ff (patch) | |
tree | 37eff93fb4b1d5de70c99ec290c3a193bf44f9ca /Source/JavaScriptCore/runtime/NumericStrings.h | |
parent | 880257678ae831d9b79937e8d8533a88a8f8325d (diff) | |
parent | ea46a149dc42a48c103833742a7a0d575576c14a (diff) | |
download | qtwebkit-ee21e513f3ed68af68e529b43c8fda94dfcc49ff.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ie2225337cb5eef39035146827484496a6b3690b3
Diffstat (limited to 'Source/JavaScriptCore/runtime/NumericStrings.h')
-rw-r--r-- | Source/JavaScriptCore/runtime/NumericStrings.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/runtime/NumericStrings.h b/Source/JavaScriptCore/runtime/NumericStrings.h index 4cd92fc1f..68bfbd06a 100644 --- a/Source/JavaScriptCore/runtime/NumericStrings.h +++ b/Source/JavaScriptCore/runtime/NumericStrings.h @@ -37,7 +37,7 @@ namespace JSC { ALWAYS_INLINE String add(double d) { CacheEntry<double>& entry = lookup(d); - if (d == entry.key && !entry.value.isNull()) + if (!entry.value.isNull() && d == entry.key) return entry.value; entry.key = d; entry.value = String::numberToStringECMAScript(d); @@ -49,7 +49,7 @@ namespace JSC { if (static_cast<unsigned>(i) < cacheSize) return lookupSmallString(static_cast<unsigned>(i)); CacheEntry<int>& entry = lookup(i); - if (i == entry.key && !entry.value.isNull()) + if (!entry.value.isNull() && i == entry.key) return entry.value; entry.key = i; entry.value = String::number(i); @@ -61,7 +61,7 @@ namespace JSC { if (i < cacheSize) return lookupSmallString(static_cast<unsigned>(i)); CacheEntry<unsigned>& entry = lookup(i); - if (i == entry.key && !entry.value.isNull()) + if (!entry.value.isNull() && i == entry.key) return entry.value; entry.key = i; entry.value = String::number(i); |