Index: src/frames-inl.h |
=================================================================== |
--- src/frames-inl.h (revision 483) |
+++ src/frames-inl.h (working copy) |
@@ -145,8 +145,10 @@ |
} |
-inline bool StandardFrame::IsConstructTrampolineFrame(Address pc) { |
- return Builtins::builtin(Builtins::JSConstructCall)->contains(pc); |
+inline bool StandardFrame::IsConstructFrame(Address fp) { |
+ Object* marker = |
+ Memory::Object_at(fp + StandardFrameConstants::kMarkerOffset); |
+ return marker == Smi::FromInt(CONSTRUCT); |
} |
@@ -167,15 +169,6 @@ |
} |
-inline bool InternalFrame::is_construct_trampoline() const { |
- // TODO(1233795): This doesn't work when the stack frames have been |
- // cooked. We need to find another way of identifying construct |
- // trampoline frames possibly by manipulating the context field like |
- // we do for argument adaptor frames. |
- return IsConstructTrampolineFrame(pc()); |
-} |
- |
- |
inline JavaScriptFrame* JavaScriptFrameIterator::frame() const { |
// TODO(1233797): The frame hierarchy needs to change. It's |
// problematic that we can't use the safe-cast operator to cast to |