Bug 117327 - 32-bit CallFrame::Location should use Instruction* for BytecodeLocation, not bytecodeOffset
Summary: 32-bit CallFrame::Location should use Instruction* for BytecodeLocation, not ...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: JavaScriptCore (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Mark Lam
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-06 17:04 PDT by Mark Lam
Modified: 2013-06-07 11:24 PDT (History)
5 users (show)

See Also:


Attachments
the patch. (15.49 KB, patch)
2013-06-06 17:40 PDT, Mark Lam
msaboff: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mark Lam 2013-06-06 17:04:32 PDT
CallFrame::trueCallFrame() and DFG's reifyInlinedCallFrames() needs to be fixed for 32-bit code.  Will also fix CallFrame::Location to clearly differentiate between BytecodeInstruction (for 32-bit) and BytecodeOffset (for 64 bit).
Comment 1 Mark Lam 2013-06-06 17:40:06 PDT
Created attachment 203982 [details]
the patch.

Don't need to change CallFrame::trueCallFrame() after all.  CallFrame::setLocationAsBytecodeOffset() can take care of the necessary conversion.
Comment 2 Michael Saboff 2013-06-07 10:42:54 PDT
Comment on attachment 203982 [details]
the patch.

View in context: https://bugs.webkit.org/attachment.cgi?id=203982&action=review

r=me

> Source/JavaScriptCore/ChangeLog:7
> +

Some comments as to what you did.

> Source/JavaScriptCore/interpreter/CallFrame.h:138
> +                BytecodeLocation = 0,
>                  CodeOriginIndex = (1 << 0),
>                  IsInlinedCode = (1 << 1),

I know some of this was from the earlier patch, but it may be less confusing if these where just literal values, 0, 1 & 2.
Comment 3 Mark Lam 2013-06-07 11:24:11 PDT
Thanks for the review.  Feedback applied, and landed in r151329: <http://trac.webkit.org/changeset/151329>.