Index: runtime/vm/intrinsifier_x64.cc |
diff --git a/runtime/vm/intrinsifier_x64.cc b/runtime/vm/intrinsifier_x64.cc |
index f4f73131412f7b1d4f208311fe17d9b8d7ced82b..b888804ec48014899ce266223dccc7c3d406fc48 100644 |
--- a/runtime/vm/intrinsifier_x64.cc |
+++ b/runtime/vm/intrinsifier_x64.cc |
@@ -1533,7 +1533,12 @@ void Intrinsifier::Random_nextState(Assembler* assembler) { |
random_class.LookupStaticFieldAllowPrivate(Symbols::_A())); |
ASSERT(!random_A_field.IsNull()); |
ASSERT(random_A_field.is_const()); |
- const Instance& a_value = Instance::Handle(random_A_field.StaticValue()); |
+ Instance& a_value = Instance::Handle(random_A_field.StaticValue()); |
+ if (a_value.raw() == Object::sentinel().raw() || |
+ a_value.raw() == Object::transition_sentinel().raw()) { |
+ random_A_field.EvaluateInitializer(); |
+ a_value = random_A_field.StaticValue(); |
+ } |
const int64_t a_int_value = Integer::Cast(a_value).AsInt64Value(); |
// Receiver. |
__ movq(RAX, Address(RSP, +1 * kWordSize)); |