Chromium Code Reviews| Index: src/types.cc |
| diff --git a/src/types.cc b/src/types.cc |
| index 9116a693f0585aa9614071082d9ca126618ff0be..f2fb60f316eb5661e9d99ae8789af3364a69af12 100644 |
| --- a/src/types.cc |
| +++ b/src/types.cc |
| @@ -178,7 +178,7 @@ TypeImpl<Config>::BitsetType::Lub(TypeImpl* type) { |
| if (type->IsConstant()) return type->AsConstant()->Bound()->AsBitset(); |
| if (type->IsRange()) return type->AsRange()->Bound(); |
| if (type->IsContext()) return kInternal & kTaggedPointer; |
| - if (type->IsArray()) return kArray; |
| + if (type->IsArray()) return kOtherObject; |
| if (type->IsFunction()) return kOtherObject; // TODO(rossberg): kFunction |
| UNREACHABLE(); |
| return kNone; |
| @@ -234,7 +234,6 @@ TypeImpl<Config>::BitsetType::Lub(i::Map* map) { |
| case JS_CONTEXT_EXTENSION_OBJECT_TYPE: |
| case JS_GENERATOR_OBJECT_TYPE: |
| case JS_MODULE_TYPE: |
| - case JS_GLOBAL_OBJECT_TYPE: |
| case JS_BUILTINS_OBJECT_TYPE: |
| case JS_GLOBAL_PROXY_TYPE: |
| case JS_ARRAY_BUFFER_TYPE: |
| @@ -248,8 +247,10 @@ TypeImpl<Config>::BitsetType::Lub(i::Map* map) { |
| case JS_WEAK_SET_TYPE: |
| if (map->is_undetectable()) return kUndetectable; |
| return kOtherObject; |
| + case JS_GLOBAL_OBJECT_TYPE: |
| + return kGlobalObject; |
| case JS_ARRAY_TYPE: |
|
rossberg
2015/04/10 11:41:55
Nit: just include this case up with the others.
titzer
2015/04/10 12:35:59
Done.
|
| - return kArray; |
| + return kOtherObject; |
| case JS_FUNCTION_TYPE: |
| return kOtherObject; // TODO(rossberg): there should be a Function type. |
| case JS_REGEXP_TYPE: |