languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create runtime type in new space and canonicalize to old space (fixes #27663).

Browse source 
R=asiva@google.com, hausner@google.com

Review URL: https://codereview.chromium.org/2452563002 .
This commit is contained in:
Regis Crelier 2016-10-25 04:56:49 -07:00
parent 7eaad70e2f
commit 6418f8f36c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
runtime/vm/object.cc
View file

@ -15655,7 +15655,8 @@ RawAbstractType* Instance::GetType() const {
const Class& scope_cls = Class::Handle(type.type_class());
ASSERT(scope_cls.NumTypeArguments() > 0);
TypeArguments& type_arguments = TypeArguments::Handle(GetTypeArguments());
type = Type::New(scope_cls, type_arguments, TokenPosition::kNoSource);
type = Type::New(
scope_cls, type_arguments, TokenPosition::kNoSource, Heap::kNew);
type.set_signature(signature);
type.SetIsFinalized();
type ^= type.Canonicalize();
@ -17405,7 +17406,11 @@ RawAbstractType* Type::Canonicalize(TrailPtr trail) const {
type ^= table.GetOrNull(CanonicalTypeKey(*this));
if (type.IsNull()) {
// Add this Type into the canonical list of types.
type ^= raw();
if (this->IsNew()) {
type ^= Object::Clone(*this, Heap::kOld);
} else {
type ^= this->raw();
}
ASSERT(type.IsOld());
type.SetCanonical(); // Mark object as being canonical.
bool present = table.Insert(type);