Merge.
Merge.
--- a/xpcom/analysis/stack.js
+++ b/xpcom/analysis/stack.js
@@ -147,18 +147,21 @@ function process_cp_pre_genericize(fndec
if (name == "operator new" || name == "operator new []") {
let fncallobj = dehydra_convert(TREE_TYPE(fncall));
if (fncallobj.parameters.length == 2 &&
isVoidPtr(fncallobj.parameters[1]))
return;
let i;
for (i in xrange(stack.length - 1, -1, -1)) {
- if (TREE_CODE(stack[i]) != NOP_EXPR)
- break;
+ if (TREE_CODE(stack[i]) == NOP_EXPR ||
+ TREE_CODE(stack[i]) == COMPOUND_EXPR)
+ continue;
+
+ break;
}
let assign = stack[i];
switch (TREE_CODE(assign)) {
case VAR_DECL:
break;
case INIT_EXPR:
case MODIFY_EXPR: