commit ac2d5fd1c35d43659e5ca21b2942f2663f16fbba
author Dart CI <dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com> Fri Feb 26 05:22:09 2021 -0800
committer Dart CI <dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com> Fri Feb 26 05:22:09 2021 -0800
tree ad9f7092c0677f333a9f5a601fe9b8e8dcb27503
parent 9ef3cef4a36c888c90d6f8d5750444231cfa8588
parent 7ba12664ea735dffb366f30d7dba93e879ca8d2d

Version 2.13.0-84.0.dev

Merge commit '7ba12664ea735dffb366f30d7dba93e879ca8d2d' into 'dev'

runtime/vm/compiler/backend/il.h

diff --git a/runtime/vm/compiler/backend/il.h b/runtime/vm/compiler/backend/il.h
index 8e19b15..a09d32c 100644
--- a/runtime/vm/compiler/backend/il.h
+++ b/runtime/vm/compiler/backend/il.h
@@ -5552,7 +5552,9 @@
     return field().is_final() && !FLAG_fields_may_be_reset;
   }
 
-  virtual bool ComputeCanDeoptimize() const { return calls_initializer(); }
+  virtual bool ComputeCanDeoptimize() const {
+    return calls_initializer() && !CompilerState::Current().is_aot();
+  }
   virtual bool HasUnknownSideEffects() const { return calls_initializer(); }
   virtual bool CanTriggerGC() const { return calls_initializer(); }
   virtual bool MayThrow() const { return calls_initializer(); }
@@ -6592,7 +6594,9 @@
   DECLARE_INSTRUCTION(LoadField)
   virtual CompileType ComputeType() const;
 
-  virtual bool ComputeCanDeoptimize() const { return calls_initializer(); }
+  virtual bool ComputeCanDeoptimize() const {
+    return calls_initializer() && !CompilerState::Current().is_aot();
+  }
 
   virtual bool HasUnknownSideEffects() const {
     return calls_initializer() && !throw_exception_on_initialization();

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index 8306513..f8cb69e 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 13
 PATCH 0
-PRERELEASE 83
+PRERELEASE 84
 PRERELEASE_PATCH 0
\ No newline at end of file