| commit | 95894333423e19f1e25229d3345f92b186cba575 | [log] [tgz] |
|---|---|---|
| author | msaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | Wed Jan 29 19:18:54 2014 +0000 |
| committer | msaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | Wed Jan 29 19:18:54 2014 +0000 |
| tree | 974339f55fc2bf941117018dec4929db24c09e38 | |
| parent | 9b465df54d80545485c7720a45ebf2ce89832cfe [diff] [blame] |
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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@163027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/interpreter/CallFrame.h b/Source/JavaScriptCore/interpreter/CallFrame.h index 48fbcd7..6f50842 100644 --- a/Source/JavaScriptCore/interpreter/CallFrame.h +++ b/Source/JavaScriptCore/interpreter/CallFrame.h
@@ -176,15 +176,13 @@ // CodeOrigin(0) if we're in native code. CodeOrigin codeOrigin(); - Register* frameExtent() + Register* topOfFrame() { if (isVMEntrySentinel() || !codeBlock()) - return registers() - 1; - return frameExtentInternal(); + return registers(); + return topOfFrameInternal(); } - Register* frameExtentInternal(); - #if USE(JSVALUE32_64) Instruction* currentVPC() const { @@ -318,6 +316,8 @@ ExecState(); ~ExecState(); + Register* topOfFrameInternal(); + // The following are for internal use in debugging and verification // code only and not meant as an API for general usage: