Bug 150039

Summary:

Each *ById inline cache in the FTL must have its own CallSiteIndex

Product:

WebKit

Reporter:

Saam Barati <saam>

Component:

JavaScriptCore

Assignee:

Saam Barati <saam>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

benjamin, commit-queue, fpizlo, ggaren, gskachkov, keith_miller, mark.lam, msaboff, oliver, sukolsak, ysuzuki

Priority:

Version:

WebKit Nightly Build

Hardware:

Unspecified

OS:

Unspecified

Bug Depends on:

Bug Blocks:

149409

Attachments:

Description	Flags
patch	fpizlo: review+

Description Saam Barati 2015-10-12 11:20:38 PDT

Currently, we create the CallSiteIndex when lowering to LLVM. This is wrong, FTL
might duplicate the inline cache patchpoint, in which case, each patchpoint
will have its own unique set of registers describing it. Therefore, it should
also have a unique call site index. This is strictly necessary for implementing
try/catch in the FTL.

Comment 1 Saam Barati 2015-10-12 12:36:25 PDT

Created attachment 262911 [details]
patch

Comment 2 WebKit Commit Bot 2015-10-12 12:37:45 PDT

Attachment 262911 [details] did not pass style-queue:


ERROR: Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h:85:  Wrong number of spaces before statement. (expected: 12)  [whitespace/indent] [4]
ERROR: Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h:149:  Wrong number of spaces before statement. (expected: 12)  [whitespace/indent] [4]
Total errors found: 2 in 7 files


If any of these errors are false positives, please file a bug against check-webkit-style.

Comment 3 Geoffrey Garen 2015-10-12 12:39:57 PDT

Comment on attachment 262911 [details]
patch

r=me

> Source/JavaScriptCore/dfg/DFGCommonData.cpp:60
> +CallSiteIndex CommonData::addUniqueCallSiteIndexForCodeOrigin(CodeOrigin codeOrigin)

I would take "ForCodeOrigin" out of this function name. In a language like C++, where type is a part of argument signature, you can save a lot on wordiness that way. (Note that you won't lose information at the call site or inside the callee, since both places call the argument "codeOrigin". And you can't make a mistake and pass something else because you'll get a compile error.)

Comment 4 Saam Barati 2015-10-12 13:38:39 PDT

Thanks for the suggestion. I agree that "ForCodeOrigin" is unnecessary in the name.

landed in:
http://trac.webkit.org/changeset/190885