From 2e3d957de7b0f443dad34c18aeafefd3cf86d363 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Mon, 29 Dec 2014 16:35:04 -0800 Subject: [PATCH] Backed out changeset 9878f361d7f7 (bug 1115246) to see if it fixes linux builds on a CLOSED TREE --- js/src/frontend/BytecodeEmitter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp index 2d8326186848..3985c1dc8f46 100644 --- a/js/src/frontend/BytecodeEmitter.cpp +++ b/js/src/frontend/BytecodeEmitter.cpp @@ -7192,10 +7192,10 @@ frontend::EmitTree(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn) // template object with copy on write elements that can be reused // every time the initializer executes. RootedValue value(cx); - if (bce->emitterMode != BytecodeEmitter::SelfHosting && pn->pn_count != 0) { - if (!pn->getConstantValue(cx, ParseNode::DontAllowNestedObjects, &value)) - return false; - + if (bce->emitterMode != BytecodeEmitter::SelfHosting && + pn->pn_count != 0 && + pn->getConstantValue(cx, ParseNode::DontAllowNestedObjects, &value)) + { // Note: the type of the template object might not yet reflect // that the object has copy on write elements. When the // interpreter or JIT compiler fetches the template, it should