From 818a4ba088359f9e13d84456f79a5eae55ba234c Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Sun, 23 Feb 2014 17:59:18 -0800 Subject: [PATCH] Bug 977445 - Remove unused JSContext parameter from BooleanToStringBuffer() and friends. r=luke --- js/src/jsarray.cpp | 13 ++++--------- js/src/jsbool.cpp | 4 ++-- js/src/jsbool.h | 2 +- js/src/jsboolinlines.h | 6 +++--- js/src/json.cpp | 2 +- js/src/vm/StringBuffer.cpp | 2 +- js/src/vm/StringBuffer.h | 2 +- 7 files changed, 13 insertions(+), 18 deletions(-) diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp index d6fe8676c2e..529c388c5e1 100644 --- a/js/src/jsarray.cpp +++ b/js/src/jsarray.cpp @@ -998,7 +998,7 @@ ArrayJoinKernel(JSContext *cx, SeparatorOp sepOp, HandleObject obj, uint32_t len if (!NumberValueToStringBuffer(cx, elem, sb)) return false; } else if (elem.isBoolean()) { - if (!BooleanToStringBuffer(cx, elem.toBoolean(), sb)) + if (!BooleanToStringBuffer(elem.toBoolean(), sb)) return false; } else if (elem.isObject()) { /* @@ -1431,7 +1431,7 @@ NumDigitsBase10(uint32_t n) } static inline bool -CompareLexicographicInt32(JSContext *cx, const Value &a, const Value &b, bool *lessOrEqualp) +CompareLexicographicInt32(const Value &a, const Value &b, bool *lessOrEqualp) { int32_t aint = a.toInt32(); int32_t bint = b.toInt32(); @@ -1504,13 +1504,8 @@ struct SortComparatorStrings struct SortComparatorLexicographicInt32 { - JSContext *const cx; - - SortComparatorLexicographicInt32(JSContext *cx) - : cx(cx) {} - bool operator()(const Value &a, const Value &b, bool *lessOrEqualp) { - return CompareLexicographicInt32(cx, a, b, lessOrEqualp); + return CompareLexicographicInt32(a, b, lessOrEqualp); } }; @@ -1940,7 +1935,7 @@ js::array_sort(JSContext *cx, unsigned argc, Value *vp) } else if (allInts) { JS_ALWAYS_TRUE(vec.resize(n * 2)); if (!MergeSort(vec.begin(), n, vec.begin() + n, - SortComparatorLexicographicInt32(cx))) { + SortComparatorLexicographicInt32())) { return false; } } else { diff --git a/js/src/jsbool.cpp b/js/src/jsbool.cpp index 9a51674c851..bddb2e38995 100644 --- a/js/src/jsbool.cpp +++ b/js/src/jsbool.cpp @@ -53,7 +53,7 @@ bool_toSource_impl(JSContext *cx, CallArgs args) bool b = thisv.isBoolean() ? thisv.toBoolean() : thisv.toObject().as().unbox(); StringBuffer sb(cx); - if (!sb.append("(new Boolean(") || !BooleanToStringBuffer(cx, b, sb) || !sb.append("))")) + if (!sb.append("(new Boolean(") || !BooleanToStringBuffer(b, sb) || !sb.append("))")) return false; JSString *str = sb.finishString(); @@ -196,7 +196,7 @@ js::ToBooleanSlow(HandleValue v) * The only caller of the fast path, JSON's PreprocessValue, ensures that. */ bool -js::BooleanGetPrimitiveValueSlow(HandleObject wrappedBool, JSContext *cx) +js::BooleanGetPrimitiveValueSlow(HandleObject wrappedBool) { JSObject *obj = wrappedBool->as().target(); JS_ASSERT(obj); diff --git a/js/src/jsbool.h b/js/src/jsbool.h index e7525cf4a00..30703e83e6d 100644 --- a/js/src/jsbool.h +++ b/js/src/jsbool.h @@ -22,7 +22,7 @@ js_BooleanToString(js::ExclusiveContext *cx, bool b); namespace js { inline bool -BooleanGetPrimitiveValue(HandleObject obj, JSContext *cx); +BooleanGetPrimitiveValue(HandleObject obj); } /* namespace js */ diff --git a/js/src/jsboolinlines.h b/js/src/jsboolinlines.h index a56be0abd13..853b96536d5 100644 --- a/js/src/jsboolinlines.h +++ b/js/src/jsboolinlines.h @@ -15,15 +15,15 @@ namespace js { bool -BooleanGetPrimitiveValueSlow(HandleObject, JSContext *); +BooleanGetPrimitiveValueSlow(HandleObject); inline bool -BooleanGetPrimitiveValue(HandleObject obj, JSContext *cx) +BooleanGetPrimitiveValue(HandleObject obj) { if (obj->is()) return obj->as().unbox(); - return BooleanGetPrimitiveValueSlow(obj, cx); + return BooleanGetPrimitiveValueSlow(obj); } inline bool diff --git a/js/src/json.cpp b/js/src/json.cpp index bd10be381b7..98ea4157c4e 100644 --- a/js/src/json.cpp +++ b/js/src/json.cpp @@ -250,7 +250,7 @@ PreprocessValue(JSContext *cx, HandleObject holder, KeyType key, MutableHandleVa return false; vp.set(StringValue(str)); } else if (ObjectClassIs(obj, ESClass_Boolean, cx)) { - vp.setBoolean(BooleanGetPrimitiveValue(obj, cx)); + vp.setBoolean(BooleanGetPrimitiveValue(obj)); } } diff --git a/js/src/vm/StringBuffer.cpp b/js/src/vm/StringBuffer.cpp index 5978c410ff0..ed27cc08115 100644 --- a/js/src/vm/StringBuffer.cpp +++ b/js/src/vm/StringBuffer.cpp @@ -92,7 +92,7 @@ js::ValueToStringBufferSlow(JSContext *cx, const Value &arg, StringBuffer &sb) if (v.isNumber()) return NumberValueToStringBuffer(cx, v, sb); if (v.isBoolean()) - return BooleanToStringBuffer(cx, v.toBoolean(), sb); + return BooleanToStringBuffer(v.toBoolean(), sb); if (v.isNull()) return sb.append(cx->names().null); JS_ASSERT(v.isUndefined()); diff --git a/js/src/vm/StringBuffer.h b/js/src/vm/StringBuffer.h index ad9c8b7bf98..7ed5f86725c 100644 --- a/js/src/vm/StringBuffer.h +++ b/js/src/vm/StringBuffer.h @@ -141,7 +141,7 @@ ValueToStringBuffer(JSContext *cx, const Value &v, StringBuffer &sb) /* ES5 9.8 ToString for booleans, appending the result to the string buffer. */ inline bool -BooleanToStringBuffer(JSContext *cx, bool b, StringBuffer &sb) +BooleanToStringBuffer(bool b, StringBuffer &sb) { return b ? sb.append("true") : sb.append("false"); }