commit 9db63ee729def399c89fa3156b15d647e8c8baa5
author Alexander Markov <alexmarkov@google.com> Thu Oct 04 19:14:33 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Thu Oct 04 19:14:33 2018 +0000
tree 9f3dac4d0e838ba85956a76aac28090f5d196f39
parent 9c75ab7aa9bd9b3d49aa752f814dd4d143ec11a4

[vm/bytecode] Set 'TypeEnvironment.thisType' when generating bytecode

This is needed for Expression.getStaticType() to work in certain
cases and improves recognition of int operations.

Change-Id: I80073a797a39ab5d6b3715940961a231e0a8ab10
Reviewed-on: https://dart-review.googlesource.com/c/78142
Auto-Submit: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Zach Anderson <zra@google.com>
Reviewed-by: Zach Anderson <zra@google.com>

pkg/vm/lib/bytecode/gen_bytecode.dart

diff --git a/pkg/vm/lib/bytecode/gen_bytecode.dart b/pkg/vm/lib/bytecode/gen_bytecode.dart
index 3f13f06..9e3ea83 100644
--- a/pkg/vm/lib/bytecode/gen_bytecode.dart
+++ b/pkg/vm/lib/bytecode/gen_bytecode.dart
@@ -671,6 +671,9 @@
     parentFunction = null;
     isClosure = false;
     hasErrors = false;
+    if ((node is Procedure && !node.isStatic) || node is Constructor) {
+      typeEnvironment.thisType = enclosingClass.thisType;
+    }
     final isFactory = node is Procedure && node.isFactory;
     if (node.isInstanceMember || node is Constructor || isFactory) {
       if (enclosingClass.typeParameters.isNotEmpty) {
@@ -752,6 +755,7 @@
           cp, asm.bytecode, asm.exceptionsTable, nullableFields, closures);
     }
 
+    typeEnvironment.thisType = null;
     enclosingClass = null;
     enclosingMember = null;
     enclosingFunction = null;