| Index: runtime/vm/class_finalizer.cc
|
| diff --git a/runtime/vm/class_finalizer.cc b/runtime/vm/class_finalizer.cc
|
| index 8fb13386aa6aacbe62579232f58904e4d1a365e6..494a42dce165859275ca1bb362fe0970be515bad 100644
|
| --- a/runtime/vm/class_finalizer.cc
|
| +++ b/runtime/vm/class_finalizer.cc
|
| @@ -715,8 +715,8 @@ void ClassFinalizer::FinalizeTypeArguments(
|
| arguments.ToCString());
|
| }
|
| Error& error = Error::Handle();
|
| - super_type_arg =
|
| - super_type_arg.InstantiateFrom(arguments, &error, trail);
|
| + super_type_arg = super_type_arg.InstantiateFrom(
|
| + arguments, &error, trail, Heap::kOld);
|
| if (!error.IsNull()) {
|
| // InstantiateFrom does not report an error if the type is still
|
| // uninstantiated. Instead, it will return a new BoundedType so
|
| @@ -818,7 +818,8 @@ void ClassFinalizer::CheckTypeArgumentBounds(const Class& cls,
|
| if (declared_bound.IsInstantiated()) {
|
| instantiated_bound = declared_bound.raw();
|
| } else {
|
| - instantiated_bound = declared_bound.InstantiateFrom(arguments, &error);
|
| + instantiated_bound =
|
| + declared_bound.InstantiateFrom(arguments, &error, NULL, Heap::kOld);
|
| }
|
| if (!instantiated_bound.IsFinalized()) {
|
| // The bound refers to type parameters, creating a cycle; postpone
|
|
|