Index: src/frames-inl.h |
diff --git a/src/frames-inl.h b/src/frames-inl.h |
index 4013601dace9c121bf722b131e6a71234dba2df5..cf7596e8379252e0bfd175a1dc9a3d18f4cefb3c 100644 |
--- a/src/frames-inl.h |
+++ b/src/frames-inl.h |
@@ -114,7 +114,9 @@ inline void StandardFrame::SetExpression(int index, Object* value) { |
inline Object* StandardFrame::context() const { |
const int offset = StandardFrameConstants::kContextOffset; |
- return Memory::Object_at(fp() + offset); |
+ Object* maybe_result = Memory::Object_at(fp() + offset); |
+ DCHECK(!maybe_result->IsSmi()); |
+ return maybe_result; |
} |
@@ -139,16 +141,16 @@ inline Address StandardFrame::ComputeConstantPoolAddress(Address fp) { |
inline bool StandardFrame::IsArgumentsAdaptorFrame(Address fp) { |
- Object* marker = |
- Memory::Object_at(fp + StandardFrameConstants::kContextOffset); |
- return marker == Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR); |
+ Object* frame_type = |
+ Memory::Object_at(fp + TypedFrameConstants::kFrameTypeOffset); |
+ return frame_type == Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR); |
} |
inline bool StandardFrame::IsConstructFrame(Address fp) { |
- Object* marker = |
- Memory::Object_at(fp + StandardFrameConstants::kMarkerOffset); |
- return marker == Smi::FromInt(StackFrame::CONSTRUCT); |
+ Object* frame_type = |
+ Memory::Object_at(fp + TypedFrameConstants::kFrameTypeOffset); |
+ return frame_type == Smi::FromInt(StackFrame::CONSTRUCT); |
} |