Renamed some scoping classes to make their usage clearer.

pkg/compiler/lib/src/ssa/builder_kernel.dart

Index: pkg/compiler/lib/src/ssa/builder_kernel.dart
diff --git a/pkg/compiler/lib/src/ssa/builder_kernel.dart b/pkg/compiler/lib/src/ssa/builder_kernel.dart
index 4b8f5b1a7d8eede7497852a679ea2c93a3297c84..597d6fa9a55ef78c336b36dad2bf14199f7a9a31 100644
--- a/pkg/compiler/lib/src/ssa/builder_kernel.dart
+++ b/pkg/compiler/lib/src/ssa/builder_kernel.dart
@@ -345,8 +345,8 @@ class KernelSsaGraphBuilder extends ir.Visitor
 
       // If there are locals that escape (i.e. mutated in closures), we pass the
       // box to the constructor.
-      ClosureScope scopeData =
-          closureDataLookup.getClosureScope(constructorElement);
+      CapturedScope scopeData =
+          closureDataLookup.getCapturedScope(constructorElement);
       if (scopeData.requiresContextBox) {
         bodyCallInputs.add(localsHandler.readLocal(scopeData.context));
       }
@@ -608,7 +608,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
     ScopeInfo oldScopeInfo = localsHandler.scopeInfo;
     ScopeInfo newScopeInfo = closureDataLookup.getScopeInfo(element);
     localsHandler.scopeInfo = newScopeInfo;
-    localsHandler.enterScope(closureDataLookup.getClosureScope(element));
+    localsHandler.enterScope(closureDataLookup.getCapturedScope(element));
     inlinedFrom(element, () {
       _buildInitializers(constructor, constructorChain, fieldValues);
     });
@@ -696,7 +696,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
     localsHandler.startFunction(
         targetElement,
         closureDataLookup.getScopeInfo(targetElement),
-        closureDataLookup.getClosureScope(targetElement),
+        closureDataLookup.getCapturedScope(targetElement),
         parameterMap,
         isGenerativeConstructorBody: targetElement is ConstructorBodyEntity);
     close(new HGoto()).addSuccessor(block);
@@ -893,7 +893,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
     JumpTarget jumpTarget = localsMap.getJumpTargetForFor(forStatement);
     loopHandler.handleLoop(
         forStatement,
-        localsMap.getLoopClosureScope(closureDataLookup, forStatement),
+        localsMap.getCapturedLoopScope(closureDataLookup, forStatement),
         jumpTarget,
         buildInitializer,
         buildCondition,
@@ -1022,7 +1022,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
 
     loopHandler.handleLoop(
         forInStatement,
-        localsMap.getLoopClosureScope(closureDataLookup, forInStatement),
+        localsMap.getCapturedLoopScope(closureDataLookup, forInStatement),
         localsMap.getJumpTargetForForIn(forInStatement),
         buildInitializer,
         buildCondition,
@@ -1073,7 +1073,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
 
     loopHandler.handleLoop(
         forInStatement,
-        localsMap.getLoopClosureScope(closureDataLookup, forInStatement),
+        localsMap.getCapturedLoopScope(closureDataLookup, forInStatement),
         localsMap.getJumpTargetForForIn(forInStatement),
         buildInitializer,
         buildCondition,
@@ -1120,7 +1120,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
     // Build fake try body:
     loopHandler.handleLoop(
         forInStatement,
-        localsMap.getLoopClosureScope(closureDataLookup, forInStatement),
+        localsMap.getCapturedLoopScope(closureDataLookup, forInStatement),
         localsMap.getJumpTargetForForIn(forInStatement),
         buildInitializer,
         buildCondition,
@@ -1171,7 +1171,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
 
     loopHandler.handleLoop(
         whileStatement,
-        localsMap.getLoopClosureScope(closureDataLookup, whileStatement),
+        localsMap.getCapturedLoopScope(closureDataLookup, whileStatement),
         localsMap.getJumpTargetForWhile(whileStatement),
         () {},
         buildCondition,
@@ -1185,8 +1185,8 @@ class KernelSsaGraphBuilder extends ir.Visitor
     // TODO(efortuna): I think this can be rewritten using
     // LoopHandler.handleLoop with some tricks about when the "update" happens.
     LocalsHandler savedLocals = new LocalsHandler.from(localsHandler);
-    LoopClosureScope loopClosureInfo =
-        localsMap.getLoopClosureScope(closureDataLookup, doStatement);
+    CapturedLoopScope loopClosureInfo =
+        localsMap.getCapturedLoopScope(closureDataLookup, doStatement);
     localsHandler.startLoop(loopClosureInfo);
     JumpTarget target = localsMap.getJumpTargetForDo(doStatement);
     JumpHandler jumpHandler = loopHandler.beginLoopHeader(doStatement, target);
@@ -1724,7 +1724,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
     void buildLoop() {
       loopHandler.handleLoop(
           switchStatement,
-          localsMap.getLoopClosureScope(closureDataLookup, switchStatement),
+          localsMap.getCapturedLoopScope(closureDataLookup, switchStatement),
           switchTarget,
           () {},
           buildCondition,