зеркало из https://github.com/mozilla/gecko-dev.git
Backout bug 658351 due to build bustage and perma-orange.
This commit is contained in:
Родитель
cf90fbd908
Коммит
960340c1f5
|
@ -461,10 +461,6 @@ JSVAL_TO_BOOLEAN_IMPL(jsval_layout l)
|
||||||
static JS_ALWAYS_INLINE jsval_layout
|
static JS_ALWAYS_INLINE jsval_layout
|
||||||
BOOLEAN_TO_JSVAL_IMPL(JSBool b)
|
BOOLEAN_TO_JSVAL_IMPL(JSBool b)
|
||||||
{
|
{
|
||||||
// This assertion exists to catch JSAPI users who accidentally create bogo-booleans thanks to
|
|
||||||
// the fact that JSBool is, in reality, an integer. These users must convert to JS_TRUE or
|
|
||||||
// JS_FALSE before packing the boolean into a jsval.
|
|
||||||
JS_ASSERT(b == JS_TRUE || b == JS_FALSE);
|
|
||||||
jsval_layout l;
|
jsval_layout l;
|
||||||
l.s.tag = JSVAL_TAG_BOOLEAN;
|
l.s.tag = JSVAL_TAG_BOOLEAN;
|
||||||
l.s.payload.boo = b;
|
l.s.payload.boo = b;
|
||||||
|
@ -657,10 +653,6 @@ JSVAL_TO_BOOLEAN_IMPL(jsval_layout l)
|
||||||
static JS_ALWAYS_INLINE jsval_layout
|
static JS_ALWAYS_INLINE jsval_layout
|
||||||
BOOLEAN_TO_JSVAL_IMPL(JSBool b)
|
BOOLEAN_TO_JSVAL_IMPL(JSBool b)
|
||||||
{
|
{
|
||||||
// This assertion exists to catch JSAPI users who accidentally create bogo-booleans thanks to
|
|
||||||
// the fact that JSBool is, in reality, an integer. These users must convert to JS_TRUE or
|
|
||||||
// JS_FALSE before packing the boolean into a jsval.
|
|
||||||
JS_ASSERT(b == JS_TRUE || b == JS_FALSE);
|
|
||||||
jsval_layout l;
|
jsval_layout l;
|
||||||
l.asBits = ((uint64)(uint32)b) | JSVAL_SHIFTED_TAG_BOOLEAN;
|
l.asBits = ((uint64)(uint32)b) | JSVAL_SHIFTED_TAG_BOOLEAN;
|
||||||
return l;
|
return l;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче