summaryrefslogtreecommitdiffstats
path: root/src/frames.cc
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-08-19 15:07:18 +0100
committerIain Merrick <husky@google.com>2010-08-23 14:25:34 +0100
commit756813857a4c2a4d8ad2e805969d5768d3cf43a0 (patch)
tree002fad3c25654870c9634232d53a48219346c50b /src/frames.cc
parentbb769b257e753aafcbd96767abb2abc645eaa20c (diff)
downloadandroid_external_v8-756813857a4c2a4d8ad2e805969d5768d3cf43a0.tar.gz
android_external_v8-756813857a4c2a4d8ad2e805969d5768d3cf43a0.tar.bz2
android_external_v8-756813857a4c2a4d8ad2e805969d5768d3cf43a0.zip
Update V8 to r5295 as required by WebKit r65615
Change-Id: I1d72d4990703e88b7798919c7a53e12ebf76958a
Diffstat (limited to 'src/frames.cc')
-rw-r--r--src/frames.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/frames.cc b/src/frames.cc
index bdd5100e..9f815c39 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -372,8 +372,8 @@ StackFrame::Type StackFrame::GetCallerState(State* state) const {
}
-Code* EntryFrame::code() const {
- return Heap::js_entry_code();
+Code* EntryFrame::unchecked_code() const {
+ return Heap::raw_unchecked_js_entry_code();
}
@@ -395,8 +395,8 @@ StackFrame::Type EntryFrame::GetCallerState(State* state) const {
}
-Code* EntryConstructFrame::code() const {
- return Heap::js_construct_entry_code();
+Code* EntryConstructFrame::unchecked_code() const {
+ return Heap::raw_unchecked_js_construct_entry_code();
}
@@ -406,8 +406,8 @@ Object*& ExitFrame::code_slot() const {
}
-Code* ExitFrame::code() const {
- return Code::cast(code_slot());
+Code* ExitFrame::unchecked_code() const {
+ return reinterpret_cast<Code*>(code_slot());
}
@@ -493,22 +493,22 @@ bool JavaScriptFrame::IsConstructor() const {
}
-Code* JavaScriptFrame::code() const {
+Code* JavaScriptFrame::unchecked_code() const {
JSFunction* function = JSFunction::cast(this->function());
- return function->shared()->code();
+ return function->unchecked_code();
}
-Code* ArgumentsAdaptorFrame::code() const {
+Code* ArgumentsAdaptorFrame::unchecked_code() const {
return Builtins::builtin(Builtins::ArgumentsAdaptorTrampoline);
}
-Code* InternalFrame::code() const {
+Code* InternalFrame::unchecked_code() const {
const int offset = InternalFrameConstants::kCodeOffset;
Object* code = Memory::Object_at(fp() + offset);
ASSERT(code != NULL);
- return Code::cast(code);
+ return reinterpret_cast<Code*>(code);
}