Reinstate reduction for closure call to known static method

rakudrama · commit-bot@chromium.org · commit 8deb5aabba20 · 2019-01-03T22:44:53.000Z
This was accidentally removed during the migration to kernel. Change-Id: Ib4998074269b1bf5b1dd3feedebcb50dc1164c5d Reviewed-on: https://dart-review.googlesource.com/c/88229 Commit-Queue: Stephen Adams <sra@google.com> Reviewed-by: Johnni Winther <johnniwinther@google.com>
diff --git a/pkg/compiler/lib/src/ssa/builder_kernel.dart b/pkg/compiler/lib/src/ssa/builder_kernel.dart
@@ -4258,6 +4258,10 @@ class KernelSsaGraphBuilder extends ir.Visitor
     } else if (selector.isSetter) {
       push(new HInvokeDynamicSetter(selector, mask, null, inputs, isIntercepted,
           type, sourceInformation));
+    } else if (selector.isClosureCall) {
+      assert(!isIntercepted);
+      push(new HInvokeClosure(selector, inputs, type, typeArguments)
+        ..sourceInformation = sourceInformation);
     } else {
       push(new HInvokeDynamicMethod(
           selector, mask, inputs, type, typeArguments, sourceInformation,
diff --git a/pkg/compiler/lib/src/ssa/optimize.dart b/pkg/compiler/lib/src/ssa/optimize.dart
@@ -1283,7 +1283,8 @@ class SsaInstructionSimplifier extends HBaseVisitor
           // TODO(sra): Handle adding optional arguments default values.
           assert(!node.isInterceptedCall);
           return new HInvokeStatic(target, node.inputs.skip(1).toList(),
-              node.instructionType, node.typeArguments);
+              node.instructionType, node.typeArguments)
+            ..sourceInformation = node.sourceInformation;
         }
       }
     }
diff --git a/tests/compiler/dart2js/codegen/closure_call_of_static_reduction_test.dart b/tests/compiler/dart2js/codegen/closure_call_of_static_reduction_test.dart
@@ -0,0 +1,62 @@
+// Copyright (c) 2019, 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.
+
+import 'dart:async';
+import 'package:async_helper/async_helper.dart';
+import '../helpers/compiler_helper.dart';
+
+const String TEST1 = r"""
+aNonInstanceMethod(x) { print(x); }
+const f = aNonInstanceMethod;
+foo() {
+  f(1);
+  // Closure call is reduced to a direct static call.
+  // present: '.aNonInstanceMethod(1)'
+  // absent: '.call$1(1)'
+}
+""";
+
+const String TEST2 = r"""
+aNonInstanceMethod([x]) { print(x); }
+final f = aNonInstanceMethod;
+foo() {
+  f(1);
+  // Closure call is reduced to a direct static call.
+  // present: '.aNonInstanceMethod(1)'
+  // absent: '.call$1(1)'
+}
+""";
+
+const String TEST3 = r"""
+aNonInstanceMethod([x]) { print(x); }
+const f = aNonInstanceMethod;
+foo() {
+  f();
+  // Closure call is not reduced to a direct static call due to not wanting to
+  // add default arguments. This may change.
+  // absent: '.aNonInstanceMethod('
+  // present: '.call$0()'
+}
+""";
+
+// TODO(29147): Add tests like above where 'f' is local. The above tests fail if
+// 'f' is local due to static function references sometimes being represented by
+// HConstant (as above) and other times being referenced as HStatic.
+
+main() {
+  runTests() async {
+    Future check(String test) {
+      return compile(test, entry: 'foo', check: checkerForAbsentPresent(test));
+    }
+
+    await check(TEST1);
+    await check(TEST2);
+    await check(TEST3);
+  }
+
+  asyncTest(() async {
+    print('--test from kernel------------------------------------------------');
+    await runTests();
+  });
+}

Original file line number	Diff line number	Diff line change
`@@ -1283,7 +1283,8 @@ class SsaInstructionSimplifier extends HBaseVisitor`
`1283`	`1283`	`// TODO(sra): Handle adding optional arguments default values.`
`1284`	`1284`	`assert(!node.isInterceptedCall);`
`1285`	`1285`	`return new HInvokeStatic(target, node.inputs.skip(1).toList(),`
`1286`		`- node.instructionType, node.typeArguments);`
	`1286`	`+ node.instructionType, node.typeArguments)`
	`1287`	`+ ..sourceInformation = node.sourceInformation;`
`1287`	`1288`	`}`
`1288`	`1289`	`}`
`1289`	`1290`	`}`