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

Use kFunctionCid instead of kIllegalCid to indicate that a generic function

Browse source 
type parameter does not parameterize a class, but a function.
Snapshot generation apparently trips on kIllegalCid.

R=johnmccutchan@google.com, rmacnak@google.com

Review-Url: https://codereview.chromium.org/2567163002 .
This commit is contained in:
Regis Crelier 2016-12-12 14:13:17 -08:00
parent b62c5e466f
commit 53e93e8b05
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtime/vm/object.cc
View file

@ -17610,7 +17610,7 @@ bool TypeParameter::IsEquivalent(const Instance& other, TrailPtr trail) const {
void TypeParameter::set_parameterized_class(const Class& value) const {
// Set value may be null.
classid_t cid = kIllegalCid;
classid_t cid = kFunctionCid; // Denotes a function type parameter.
if (!value.IsNull()) {
cid = value.id();
}
@ -17625,7 +17625,7 @@ classid_t TypeParameter::parameterized_class_id() const {
RawClass* TypeParameter::parameterized_class() const {
classid_t cid = parameterized_class_id();
if (cid == kIllegalCid) {
if (cid == kFunctionCid) {
return Class::null();
}
return Isolate::Current()->class_table()->At(cid);

2
runtime/vm/object.h
View file

@ -6057,7 +6057,7 @@ class TypeParameter : public AbstractType {
return raw_ptr()->parameterized_function_;
}
bool IsClassTypeParameter() const {
return parameterized_class_id() != kIllegalCid;
return parameterized_class_id() != kFunctionCid;
}
bool IsFunctionTypeParameter() const {
return parameterized_function() != Function::null();