Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: src/types.cc

Issue 1074133002: Remove Type::Array bit and replace with Type::GlobalObject (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Rebase on splitting of type tests. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/types.h ('k') | src/typing.cc » ('j') | src/typing.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « src/types.h ('k') | src/typing.cc » ('j') | src/typing.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698