Merge branch 'es2015-cleanup' into es6-new-target

Author: rbuckton

src/compiler/factory.ts

@@ -1754,17 +1754,21 @@ namespace ts {
 
     // Utilities
 
-    export function restoreEnclosingLabels(node: Statement, enclosingLabeledStatements: LabeledStatement[]) {
-        if (enclosingLabeledStatements) {
-            for (const labeledStatement of enclosingLabeledStatements) {
-                node = updateLabel(
-                    labeledStatement,
-                    labeledStatement.label,
-                    node
-                );
-            }
+    export function restoreEnclosingLabel(node: Statement, outermostLabeledStatement: LabeledStatement, afterRestoreLabelCallback?: (node: LabeledStatement) => void): Statement {
+        if (!outermostLabeledStatement) {
+            return node;
         }
-        return node;
+        const updated = updateLabel(
+            outermostLabeledStatement,
+            outermostLabeledStatement.label,
+            outermostLabeledStatement.statement.kind === SyntaxKind.LabeledStatement
+                ? restoreEnclosingLabel(node, <LabeledStatement>outermostLabeledStatement.statement)
+                : node
+        );
+        if (afterRestoreLabelCallback) {
+            afterRestoreLabelCallback(outermostLabeledStatement);
+        }
+        return updated;
     }
 
     export interface CallBinding {