[cfe] Fix handling of private names in expression evaluation.

Issue: dartbug.com/35505

Change-Id: Ia1d211247852ef116139f8b509c21410fc8629d8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108606
Commit-Queue: Samir Jindel <[email protected]>
Reviewed-by: Jens Johansen <[email protected]>

Author: sjindel-google

pkg/front_end/lib/src/fasta/incremental_compiler.dart

@@ -743,11 +743,13 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
       }
 
       KernelLibraryBuilder debugLibrary = new KernelLibraryBuilder(
-          libraryUri,
-          debugExprUri,
-          userCode.loader,
-          null,
-          library.scope.createNestedScope("expression"));
+        libraryUri,
+        debugExprUri,
+        userCode.loader,
+        null,
+        scope: library.scope.createNestedScope("expression"),
+        nameOrigin: library.target,
+      );
 
       if (library is DillLibraryBuilder) {
         for (LibraryDependency dependency in library.target.dependencies) {

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

@@ -496,14 +496,14 @@ abstract class BodyBuilder extends ScopeListener<JumpTarget>
         expression = new UnresolvedNameGenerator(
             this,
             deprecated_extractToken(identifier),
-            new Name(identifier.name, library.library));
+            new Name(identifier.name, library.nameOrigin));
       }
       if (name?.isNotEmpty ?? false) {
         Token period = periodBeforeName ?? beginToken.next.next;
         Generator generator = expression;
         expression = generator.buildPropertyAccess(
             new IncompletePropertyAccessGenerator(
-                this, period.next, new Name(name, library.library)),
+                this, period.next, new Name(name, library.nameOrigin)),
             period.next.offset,
             false);
       }
@@ -1297,7 +1297,7 @@ abstract class BodyBuilder extends ScopeListener<JumpTarget>
       assert(typeArguments == null);
     }
     if (receiver is Identifier) {
-      Name name = new Name(receiver.name, library.library);
+      Name name = new Name(receiver.name, library.nameOrigin);
       if (arguments == null) {
         push(new IncompletePropertyAccessGenerator(this, beginToken, name));
       } else {
@@ -1495,7 +1495,7 @@ abstract class BodyBuilder extends ScopeListener<JumpTarget>
     if (periodIndex != -1) {
       length -= periodIndex + 1;
     }
-    Name kernelName = new Name(name, library.library);
+    Name kernelName = new Name(name, library.nameOrigin);
     List<LocatedMessage> context;
     if (candidate != null && candidate.location != null) {
       Uri uri = candidate.location.file;
@@ -1765,7 +1765,7 @@ abstract class BodyBuilder extends ScopeListener<JumpTarget>
     }
     if (declaration == null ||
         (!isInstanceContext && declaration.isInstanceMember)) {
-      Name n = new Name(name, library.library);
+      Name n = new Name(name, library.nameOrigin);
       if (!isQualified && isInstanceContext) {
         assert(declaration == null);
         if (constantContext != ConstantContext.none || member.isField) {
@@ -1817,7 +1817,7 @@ abstract class BodyBuilder extends ScopeListener<JumpTarget>
         addProblem(
             fasta.messageNotAConstantExpression, charOffset, token.length);
       }
-      Name n = new Name(name, library.library);
+      Name n = new Name(name, library.nameOrigin);
       Member getter;
       Member setter;
       if (declaration is AccessErrorBuilder) {

pkg/front_end/lib/src/fasta/kernel/kernel_library_builder.dart

@@ -192,6 +192,12 @@ class KernelLibraryBuilder
   // TODO(dmitryas):  Find a way to mark inferred types.
   final Set<DartType> inferredTypes = new Set<DartType>.identity();
 
+  // A library to use for Names generated when compiling code in this library.
+  // This allows code generated in one library to use the private namespace of
+  // another, for example during expression compilation (debugging).
+  Library get nameOrigin => _nameOrigin ?? library;
+  final Library _nameOrigin;
+
   /// Exports that can't be serialized.
   ///
   /// The key is the name of the exported member.
@@ -208,9 +214,10 @@ class KernelLibraryBuilder
   List<KernelFieldBuilder> implicitlyTypedFields;
 
   KernelLibraryBuilder(Uri uri, Uri fileUri, Loader loader, this.actualOrigin,
-      [Scope scope, Library target])
+      {Scope scope, Library target, Library nameOrigin})
       : library = target ??
             (actualOrigin?.library ?? new Library(uri, fileUri: fileUri)),
+        _nameOrigin = nameOrigin,
         super(loader, fileUri, scope);
 
   @override

pkg/front_end/test/fasta/generator_to_string_test.dart

@@ -104,7 +104,6 @@ main() {
                     new NoneTarget(new TargetFlags(legacyMode: true))),
                 null)
             .loader,
-        null,
         null);
     LoadLibraryBuilder loadLibraryBuilder =
         new LoadLibraryBuilder(libraryBuilder, null, -1);

pkg/front_end/test/fasta/unlinked_scope_test.dart

@@ -53,7 +53,6 @@ class MockLibraryBuilder extends KernelLibraryBuilder {
                         new NoneTarget(new TargetFlags(legacyMode: true))),
                     null)
                 .loader,
-            null,
             null);
 
   KernelProcedureBuilder mockProcedure(String name) {

pkg/front_end/testcases/expression/class_private_get.expression.yaml

@@ -0,0 +1,9 @@
+# Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+entry_point: "main.dart"
+definitions: []
+position: "main.dart#B"
+expression: |
+  _priv

pkg/front_end/testcases/expression/class_private_get.expression.yaml.expect

@@ -0,0 +1,4 @@
+Errors: {
+}
+method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
+  return this.{main::B::_priv};

pkg/front_end/testcases/expression/class_private_method.expression.yaml

@@ -0,0 +1,9 @@
+# Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+entry_point: "main.dart"
+definitions: []
+position: "main.dart#B"
+expression: |
+  _privMethod

pkg/front_end/testcases/expression/class_private_method.expression.yaml.expect

@@ -0,0 +1,4 @@
+Errors: {
+}
+method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
+  return this.{main::B::_privMethod};

pkg/front_end/testcases/expression/class_private_set.expression.yaml

@@ -0,0 +1,9 @@
+# Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+entry_point: "main.dart"
+definitions: []
+position: "main.dart#B"
+expression: |
+  _priv = 3