Changeset 163027 in webkit for trunk/Source/JavaScriptCore/ftl/FTLSlowPathCall.h

Timestamp:

Jan 29, 2014, 11:18:54 AM (11 years ago)

Author:

[email protected]

Message:

Merge the jsCStack branch
​https://bugs.webkit.org/show_bug.cgi?id=127763

Reviewed by Mark Hahnenberg.

Source/JavaScriptCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WebCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WTF:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

File:

• trunk/Source/JavaScriptCore/ftl/FTLSlowPathCall.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ftl/FTLSlowPathCall.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56 +56 @@
 };
 
+void storeCodeOrigin(State&, CCallHelpers&, CodeOrigin);
+
 MacroAssembler::Call callOperation(
-    State&, const RegisterSet&, CCallHelpers&, J_JITOperation_ESsiJI,
-    GPRReg result, GPRReg callFrameRegister, StructureStubInfo*, GPRReg object,
+    State&, const RegisterSet&, CCallHelpers&, CodeOrigin, CCallHelpers::JumpList*,
+    J_JITOperation_ESsiJI, GPRReg result, StructureStubInfo*, GPRReg object,
     StringImpl* uid);
 MacroAssembler::Call callOperation(
-    State&, const RegisterSet&, CCallHelpers&, V_JITOperation_ESsiJJI,
-    GPRReg callFrameRegister, StructureStubInfo*, GPRReg value, GPRReg object,
+    State&, const RegisterSet&, CCallHelpers&, CodeOrigin, CCallHelpers::JumpList*,
+    V_JITOperation_ESsiJJI, StructureStubInfo*, GPRReg value, GPRReg object,
     StringImpl* uid);