Bug 157890

Summary: [ARM] Remove redefined macro after r200606
Product: WebKit Reporter: Csaba Osztrogonác <ossy>
Component: JavaScriptCoreAssignee: Csaba Osztrogonác <ossy>
Status: RESOLVED FIXED    
Severity: Normal CC: commit-queue, fpizlo, keith_miller, mark.lam, msaboff, ossy, saam
Priority: P2    
Version: Other   
Hardware: Unspecified   
OS: Unspecified   
Bug Depends on:    
Bug Blocks: 108645, 151793    
Attachments:
Description Flags
Patch none

Csaba Osztrogonác
Reported 2016-05-19 05:02:37 PDT
http://trac.webkit.org/changeset/200606 caused the following build failure: ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp:54:0: error: "EABI_32BIT_DUMMY_ARG" redefined [-Werror] #define EABI_32BIT_DUMMY_ARG CCallHelpers::TrustedImm32(0), ^ In file included from ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp:32:0: ../../Source/JavaScriptCore/jit/CCallHelpers.h:47:0: note: this is the location of the previous definition #define EABI_32BIT_DUMMY_ARG TrustedImm32(0), ^ cc1plus: all warnings being treated as errors
Attachments
Patch (2.81 KB, patch)
2016-05-19 05:23 PDT, Csaba Osztrogonác 		no flags
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Csaba Osztrogonác
Comment 1 2016-05-19 05:07:19 PDT
Removing the macro causes this build failure: ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp: In member function 'void JSC::AccessCase::generateImpl(JSC::AccessGenerationState&)': ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp:1101:35: error: 'TrustedImm32' was not declared in this scope ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp:1106:35: error: 'TrustedImm32' was not declared in this scope TrustedImm32 is defined in AbstractMacroAssembler.h which shouldn't be included from PolymorphicAccess.cpp or CCallHelpers.h ...
Csaba Osztrogonác
Comment 2 2016-05-19 05:08:41 PDT
any better idea to fix it?
Csaba Osztrogonác
Comment 3 2016-05-19 05:23:22 PDT
Created attachment 279382 [details] Patch
Csaba Osztrogonác
Comment 4 2016-05-19 05:24:47 PDT
(In reply to comment #2) > any better idea to fix it? I got it, using CCallHelpers::TrustedImm32 everywhere works.
Michael Saboff
Comment 5 2016-05-19 06:42:39 PDT
Comment on attachment 279382 [details] Patch r=me
WebKit Commit Bot
Comment 6 2016-05-19 07:18:12 PDT
Comment on attachment 279382 [details] Patch Clearing flags on attachment: 279382 Committed r201161: <http://trac.webkit.org/changeset/201161>
WebKit Commit Bot
Comment 7 2016-05-19 07:18:16 PDT
All reviewed patches have been landed. Closing bug.
Note You need to log in before you can comment on or make changes to this bug.