Register toString dynamic invocation in the presence of string interpolation.

Register toString dynamic invocation in the presence of string interpolation.

Committed: https://code.google.com/p/dart/source/detail?r=10584

[ahe, 2012-08-13 10:27:06]

LGTM if you add a dart2js test.

Cheers,
Peter

[Anton Muhin, 2012-08-13 13:13:15]

Peter, PTAL

[ahe, 2012-08-13 13:26:55]

https://chromiumcodereview.appspot.com/10824276/diff/3001/lib/compiler/implem...
File lib/compiler/implementation/resolver.dart (right):

https://chromiumcodereview.appspot.com/10824276/diff/3001/lib/compiler/implem...
lib/compiler/implementation/resolver.dart:1447:
world.registerDynamicInvocation(const SourceString('toString'),
Selector.INVOCATION_0);
Long line.

https://chromiumcodereview.appspot.com/10824276/diff/3001/tests/compiler/dart...
File tests/compiler/dart2js/resolver_test.dart (right):

https://chromiumcodereview.appspot.com/10824276/diff/3001/tests/compiler/dart...
tests/compiler/dart2js/resolver_test.dart:731: @"class C { toString() => 'C'; }
main() { '${new C()}'; }");
Why can't this test use compiler.parseScript?

[Anton Muhin, 2012-08-13 13:49:42]

https://chromiumcodereview.appspot.com/10824276/diff/3001/lib/compiler/implem...
File lib/compiler/implementation/resolver.dart (right):

https://chromiumcodereview.appspot.com/10824276/diff/3001/lib/compiler/implem...
lib/compiler/implementation/resolver.dart:1447:
world.registerDynamicInvocation(const SourceString('toString'),
Selector.INVOCATION_0);
On 2012/08/13 13:26:55, ahe wrote:
> Long line.

Done.

https://chromiumcodereview.appspot.com/10824276/diff/3001/tests/compiler/dart...
File tests/compiler/dart2js/resolver_test.dart (right):

https://chromiumcodereview.appspot.com/10824276/diff/3001/tests/compiler/dart...
tests/compiler/dart2js/resolver_test.dart:731: @"class C { toString() => 'C'; }
main() { '${new C()}'; }");
On 2012/08/13 13:26:55, ahe wrote:
> Why can't this test use compiler.parseScript?

Something like this:

testToString() {
  MockCompiler compiler = new MockCompiler();
  compiler.parseScript(
      @"class C { toString() => 'C'; } main() { '${new C()}'; }");
  
  ClassElement classC = compiler.mainApp.find(buildSourceString('C'));
  classC.ensureResolved(compiler);
  Element toStringMethod =     
classC.lookupLocalMember(buildSourceString('toString'));
  Expect.isNotNull(toStringMethod);
  
  final resolvedElements = compiler.enqueuer.resolution.resolvedElements;
  print('---');
  resolvedElements.forEach((k, v) { print('$k: $v'); });
  print('---'); 
       Expect.isTrue(resolvedElements.containsKey(toStringMethod));
}

gives me an empty map.  Am I using the API correctly?

[ahe, 2012-08-13 15:05:56]

https://chromiumcodereview.appspot.com/10824276/diff/3001/tests/compiler/dart...
File tests/compiler/dart2js/resolver_test.dart (right):

https://chromiumcodereview.appspot.com/10824276/diff/3001/tests/compiler/dart...
tests/compiler/dart2js/resolver_test.dart:731: @"class C { toString() => 'C'; }
main() { '${new C()}'; }");
On 2012/08/13 13:49:42, Anton Muhin wrote:
> On 2012/08/13 13:26:55, ahe wrote:
> > Why can't this test use compiler.parseScript?
> 
> Something like this:
> 
> testToString() {
>   MockCompiler compiler = new MockCompiler();
>   compiler.parseScript(
>       @"class C { toString() => 'C'; } main() { '${new C()}'; }");
>   
>   ClassElement classC = compiler.mainApp.find(buildSourceString('C'));
>   classC.ensureResolved(compiler);
>   Element toStringMethod =     
> classC.lookupLocalMember(buildSourceString('toString'));
>   Expect.isNotNull(toStringMethod);
>   
>   final resolvedElements = compiler.enqueuer.resolution.resolvedElements;
>   print('---');
>   resolvedElements.forEach((k, v) { print('$k: $v'); });
>   print('---'); 
>        Expect.isTrue(resolvedElements.containsKey(toStringMethod));
> }
> 
> gives me an empty map.  Am I using the API correctly?

Try:

compiler.parseScript("class C { toString() => 'C'; }");
compiler.resolveStatement(@"'${new C()}';");

If that doesn't work, take a look at concrete_type_inference_test.dart, in
particular the method compileAndFind.

[Anton Muhin, 2012-08-13 15:38:56]

Peter,

parseScript didn't help as it apparently doesn't populate the necessary queue
and tree elements it returns have no references to toString (which looks okay
for me).

Followed your second advice and reused bigger parts of common infrastructure.

[ahe, 2012-08-13 15:55:53]

LGTM!

https://chromiumcodereview.appspot.com/10824276/diff/8007/tests/compiler/dart...
File tests/compiler/dart2js/resolver_test.dart (right):

https://chromiumcodereview.appspot.com/10824276/diff/8007/tests/compiler/dart...
tests/compiler/dart2js/resolver_test.dart:737: final resolvedElements =
compiler.enqueuer.resolution.resolvedElements;
Please use:

Expect.isNotNull(compiler.enqueuer.resolution.getCachedElements(toStringMethod));

[Anton Muhin, 2012-08-13 16:09:14]

Thanks a lot for review, Peter, submitting.

https://chromiumcodereview.appspot.com/10824276/diff/8007/tests/compiler/dart...
File tests/compiler/dart2js/resolver_test.dart (right):

https://chromiumcodereview.appspot.com/10824276/diff/8007/tests/compiler/dart...
tests/compiler/dart2js/resolver_test.dart:737: final resolvedElements =
compiler.enqueuer.resolution.resolvedElements;
On 2012/08/13 15:55:53, ahe wrote:
> Please use:
> 
>
Expect.isNotNull(compiler.enqueuer.resolution.getCachedElements(toStringMethod));

Done.