summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/runtime/CommonSlowPaths.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/JavaScriptCore/runtime/CommonSlowPaths.h')
-rw-r--r--Source/JavaScriptCore/runtime/CommonSlowPaths.h85
1 files changed, 26 insertions, 59 deletions
diff --git a/Source/JavaScriptCore/runtime/CommonSlowPaths.h b/Source/JavaScriptCore/runtime/CommonSlowPaths.h
index 067df0c38..cfc8bdbb7 100644
--- a/Source/JavaScriptCore/runtime/CommonSlowPaths.h
+++ b/Source/JavaScriptCore/runtime/CommonSlowPaths.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,11 +30,14 @@
#include "CodeSpecializationKind.h"
#include "ExceptionHelpers.h"
#include "JSStackInlines.h"
+#include "NameInstance.h"
#include "StackAlignment.h"
-#include "Symbol.h"
#include "VM.h"
+#include <wtf/Platform.h>
#include <wtf/StdLibExtras.h>
+#if ENABLE(JIT) || ENABLE(LLINT)
+
namespace JSC {
// The purpose of this namespace is to include slow paths that are shared
@@ -46,12 +49,6 @@ namespace JSC {
namespace CommonSlowPaths {
-struct ArityCheckData {
- unsigned paddedStackSpace;
- void* thunkToCall;
- void* returnPC;
-};
-
ALWAYS_INLINE int arityCheckFor(ExecState* exec, JSStack* stack, CodeSpecializationKind kind)
{
JSFunction* callee = jsCast<JSFunction*>(exec->callee());
@@ -61,18 +58,24 @@ ALWAYS_INLINE int arityCheckFor(ExecState* exec, JSStack* stack, CodeSpecializat
ASSERT(argumentCountIncludingThis < newCodeBlock->numParameters());
int missingArgumentCount = newCodeBlock->numParameters() - argumentCountIncludingThis;
- int neededStackSpace = missingArgumentCount + 1; // Allow space to save the original return PC.
- int paddedStackSpace = WTF::roundUpToMultipleOf(stackAlignmentRegisters(), neededStackSpace);
+ int paddedMissingArgumentCount = WTF::roundUpToMultipleOf(stackAlignmentRegisters(), missingArgumentCount);
- if (!stack->ensureCapacityFor(exec->registers() - paddedStackSpace))
+#if USE(SEPARATE_C_AND_JS_STACK)
+ if (!stack->grow(exec->registers() - paddedMissingArgumentCount))
+ return -1;
+#else
+ UNUSED_PARAM(stack);
+ if (!exec->vm().isSafeToRecurse(paddedMissingArgumentCount * sizeof(Register)))
return -1;
- return paddedStackSpace / stackAlignmentRegisters();
+#endif // USE(SEPARATE_C_AND_JS_STACK)
+
+ return paddedMissingArgumentCount;
}
inline bool opIn(ExecState* exec, JSValue propName, JSValue baseVal)
{
if (!baseVal.isObject()) {
- exec->vm().throwException(exec, createInvalidInParameterError(exec, baseVal));
+ exec->vm().throwException(exec, createInvalidParameterError(exec, "in", baseVal));
return false;
}
@@ -82,39 +85,15 @@ inline bool opIn(ExecState* exec, JSValue propName, JSValue baseVal)
if (propName.getUInt32(i))
return baseObj->hasProperty(exec, i);
- auto property = propName.toPropertyKey(exec);
+ if (isName(propName))
+ return baseObj->hasProperty(exec, jsCast<NameInstance*>(propName.asCell())->privateName());
+
+ Identifier property(exec, propName.toString(exec)->value(exec));
if (exec->vm().exception())
return false;
return baseObj->hasProperty(exec, property);
}
-inline void tryCachePutToScopeGlobal(
- ExecState* exec, CodeBlock* codeBlock, Instruction* pc, JSObject* scope,
- ResolveModeAndType modeAndType, PutPropertySlot& slot)
-{
- // Covers implicit globals. Since they don't exist until they first execute, we didn't know how to cache them at compile time.
-
- if (modeAndType.type() != GlobalProperty && modeAndType.type() != GlobalPropertyWithVarInjectionChecks)
- return;
-
- if (!slot.isCacheablePut()
- || slot.base() != scope
- || !scope->structure()->propertyAccessesAreCacheable())
- return;
-
- if (slot.type() == PutPropertySlot::NewProperty) {
- // Don't cache if we've done a transition. We want to detect the first replace so that we
- // can invalidate the watchpoint.
- return;
- }
-
- scope->structure()->didCachePropertyReplacement(exec->vm(), slot.cachedOffset());
-
- ConcurrentJITLocker locker(codeBlock->m_lock);
- pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure());
- pc[6].u.operand = slot.cachedOffset();
-}
-
} // namespace CommonSlowPaths
class ExecState;
@@ -181,14 +160,14 @@ SLOW_PATH_DECL(name) WTF_INTERNAL
SLOW_PATH_HIDDEN_DECL(slow_path_call_arityCheck);
SLOW_PATH_HIDDEN_DECL(slow_path_construct_arityCheck);
-SLOW_PATH_HIDDEN_DECL(slow_path_create_direct_arguments);
-SLOW_PATH_HIDDEN_DECL(slow_path_create_scoped_arguments);
-SLOW_PATH_HIDDEN_DECL(slow_path_create_out_of_band_arguments);
+SLOW_PATH_HIDDEN_DECL(slow_path_touch_entry);
+SLOW_PATH_HIDDEN_DECL(slow_path_create_arguments);
SLOW_PATH_HIDDEN_DECL(slow_path_create_this);
SLOW_PATH_HIDDEN_DECL(slow_path_enter);
SLOW_PATH_HIDDEN_DECL(slow_path_get_callee);
SLOW_PATH_HIDDEN_DECL(slow_path_to_this);
-SLOW_PATH_HIDDEN_DECL(slow_path_throw_tdz_error);
+SLOW_PATH_HIDDEN_DECL(slow_path_captured_mov);
+SLOW_PATH_HIDDEN_DECL(slow_path_new_captured_func);
SLOW_PATH_HIDDEN_DECL(slow_path_not);
SLOW_PATH_HIDDEN_DECL(slow_path_eq);
SLOW_PATH_HIDDEN_DECL(slow_path_neq);
@@ -201,7 +180,6 @@ SLOW_PATH_HIDDEN_DECL(slow_path_greatereq);
SLOW_PATH_HIDDEN_DECL(slow_path_inc);
SLOW_PATH_HIDDEN_DECL(slow_path_dec);
SLOW_PATH_HIDDEN_DECL(slow_path_to_number);
-SLOW_PATH_HIDDEN_DECL(slow_path_to_string);
SLOW_PATH_HIDDEN_DECL(slow_path_negate);
SLOW_PATH_HIDDEN_DECL(slow_path_add);
SLOW_PATH_HIDDEN_DECL(slow_path_mul);
@@ -217,25 +195,14 @@ SLOW_PATH_HIDDEN_DECL(slow_path_bitor);
SLOW_PATH_HIDDEN_DECL(slow_path_bitxor);
SLOW_PATH_HIDDEN_DECL(slow_path_typeof);
SLOW_PATH_HIDDEN_DECL(slow_path_is_object);
-SLOW_PATH_HIDDEN_DECL(slow_path_is_object_or_null);
SLOW_PATH_HIDDEN_DECL(slow_path_is_function);
SLOW_PATH_HIDDEN_DECL(slow_path_in);
SLOW_PATH_HIDDEN_DECL(slow_path_del_by_val);
SLOW_PATH_HIDDEN_DECL(slow_path_strcat);
SLOW_PATH_HIDDEN_DECL(slow_path_to_primitive);
-SLOW_PATH_HIDDEN_DECL(slow_path_get_enumerable_length);
-SLOW_PATH_HIDDEN_DECL(slow_path_has_generic_property);
-SLOW_PATH_HIDDEN_DECL(slow_path_has_structure_property);
-SLOW_PATH_HIDDEN_DECL(slow_path_has_indexed_property);
-SLOW_PATH_HIDDEN_DECL(slow_path_get_direct_pname);
-SLOW_PATH_HIDDEN_DECL(slow_path_get_property_enumerator);
-SLOW_PATH_HIDDEN_DECL(slow_path_next_structure_enumerator_pname);
-SLOW_PATH_HIDDEN_DECL(slow_path_next_generic_enumerator_pname);
-SLOW_PATH_HIDDEN_DECL(slow_path_to_index_string);
-SLOW_PATH_HIDDEN_DECL(slow_path_profile_type_clear_log);
-SLOW_PATH_HIDDEN_DECL(slow_path_create_lexical_environment);
-SLOW_PATH_HIDDEN_DECL(slow_path_push_with_scope);
} // namespace JSC
+#endif // ENABLE(JIT) || ENABLE(LLINT)
+
#endif // CommonSlowPaths_h
View Lorry Controller Status