diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java index b3585dc038b..5d001275b54 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java @@ -65,6 +65,6 @@ public final class JsArrayAccess extends JsExpressionImpl { JsExpression arrayCopy = AstUtil.deepCopy(arrayExpression); JsExpression indexCopy = AstUtil.deepCopy(indexExpression); - return new JsArrayAccess(arrayCopy, indexCopy); + return new JsArrayAccess(arrayCopy, indexCopy).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java index 5e3e4cfaa6b..9ac54a51333 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java @@ -49,6 +49,6 @@ public final class JsArrayLiteral extends JsLiteral { @NotNull @Override public JsArrayLiteral deepCopy() { - return new JsArrayLiteral(AstUtil.deepCopy(expressions)); + return new JsArrayLiteral(AstUtil.deepCopy(expressions)).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java index 959e6022882..3c3c3fae0a4 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java @@ -75,6 +75,6 @@ public final class JsBinaryOperation extends JsExpressionImpl { @NotNull @Override public JsExpression deepCopy() { - return new JsBinaryOperation(op, AstUtil.deepCopy(arg1), AstUtil.deepCopy(arg2)); + return new JsBinaryOperation(op, AstUtil.deepCopy(arg1), AstUtil.deepCopy(arg2)).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java index e5463b360b7..fac9f4fdf54 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java @@ -68,6 +68,6 @@ public class JsBlock extends SourceInfoAwareJsNode implements JsStatement { @NotNull @Override public JsBlock deepCopy() { - return new JsBlock(AstUtil.deepCopy(statements)); + return new JsBlock(AstUtil.deepCopy(statements)).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java index ab311418aa8..a2cb25a28a6 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java @@ -38,6 +38,6 @@ public final class JsBreak extends JsContinue { @NotNull @Override public JsBreak deepCopy() { - return new JsBreak(AstUtil.deepCopy(label)); + return new JsBreak(AstUtil.deepCopy(label)).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java index 03daaec4e3a..05ec9a167b7 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java @@ -52,6 +52,6 @@ public final class JsCase extends JsSwitchMember { caseCopy.caseExpression = AstUtil.deepCopy(caseExpression); caseCopy.statements.addAll(AstUtil.deepCopy(statements)); - return caseCopy; + return caseCopy.withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java index ba5e1bdbacc..4cd48e11a02 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java @@ -84,7 +84,7 @@ public class JsCatch extends SourceInfoAwareJsNode implements HasCondition { JsExpression conditionCopy = AstUtil.deepCopy(condition); JsParameter paramCopy = AstUtil.deepCopy(param); - return new JsCatch(scopeCopy, bodyCopy, conditionCopy, paramCopy); + return new JsCatch(scopeCopy, bodyCopy, conditionCopy, paramCopy).withMetadataFrom(this); } private JsCatch(JsCatchScope scope, JsBlock body, JsExpression condition, JsParameter param) { diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java index 3f412125caa..b99b099181e 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java @@ -74,6 +74,6 @@ public final class JsConditional extends JsExpressionImpl { JsExpression thenCopy = AstUtil.deepCopy(thenExpression); JsExpression elseCopy = AstUtil.deepCopy(elseExpression); - return new JsConditional(testCopy, thenCopy, elseCopy); + return new JsConditional(testCopy, thenCopy, elseCopy).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java index 32bf5ee934a..d56d77a3a81 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java @@ -52,6 +52,6 @@ public class JsContinue extends SourceInfoAwareJsNode implements JsStatement { public JsContinue deepCopy() { if (label == null) return new JsContinue(); - return new JsContinue(AstUtil.deepCopy(label)); + return new JsContinue(AstUtil.deepCopy(label)).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java index 1cf13da1d6f..75e169be591 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java @@ -29,6 +29,6 @@ public final class JsDefault extends JsSwitchMember { public JsDefault deepCopy() { JsDefault defaultCopy = new JsDefault(); defaultCopy.statements.addAll(AstUtil.deepCopy(statements)); - return defaultCopy; + return defaultCopy.withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java index 24d31bf7bfe..8277bf27eb3 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java @@ -38,6 +38,6 @@ public class JsDoWhile extends JsWhile { JsExpression conditionCopy = AstUtil.deepCopy(condition); JsStatement bodyCopy = AstUtil.deepCopy(body); - return new JsDoWhile(conditionCopy, bodyCopy); + return new JsDoWhile(conditionCopy, bodyCopy).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java index 9b895a27108..55cd155f41b 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java @@ -36,6 +36,6 @@ public class JsDocComment extends JsExpressionImpl { @NotNull @Override public JsDocComment deepCopy() { - return new JsDocComment(tags); + return new JsDocComment(tags).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java index 0d5bbdebb44..74d78768e2b 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java @@ -55,6 +55,6 @@ public final class JsExpressionStatement extends AbstractNode implements JsState @NotNull @Override public JsExpressionStatement deepCopy() { - return new JsExpressionStatement(expression.deepCopy()); + return new JsExpressionStatement(expression.deepCopy()).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java index 638917e933d..f526fd4e5fb 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java @@ -129,16 +129,13 @@ public class JsFor extends SourceInfoAwareJsNode implements JsStatement { JsExpression conditionCopy = AstUtil.deepCopy(condition); JsExpression incrementalExprCopy = AstUtil.deepCopy(incrementExpression); + JsFor result; if (initVars != null) { - return new JsFor(initVars.deepCopy(), - conditionCopy, - incrementalExprCopy, - bodyCopy); + result = new JsFor(initVars.deepCopy(), conditionCopy, incrementalExprCopy, bodyCopy); } else { - return new JsFor(initExpression.deepCopy(), - conditionCopy, - incrementExpression, - bodyCopy); + result = new JsFor(initExpression.deepCopy(), conditionCopy, incrementExpression, bodyCopy); } + + return result.withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java index 2f50cb1da1a..982fda96be0 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java @@ -92,6 +92,6 @@ public class JsForIn extends SourceInfoAwareJsNode implements JsStatement { JsExpression iterCopy = AstUtil.deepCopy(iterExpression); JsExpression objectCopy = AstUtil.deepCopy(objectExpression); - return new JsForIn(iterVarName, iterCopy, objectCopy, bodyCopy); + return new JsForIn(iterVarName, iterCopy, objectCopy, bodyCopy).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java index abf010aba31..525d93236ec 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java @@ -108,6 +108,6 @@ public final class JsFunction extends JsLiteral implements HasName { functionCopy.params = AstUtil.deepCopy(params); functionCopy.isLocal = isLocal; - return functionCopy; + return functionCopy.withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java index 0a408c28758..9c9fc0dfd25 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java @@ -28,6 +28,6 @@ public class JsGlobalBlock extends JsBlock { JsGlobalBlock globalBlockCopy = new JsGlobalBlock(); List statementscopy = AstUtil.deepCopy(getStatements()); globalBlockCopy.getStatements().addAll(statementscopy); - return globalBlockCopy; + return globalBlockCopy.withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java index 1c0431c560b..fe3ece611af 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java @@ -86,6 +86,6 @@ public final class JsIf extends SourceInfoAwareJsNode implements JsStatement { JsStatement thenCopy = AstUtil.deepCopy(thenStatement); JsStatement elseCopy = AstUtil.deepCopy(elseStatement); - return new JsIf(ifCopy, thenCopy, elseCopy); + return new JsIf(ifCopy, thenCopy, elseCopy).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java index cd581c79593..75878323221 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java @@ -87,6 +87,6 @@ public final class JsInvocation extends JsExpressionImpl.JsExpressionHasArgument List argumentsCopy = AstUtil.deepCopy(arguments); JsInvocation copy = new JsInvocation(qualifierCopy, argumentsCopy); copy.setInlineStrategy(inlineStrategy); - return copy; + return copy.withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java index 7af18b648f2..7241fbe24ac 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java @@ -64,6 +64,6 @@ public class JsLabel extends SourceInfoAwareJsNode implements JsStatement, HasNa @NotNull @Override public JsLabel deepCopy() { - return new JsLabel(label, AstUtil.deepCopy(statement.deepCopy())); + return new JsLabel(label, AstUtil.deepCopy(statement.deepCopy())).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java index e07414cccbe..c2a90cf899c 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java @@ -99,6 +99,6 @@ public final class JsNameRef extends JsExpressionImpl implements HasName { if (name != null) return new JsNameRef(name, qualifierCopy); - return new JsNameRef(ident, qualifierCopy); + return new JsNameRef(ident, qualifierCopy).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java index 2722a451281..f4c19786b5f 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java @@ -51,6 +51,6 @@ public final class JsNew extends JsExpressionImpl.JsExpressionHasArguments { public JsNew deepCopy() { JsExpression constructorCopy = AstUtil.deepCopy(constructorExpression); List argumentsCopy = AstUtil.deepCopy(arguments); - return new JsNew(constructorCopy, argumentsCopy); + return new JsNew(constructorCopy, argumentsCopy).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java index 8efda04a24a..dea6c586e56 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java @@ -61,6 +61,6 @@ public final class JsObjectLiteral extends JsLiteral { @NotNull @Override public JsObjectLiteral deepCopy() { - return new JsObjectLiteral(AstUtil.deepCopy(properties), multiline); + return new JsObjectLiteral(AstUtil.deepCopy(properties), multiline).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java index 0b7859b82f3..300ffd456fc 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java @@ -55,6 +55,6 @@ public final class JsParameter extends SourceInfoAwareJsNode implements HasName public JsParameter deepCopy() { JsParameter parameter = new JsParameter(name); parameter.setHasDefaultValue(hasDefaultValue); - return parameter; + return parameter.withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java index 39bdc3d7f66..b7d866b971b 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java @@ -32,6 +32,6 @@ public final class JsPostfixOperation extends JsUnaryOperation { @NotNull @Override public JsPostfixOperation deepCopy() { - return new JsPostfixOperation(getOperator(), AstUtil.deepCopy(getArg())); + return new JsPostfixOperation(getOperator(), AstUtil.deepCopy(getArg())).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java index 0cce595ff4b..1378c756e6a 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java @@ -32,6 +32,6 @@ public final class JsPrefixOperation extends JsUnaryOperation { @NotNull @Override public JsPrefixOperation deepCopy() { - return new JsPrefixOperation(getOperator(), AstUtil.deepCopy(getArg())); + return new JsPrefixOperation(getOperator(), AstUtil.deepCopy(getArg())).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java index 869d5d9d039..a33f1a035e2 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java @@ -57,6 +57,6 @@ public class JsPropertyInitializer extends SourceInfoAwareJsNode { @NotNull @Override public JsPropertyInitializer deepCopy() { - return new JsPropertyInitializer(labelExpr.deepCopy(), valueExpr.deepCopy()); + return new JsPropertyInitializer(labelExpr.deepCopy(), valueExpr.deepCopy()).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java index d18fda77e80..8b459b0b906 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java @@ -53,6 +53,6 @@ public final class JsReturn extends SourceInfoAwareJsNode implements JsStatement @NotNull @Override public JsReturn deepCopy() { - return new JsReturn(AstUtil.deepCopy(expression)); + return new JsReturn(AstUtil.deepCopy(expression)).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java index e8b9562412b..4d27322bc02 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java @@ -66,6 +66,6 @@ public class JsSwitch extends SourceInfoAwareJsNode implements JsStatement { JsExpression expressionCopy = AstUtil.deepCopy(expression); List casesCopy = AstUtil.deepCopy(cases); - return new JsSwitch(expressionCopy, casesCopy); + return new JsSwitch(expressionCopy, casesCopy).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java index da780d9622c..cbd92101636 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java @@ -46,6 +46,6 @@ public class JsThrow extends SourceInfoAwareJsNode implements JsStatement { @NotNull @Override public JsThrow deepCopy() { - return new JsThrow(AstUtil.deepCopy(expression)); + return new JsThrow(AstUtil.deepCopy(expression)).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java index 6416d8cf251..7c9610304fa 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java @@ -82,6 +82,6 @@ public class JsTry extends SourceInfoAwareJsNode implements JsStatement { List catchCopy = AstUtil.deepCopy(catches); JsBlock finallyCopy = AstUtil.deepCopy(finallyBlock); - return new JsTry(tryCopy, catchCopy, finallyCopy); + return new JsTry(tryCopy, catchCopy, finallyCopy).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java index 96a1996ad07..18e3a1fc2ee 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java @@ -106,7 +106,7 @@ public class JsVars extends SourceInfoAwareJsNode implements JsStatement, Iterab public JsVar deepCopy() { if (initExpression == null) return new JsVar(name); - return new JsVar(name, initExpression.deepCopy()); + return new JsVar(name, initExpression.deepCopy()).withMetadataFrom(this); } } @@ -162,6 +162,6 @@ public class JsVars extends SourceInfoAwareJsNode implements JsStatement, Iterab @NotNull @Override public JsVars deepCopy() { - return new JsVars(AstUtil.deepCopy(vars), multiline); + return new JsVars(AstUtil.deepCopy(vars), multiline).withMetadataFrom(this); } } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java index 3755e77f254..ccc50a50922 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java @@ -64,6 +64,6 @@ public class JsWhile extends SourceInfoAwareJsNode implements JsStatement { JsExpression conditionCopy = AstUtil.deepCopy(condition); JsStatement bodyCopy = AstUtil.deepCopy(body); - return new JsWhile(conditionCopy, bodyCopy); + return new JsWhile(conditionCopy, bodyCopy).withMetadataFrom(this); } -} \ No newline at end of file +}