Index: runtime/vm/raw_object.h |
diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h |
index 9f1f4fcf61859aa226949f87fecb0ccb4e7c0dc9..30dfb090abe42eff252afe3a79b62715edaa6bd7 100644 |
--- a/runtime/vm/raw_object.h |
+++ b/runtime/vm/raw_object.h |
@@ -721,6 +721,7 @@ class RawClass : public RawObject { |
case Snapshot::kAppNoJIT: |
return reinterpret_cast<RawObject**>(&ptr()->direct_subclasses_); |
case Snapshot::kMessage: |
+ case Snapshot::kNone: |
break; |
} |
UNREACHABLE(); |
@@ -949,6 +950,7 @@ class RawField : public RawObject { |
case Snapshot::kAppNoJIT: |
return reinterpret_cast<RawObject**>(&ptr()->initializer_); |
case Snapshot::kMessage: |
+ case Snapshot::kNone: |
break; |
} |
UNREACHABLE(); |
@@ -1029,6 +1031,7 @@ class RawScript : public RawObject { |
case Snapshot::kScript: |
return reinterpret_cast<RawObject**>(&ptr()->tokens_); |
case Snapshot::kMessage: |
+ case Snapshot::kNone: |
break; |
} |
UNREACHABLE(); |
@@ -1120,12 +1123,10 @@ class RawCode : public RawObject { |
uword entry_point_; |
RawObject** from() { |
- return reinterpret_cast<RawObject**>(&ptr()->instructions_); |
+ return reinterpret_cast<RawObject**>(&ptr()->active_instructions_); |
} |
- union { |
- RawInstructions* instructions_; |
- RawSmi* precompiled_instructions_size_; |
- }; |
+ RawInstructions* active_instructions_; |
+ RawInstructions* instructions_; |
RawObjectPool* object_pool_; |
// If owner_ is Function::null() the owner is a regular stub. |
// If owner_ is a Class the owner is the allocation stub for that class. |
@@ -1517,6 +1518,7 @@ class RawICData : public RawObject { |
case Snapshot::kAppWithJIT: |
return to(); |
case Snapshot::kMessage: |
+ case Snapshot::kNone: |
break; |
} |
UNREACHABLE(); |
@@ -1648,6 +1650,7 @@ class RawLibraryPrefix : public RawInstance { |
case Snapshot::kAppNoJIT: |
return reinterpret_cast<RawObject**>(&ptr()->importer_); |
case Snapshot::kMessage: |
+ case Snapshot::kNone: |
break; |
} |
UNREACHABLE(); |