Reapply "Distinguish between actual closure scopes and non-closure scopes."

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..4b8f5b1a7d8eede7497852a679ea2c93a3297c84 100644
--- a/pkg/compiler/lib/src/ssa/builder_kernel.dart
+++ b/pkg/compiler/lib/src/ssa/builder_kernel.dart
@@ -605,9 +605,8 @@ 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));
     inlinedFrom(element, () {