Revert of [js] Avoid %_ClassOf for collection builtins. (patchset #4 …

…id:60001 of https://codereview.chromium.org/2814773005/ ) Reason for revert: Breaks node.js integration bot: https://build.chromium.org/p/client.v8.fyi/builders/V8%20-%20node.js%20integration/builds/5374/steps/build%20addons%20and%20test%20node.js/logs/stdio Original issue's description: > [js] Avoid %_ClassOf for collection builtins. > > The collection builtins (Map, Set, WeakMap, WeakSet) are still written > in JavaScript and make heavy use of %_ClassOf, which is kind of > expensive compared to a simple instance type check. Change that to use > simple instance type checks instead. > > R=jarin@chromium.org > BUG=v8:6261,v8:6278,v8:6344 > > Review-Url: https://codereview.chromium.org/2814773005 > Cr-Commit-Position: refs/heads/master@{#45106} > Committed: https://chromium.googlesource.com/v8/v8/+/28170099fd1efc84a724ef133f335fec521c0852 TBR=jarin@chromium.org,adamk@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=v8:6261,v8:6278,v8:6344 Review-Url: https://codereview.chromium.org/2860123002 Cr-Commit-Position: refs/heads/master@{#45108}
zhuzhuaicoding · May 4, 2017 · ae5ae1c · ae5ae1c
1 parent 0015bbb
commit ae5ae1c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 91 deletions.
diff --git a/src/compiler/js-intrinsic-lowering.cc b/src/compiler/js-intrinsic-lowering.cc
@@ -54,22 +54,8 @@ Reduction JSIntrinsicLowering::Reduce(Node* node) {
       return ReduceIsInstanceType(node, JS_ARRAY_TYPE);
     case Runtime::kInlineIsTypedArray:
       return ReduceIsInstanceType(node, JS_TYPED_ARRAY_TYPE);
-    case Runtime::kInlineIsJSGlobalProxy:
-      return ReduceIsInstanceType(node, JS_GLOBAL_PROXY_TYPE);
     case Runtime::kInlineIsJSProxy:
       return ReduceIsInstanceType(node, JS_PROXY_TYPE);
-    case Runtime::kInlineIsJSMap:
-      return ReduceIsInstanceType(node, JS_MAP_TYPE);
-    case Runtime::kInlineIsJSSet:
-      return ReduceIsInstanceType(node, JS_SET_TYPE);
-    case Runtime::kInlineIsJSMapIterator:
-      return ReduceIsInstanceType(node, JS_MAP_ITERATOR_TYPE);
-    case Runtime::kInlineIsJSSetIterator:
-      return ReduceIsInstanceType(node, JS_SET_ITERATOR_TYPE);
-    case Runtime::kInlineIsJSWeakMap:
-      return ReduceIsInstanceType(node, JS_WEAK_MAP_TYPE);
-    case Runtime::kInlineIsJSWeakSet:
-      return ReduceIsInstanceType(node, JS_WEAK_SET_TYPE);
     case Runtime::kInlineIsJSReceiver:
       return ReduceIsJSReceiver(node);
     case Runtime::kInlineIsSmi:

diff --git a/src/compiler/linkage.cc b/src/compiler/linkage.cc
@@ -179,13 +179,6 @@ bool Linkage::NeedsFrameStateInput(Runtime::FunctionId function) {
     case Runtime::kInlineGeneratorGetInputOrDebugPos:
     case Runtime::kInlineGeneratorGetResumeMode:
     case Runtime::kInlineIsArray:
-    case Runtime::kInlineIsJSMap:
-    case Runtime::kInlineIsJSSet:
-    case Runtime::kInlineIsJSMapIterator:
-    case Runtime::kInlineIsJSSetIterator:
-    case Runtime::kInlineIsJSWeakMap:
-    case Runtime::kInlineIsJSWeakSet:
-    case Runtime::kInlineIsJSGlobalProxy:
     case Runtime::kInlineIsJSReceiver:
     case Runtime::kInlineIsRegExp:
     case Runtime::kInlineIsSmi:

diff --git a/src/debug/debug-evaluate.cc b/src/debug/debug-evaluate.cc
@@ -274,13 +274,6 @@ bool IntrinsicHasNoSideEffect(Runtime::FunctionId id) {
   V(IsFunction)                      \
   V(IsDate)                          \
   V(IsJSProxy)                       \
-  V(IsJSGlobalProxy)                 \
-  V(IsJSMap)                         \
-  V(IsJSSet)                         \
-  V(IsJSMapIterator)                 \
-  V(IsJSSetIterator)                 \
-  V(IsJSWeakMap)                     \
-  V(IsJSWeakSet)                     \
   V(IsRegExp)                        \
   V(IsTypedArray)                    \
   V(ClassOf)                         \

diff --git a/src/js/macros.py b/src/js/macros.py
@@ -47,28 +47,29 @@
 macro IS_ARRAY(arg)             = (%_IsArray(arg));
 macro IS_ARRAYBUFFER(arg)       = (%_ClassOf(arg) === 'ArrayBuffer');
 macro IS_BOOLEAN(arg)           = (typeof(arg) === 'boolean');
+macro IS_DATAVIEW(arg)          = (%_ClassOf(arg) === 'DataView');
 macro IS_DATE(arg)              = (%IsDate(arg));
 macro IS_ERROR(arg)             = (%_ClassOf(arg) === 'Error');
 macro IS_FUNCTION(arg)          = (%IsFunction(arg));
 macro IS_GENERATOR(arg)         = (%_ClassOf(arg) === 'Generator');
-macro IS_GLOBAL(arg)            = (%_IsJSGlobalProxy(arg));
-macro IS_MAP(arg)               = (%_IsJSMap(arg));
-macro IS_MAP_ITERATOR(arg)      = (%_IsJSMapIterator(arg));
+macro IS_GLOBAL(arg)            = (%_ClassOf(arg) === 'global');
+macro IS_MAP(arg)               = (%_ClassOf(arg) === 'Map');
+macro IS_MAP_ITERATOR(arg)      = (%_ClassOf(arg) === 'Map Iterator');
 macro IS_NULL(arg)              = (arg === null);
 macro IS_NULL_OR_UNDEFINED(arg) = (arg == null);
 macro IS_NUMBER(arg)            = (typeof(arg) === 'number');
 macro IS_OBJECT(arg)            = (typeof(arg) === 'object');
 macro IS_PROXY(arg)             = (%_IsJSProxy(arg));
 macro IS_SCRIPT(arg)            = (%_ClassOf(arg) === 'Script');
-macro IS_SET(arg)               = (%_IsJSSet(arg));
-macro IS_SET_ITERATOR(arg)      = (%_IsJSSetIterator(arg));
+macro IS_SET(arg)               = (%_ClassOf(arg) === 'Set');
+macro IS_SET_ITERATOR(arg)      = (%_ClassOf(arg) === 'Set Iterator');
 macro IS_SHAREDARRAYBUFFER(arg) = (%_ClassOf(arg) === 'SharedArrayBuffer');
 macro IS_STRING(arg)            = (typeof(arg) === 'string');
 macro IS_SYMBOL(arg)            = (typeof(arg) === 'symbol');
 macro IS_TYPEDARRAY(arg)        = (%_IsTypedArray(arg));
 macro IS_UNDEFINED(arg)         = (arg === (void 0));
-macro IS_WEAKMAP(arg)           = (%_IsJSWeakMap(arg));
-macro IS_WEAKSET(arg)           = (%_IsJSWeakSet(arg));
+macro IS_WEAKMAP(arg)           = (%_ClassOf(arg) === 'WeakMap');
+macro IS_WEAKSET(arg)           = (%_ClassOf(arg) === 'WeakSet');
 
 # Macro for ES queries of the type: "Type(O) is Object."
 macro IS_RECEIVER(arg) = (%_IsJSReceiver(arg));

diff --git a/src/runtime/runtime-collections.cc b/src/runtime/runtime-collections.cc
@@ -325,48 +325,5 @@ RUNTIME_FUNCTION(Runtime_GetWeakSetValues) {
   CHECK(max_values >= 0);
   return *JSWeakCollection::GetEntries(holder, max_values);
 }
-
-RUNTIME_FUNCTION(Runtime_IsJSMap) {
-  SealHandleScope shs(isolate);
-  DCHECK_EQ(1, args.length());
-  CONVERT_ARG_CHECKED(Object, obj, 0);
-  return isolate->heap()->ToBoolean(obj->IsJSMap());
-}
-
-RUNTIME_FUNCTION(Runtime_IsJSSet) {
-  SealHandleScope shs(isolate);
-  DCHECK_EQ(1, args.length());
-  CONVERT_ARG_CHECKED(Object, obj, 0);
-  return isolate->heap()->ToBoolean(obj->IsJSSet());
-}
-
-RUNTIME_FUNCTION(Runtime_IsJSMapIterator) {
-  SealHandleScope shs(isolate);
-  DCHECK_EQ(1, args.length());
-  CONVERT_ARG_CHECKED(Object, obj, 0);
-  return isolate->heap()->ToBoolean(obj->IsJSMapIterator());
-}
-
-RUNTIME_FUNCTION(Runtime_IsJSSetIterator) {
-  SealHandleScope shs(isolate);
-  DCHECK_EQ(1, args.length());
-  CONVERT_ARG_CHECKED(Object, obj, 0);
-  return isolate->heap()->ToBoolean(obj->IsJSSetIterator());
-}
-
-RUNTIME_FUNCTION(Runtime_IsJSWeakMap) {
-  SealHandleScope shs(isolate);
-  DCHECK_EQ(1, args.length());
-  CONVERT_ARG_CHECKED(Object, obj, 0);
-  return isolate->heap()->ToBoolean(obj->IsJSWeakMap());
-}
-
-RUNTIME_FUNCTION(Runtime_IsJSWeakSet) {
-  SealHandleScope shs(isolate);
-  DCHECK_EQ(1, args.length());
-  CONVERT_ARG_CHECKED(Object, obj, 0);
-  return isolate->heap()->ToBoolean(obj->IsJSWeakSet());
-}
-
 }  // namespace internal
 }  // namespace v8
diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h
@@ -118,13 +118,7 @@ namespace internal {
   F(WeakCollectionHas, 3, 1)              \
   F(WeakCollectionDelete, 3, 1)           \
   F(WeakCollectionSet, 4, 1)              \
-  F(GetWeakSetValues, 2, 1)               \
-  F(IsJSMap, 1, 1)                        \
-  F(IsJSSet, 1, 1)                        \
-  F(IsJSMapIterator, 1, 1)                \
-  F(IsJSSetIterator, 1, 1)                \
-  F(IsJSWeakMap, 1, 1)                    \
-  F(IsJSWeakSet, 1, 1)
+  F(GetWeakSetValues, 2, 1)
 
 #define FOR_EACH_INTRINSIC_COMPILER(F)    \
   F(CompileLazy, 1, 1)                    \

diff --git a/test/inspector/inspector.status b/test/inspector/inspector.status
@@ -20,12 +20,6 @@
   'debugger/set-blackbox-patterns': [SKIP],
 }],  # variant != default
 
-##############################################################################
-['variant == noturbofan', {
-  # Crashes due to missing source position in ToBooleanICStub?
-  'runtime/command-line-api': [SKIP],
-}],  # variant == noturbofan
-
 ##############################################################################
 ['variant == wasm_traps', {
   '*': [SKIP],