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 abaf5a9526baa3d838a6fa4cbbd38d3bc8a8e1e7..ca2d12c306750ad26f9ae75d9344059c08934aad 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);
+      ScopeInClosure scopeData =
+          closureDataLookup.getScopeInClosure(constructorElement);
       if (scopeData.requiresContextBox) {
         bodyCallInputs.add(localsHandler.readLocal(scopeData.context));
       }
@@ -605,11 +605,10 @@ class KernelSsaGraphBuilder extends ir.Visitor
 
     // Set the locals handler state as if we were inlining the constructor.
     ConstructorEntity element = _elementMap.getConstructor(constructor);
-    ClosureRepresentationInfo oldScopeInfo = localsHandler.scopeInfo;
-    ClosureRepresentationInfo newScopeInfo =
-        closureDataLookup.getScopeInfo(element);
+    ScopeInfo oldScopeInfo = localsHandler.scopeInfo;
+    ScopeInfo newScopeInfo = closureDataLookup.getScopeInfo(element);
     localsHandler.scopeInfo = newScopeInfo;
-    localsHandler.enterScope(closureDataLookup.getClosureScope(element));
+    localsHandler.enterScope(closureDataLookup.getScopeInClosure(element));
     inlinedFrom(element, () {
       _buildInitializers(constructor, constructorChain, fieldValues);
     });
@@ -697,7 +696,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
     localsHandler.startFunction(
         targetElement,
         closureDataLookup.getScopeInfo(targetElement),
-        closureDataLookup.getClosureScope(targetElement),
+        closureDataLookup.getScopeInClosure(targetElement),
         parameterMap,
         isGenerativeConstructorBody: targetElement is ConstructorBodyEntity);
     close(new HGoto()).addSuccessor(block);
@@ -894,7 +893,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
     JumpTarget jumpTarget = localsMap.getJumpTargetForFor(forStatement);
     loopHandler.handleLoop(
         forStatement,
-        localsMap.getLoopClosureScope(closureDataLookup, forStatement),
+        localsMap.getLoopScopeInClosure(closureDataLookup, forStatement),
         jumpTarget,
         buildInitializer,
         buildCondition,
@@ -1023,7 +1022,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
 
     loopHandler.handleLoop(
         forInStatement,
-        localsMap.getLoopClosureScope(closureDataLookup, forInStatement),
+        localsMap.getLoopScopeInClosure(closureDataLookup, forInStatement),
         localsMap.getJumpTargetForForIn(forInStatement),
         buildInitializer,
         buildCondition,
@@ -1074,7 +1073,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
 
     loopHandler.handleLoop(
         forInStatement,
-        localsMap.getLoopClosureScope(closureDataLookup, forInStatement),
+        localsMap.getLoopScopeInClosure(closureDataLookup, forInStatement),
         localsMap.getJumpTargetForForIn(forInStatement),
         buildInitializer,
         buildCondition,
@@ -1121,7 +1120,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
     // Build fake try body:
     loopHandler.handleLoop(
         forInStatement,
-        localsMap.getLoopClosureScope(closureDataLookup, forInStatement),
+        localsMap.getLoopScopeInClosure(closureDataLookup, forInStatement),
         localsMap.getJumpTargetForForIn(forInStatement),
         buildInitializer,
         buildCondition,
@@ -1172,7 +1171,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
 
     loopHandler.handleLoop(
         whileStatement,
-        localsMap.getLoopClosureScope(closureDataLookup, whileStatement),
+        localsMap.getLoopScopeInClosure(closureDataLookup, whileStatement),
         localsMap.getJumpTargetForWhile(whileStatement),
         () {},
         buildCondition,
@@ -1186,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);
+    LoopScopeInClosure loopClosureInfo =
+        localsMap.getLoopScopeInClosure(closureDataLookup, doStatement);
     localsHandler.startLoop(loopClosureInfo);
     JumpTarget target = localsMap.getJumpTargetForDo(doStatement);
     JumpHandler jumpHandler = loopHandler.beginLoopHeader(doStatement, target);
@@ -1725,7 +1724,7 @@ class KernelSsaGraphBuilder extends ir.Visitor
     void buildLoop() {
       loopHandler.handleLoop(
           switchStatement,
-          localsMap.getLoopClosureScope(closureDataLookup, switchStatement),
+          localsMap.getLoopScopeInClosure(closureDataLookup, switchStatement),
           switchTarget,
           () {},
           buildCondition,