Bug 121637

Summary:

Move CCallHelpers and AssemblyHelpers into jit/ and have JSInterfaceJIT use them

Product:

WebKit

Reporter:

Filip Pizlo <fpizlo>

Component:

JavaScriptCore

Assignee:

Filip Pizlo <fpizlo>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

barraclough, bfulgham, commit-queue, ggaren, gyuyoung.kim, mark.lam, mhahnenberg, msaboff, oliver, rakuco, sam

Priority:

Version:

528+ (Nightly build)

Hardware:

All

OS:

All

Bug Depends on:

121651

Bug Blocks:

121641

Attachments:

Description	Flags
patch for landing	none
the patch	none
patch for relanding	none

Filip Pizlo

Reported 2013-09-19 14:21:59 PDT

rs=msaboff, will post for EWS.

Attachments
patch for landing (256.31 KB, patch) 2013-09-19 14:39 PDT, Filip Pizlo	no flags	Details Formatted Diff Diff
the patch (256.34 KB, patch) 2013-09-19 14:48 PDT, Filip Pizlo	no flags	Details Formatted Diff Diff
patch for relanding (251.15 KB, patch) 2013-09-19 21:34 PDT, Filip Pizlo	no flags	Details Formatted Diff Diff
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.

Filip Pizlo

Comment 1 2013-09-19 14:39:35 PDT

Created attachment 212099 [details] patch for landing

Filip Pizlo

Comment 2 2013-09-19 14:48:25 PDT

Created attachment 212101 [details] the patch

WebKit Commit Bot

Comment 3 2013-09-19 14:50:11 PDT

