JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / runtime / JSFunctionInlines.h

diff --git a/runtime/JSFunctionInlines.h b/runtime/JSFunctionInlines.h
index ad5b56b880c382d0d6d148787d5248c1cb954b52..f6c6d58ec6e5c1164cb27fa5e41618b4b8142f02 100644 (file)
--- a/runtime/JSFunctionInlines.h
+++ b/runtime/JSFunctionInlines.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -31,11 +31,17 @@
 
 namespace JSC {
 
 
 namespace JSC {
 

+inline JSFunction* JSFunction::createWithInvalidatedReallocationWatchpoint(
+    VM& vm, FunctionExecutable* executable, JSScope* scope)
+{
+    ASSERT(executable->singletonFunction()->hasBeenInvalidated());
+    return createImpl(vm, executable, scope);
+}
+

 inline JSFunction::JSFunction(VM& vm, FunctionExecutable* executable, JSScope* scope)
 inline JSFunction::JSFunction(VM& vm, FunctionExecutable* executable, JSScope* scope)

-    : Base(vm, scope->globalObject()->functionStructure())
+    : Base(vm, scope, scope->globalObject()->functionStructure())

     , m_executable(vm, this, executable)
     , m_executable(vm, this, executable)

-    , m_scope(vm, this, scope)
-    , m_allocationProfileWatchpoint(ClearWatchpoint) // See comment in JSFunction.cpp concerning the reason for using ClearWatchpoint as opposed to IsWatched.
+    , m_rareData()

 {
 }
 
 {
 }
 


@@ -61,6 +67,11 @@ inline bool JSFunction::isHostOrBuiltinFunction() const
     return isHostFunction() || isBuiltinFunction();
 }
 
     return isHostFunction() || isBuiltinFunction();
 }
 

+inline bool JSFunction::isClassConstructorFunction() const
+{
+    return !isHostFunction() && jsExecutable()->isClassConstructorFunction();
+}
+

 inline NativeFunction JSFunction::nativeFunction()
 {
     ASSERT(isHostFunctionNonInline());
 inline NativeFunction JSFunction::nativeFunction()
 {
     ASSERT(isHostFunctionNonInline());