Attachment 212101 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/CMakeLists.txt', u'Source/JavaScriptCore/ChangeLog', u'Source/JavaScriptCore/GNUmakefile.list.am', u'Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj', u'Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj', u'Source/JavaScriptCore/Target.pri', u'Source/JavaScriptCore/bytecode/ValueRecovery.h', u'Source/JavaScriptCore/dfg/DFGAssemblyHelpers.cpp', u'Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h', u'Source/JavaScriptCore/dfg/DFGBinarySwitch.h', u'Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp', u'Source/JavaScriptCore/dfg/DFGCCallHelpers.h', u'Source/JavaScriptCore/dfg/DFGDisassembler.cpp', u'Source/JavaScriptCore/dfg/DFGFPRInfo.h', u'Source/JavaScriptCore/dfg/DFGGPRInfo.h', u'Source/JavaScriptCore/dfg/DFGGraph.cpp', u'Source/JavaScriptCore/dfg/DFGGraph.h', u'Source/JavaScriptCore/dfg/DFGJITCompiler.h', u'Source/JavaScriptCore/dfg/DFGOSRExit.cpp', u'Source/JavaScriptCore/dfg/DFGOSRExit.h', u'Source/JavaScriptCore/dfg/DFGOSRExitCompiler.h', u'Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.h', u'Source/JavaScriptCore/dfg/DFGRegisterBank.h', u'Source/JavaScriptCore/dfg/DFGRegisterSet.h', u'Source/JavaScriptCore/dfg/DFGRepatch.cpp', u'Source/JavaScriptCore/dfg/DFGSilentRegisterSavePlan.h', u'Source/JavaScriptCore/dfg/DFGThunks.cpp', u'Source/JavaScriptCore/dfg/DFGVariableEvent.cpp', u'Source/JavaScriptCore/ftl/FTLCArgumentGetter.h', u'Source/JavaScriptCore/ftl/FTLCompile.cpp', u'Source/JavaScriptCore/ftl/FTLExitThunkGenerator.h', u'Source/JavaScriptCore/ftl/FTLLink.cpp', u'Source/JavaScriptCore/ftl/FTLThunks.cpp', u'Source/JavaScriptCore/jit/AssemblyHelpers.cpp', u'Source/JavaScriptCore/jit/AssemblyHelpers.h', u'Source/JavaScriptCore/jit/CCallHelpers.h', u'Source/JavaScriptCore/jit/FPRInfo.h', u'Source/JavaScriptCore/jit/GPRInfo.h', u'Source/JavaScriptCore/jit/JIT.cpp', u'Source/JavaScriptCore/jit/JIT.h', u'Source/JavaScriptCore/jit/JITPropertyAccess.cpp', u'Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp', u'Source/JavaScriptCore/jit/JSInterfaceJIT.h', u'Source/JavaScriptCore/jit/SpecializedThunkJIT.h', u'Source/JavaScriptCore/jit/ThunkGenerators.cpp', u'Source/JavaScriptCore/llint/LLIntThunks.cpp', u'Source/JavaScriptCore/runtime/JSCJSValue.h']" exit_code: 1 Source/JavaScriptCore/dfg/DFGJITCompiler.h:33: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/dfg/DFGJITCompiler.h:36: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/jit/AssemblyHelpers.h:37: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/jit/AssemblyHelpers.h:364: The parameter name "codeOrigin" adds no information, so it should be removed. [readability/parameter_name] [5] Source/JavaScriptCore/jit/GPRInfo.h:123: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/JavaScriptCore/jit/GPRInfo.h:272: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/JavaScriptCore/jit/GPRInfo.h:372: One space before end of line comments [whitespace/comments] [5] Source/JavaScriptCore/jit/GPRInfo.h:373: One space before end of line comments [whitespace/comments] [5] Source/JavaScriptCore/ftl/FTLLink.cpp:33: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/dfg/DFGThunks.cpp:33: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/ftl/FTLCompile.cpp:32: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/jit/FPRInfo.h:65: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Source/JavaScriptCore/jit/FPRInfo.h:136: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Source/JavaScriptCore/bytecode/ValueRecovery.h:30: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/dfg/DFGRegisterBank.h:32: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/dfg/DFGRegisterBank.h:363: gpr_iterator is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/JavaScriptCore/dfg/DFGRegisterBank.h:364: fpr_iterator is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/JavaScriptCore/jit/JSInterfaceJIT.h:42: Code inside a namespace should not be indented. [whitespace/indent] [4] Source/JavaScriptCore/dfg/DFGGraph.h:35: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/dfg/DFGOSRExit.h:36: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/ftl/FTLThunks.cpp:31: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/dfg/DFGRepatch.cpp:32: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 22 in 41 files If any of these errors are false positives, please file a bug against check-webkit-style.

Filip Pizlo

Comment 4 2013-09-19 15:10:35 PDT

Landed in http://trac.webkit.org/changeset/156120

WebKit Commit Bot

Comment 5 2013-09-19 18:20:00 PDT

Re-opened since this is blocked by bug 121651

Filip Pizlo

Comment 6 2013-09-19 21:34:45 PDT

Created attachment 212123 [details] patch for relanding

WebKit Commit Bot

Comment 7 2013-09-19 21:37:25 PDT

Attachment 212123 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/CMakeLists.txt', u'Source/JavaScriptCore/ChangeLog', u'Source/JavaScriptCore/GNUmakefile.list.am', u'Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj', u'Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj', u'Source/JavaScriptCore/Target.pri', u'Source/JavaScriptCore/bytecode/CodeBlock.cpp', u'Source/JavaScriptCore/bytecode/CodeBlock.h', u'Source/JavaScriptCore/bytecode/ValueRecovery.h', u'Source/JavaScriptCore/dfg/DFGAssemblyHelpers.cpp', u'Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h', u'Source/JavaScriptCore/dfg/DFGBinarySwitch.h', u'Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp', u'Source/JavaScriptCore/dfg/DFGCCallHelpers.h', u'Source/JavaScriptCore/dfg/DFGDisassembler.cpp', u'Source/JavaScriptCore/dfg/DFGFPRInfo.h', u'Source/JavaScriptCore/dfg/DFGGPRInfo.h', u'Source/JavaScriptCore/dfg/DFGGraph.cpp', u'Source/JavaScriptCore/dfg/DFGGraph.h', u'Source/JavaScriptCore/dfg/DFGJITCompiler.h', u'Source/JavaScriptCore/dfg/DFGOSRExit.cpp', u'Source/JavaScriptCore/dfg/DFGOSRExit.h', u'Source/JavaScriptCore/dfg/DFGOSRExitCompiler.h', u'Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.h', u'Source/JavaScriptCore/dfg/DFGRegisterBank.h', u'Source/JavaScriptCore/dfg/DFGRegisterSet.h', u'Source/JavaScriptCore/dfg/DFGRepatch.cpp', u'Source/JavaScriptCore/dfg/DFGSilentRegisterSavePlan.h', u'Source/JavaScriptCore/dfg/DFGThunks.cpp', u'Source/JavaScriptCore/dfg/DFGVariableEvent.cpp', u'Source/JavaScriptCore/ftl/FTLCArgumentGetter.h', u'Source/JavaScriptCore/ftl/FTLCompile.cpp', u'Source/JavaScriptCore/ftl/FTLExitThunkGenerator.h', u'Source/JavaScriptCore/ftl/FTLLink.cpp', u'Source/JavaScriptCore/ftl/FTLThunks.cpp', u'Source/JavaScriptCore/jit/AssemblyHelpers.cpp', u'Source/JavaScriptCore/jit/AssemblyHelpers.h', u'Source/JavaScriptCore/jit/CCallHelpers.h', u'Source/JavaScriptCore/jit/FPRInfo.h', u'Source/JavaScriptCore/jit/GPRInfo.h', u'Source/JavaScriptCore/jit/JIT.cpp', u'Source/JavaScriptCore/jit/JIT.h', u'Source/JavaScriptCore/jit/JITPropertyAccess.cpp', u'Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp', u'Source/JavaScriptCore/jit/JSInterfaceJIT.h', u'Source/JavaScriptCore/jit/SpecializedThunkJIT.h', u'Source/JavaScriptCore/jit/ThunkGenerators.cpp', u'Source/JavaScriptCore/llint/LLIntThunks.cpp', u'Source/JavaScriptCore/runtime/JSCJSValue.h']" exit_code: 1 Source/JavaScriptCore/jit/AssemblyHelpers.h:364: The parameter name "codeOrigin" adds no information, so it should be removed. [readability/parameter_name] [5] Source/JavaScriptCore/jit/GPRInfo.h:123: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/JavaScriptCore/jit/GPRInfo.h:272: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/JavaScriptCore/jit/GPRInfo.h:372: One space before end of line comments [whitespace/comments] [5] Source/JavaScriptCore/jit/GPRInfo.h:373: One space before end of line comments [whitespace/comments] [5] Source/JavaScriptCore/ftl/FTLCompile.cpp:32: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/jit/FPRInfo.h:65: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Source/JavaScriptCore/jit/FPRInfo.h:136: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Source/JavaScriptCore/bytecode/ValueRecovery.h:30: Alphabetical sorting problem. [build/include_order] [4] Source/JavaScriptCore/dfg/DFGRegisterBank.h:363: gpr_iterator is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/JavaScriptCore/dfg/DFGRegisterBank.h:364: fpr_iterator is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/JavaScriptCore/jit/JSInterfaceJIT.h:42: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 12 in 43 files If any of these errors are false positives, please file a bug against check-webkit-style.

Brent Fulgham

Comment 8 2013-09-20 09:38:23 PDT

The latest patch appears to work perfectly on Windows.

Filip Pizlo

Comment 9 2013-09-20 11:26:22 PDT

(In reply to comment #8) > The latest patch appears to work perfectly on Windows. Excellent. Will reland then!

Filip Pizlo

Comment 10 2013-09-20 12:53:24 PDT

Relanded in http://trac.webkit.org/changeset/156184

Note You need to log in before you can comment on or make changes to this bug.