Bug 150595

Summary: [FTL] Fix the build with LLVM 3.7
Product: WebKit Reporter: Csaba Osztrogonác <ossy>
Component: New BugsAssignee: Csaba Osztrogonác <ossy>
Status: RESOLVED FIXED    
Severity: Normal CC: commit-queue, fpizlo, ossy
Priority: P2    
Version: Other   
Hardware: Unspecified   
OS: Unspecified   
Bug Depends on:    
Bug Blocks: 142128, 143605    
Attachments:
Description Flags
Patch
none
Patch
none
Patch
none
Patch none

Csaba Osztrogonác
Reported 2015-10-27 11:56:32 PDT
build error: ../../Source/JavaScriptCore/llvm/library/LLVMExports.cpp: In function 'JSC::LLVMAPI* initializeAndGetJSCLLVMAPI(void (*)(const char*, ...) volatile, bool*)': ../../Source/JavaScriptCore/llvm/library/LLVMExports.cpp:132:17496: error: invalid conversion from 'LLVMOpaqueValue* (*)(LLVMBuilderRef, LLVMTypeRef, unsigned int, const char*) {aka LLVMOpaqueValue* (*)(LLVMOpaqueBuilder*, LLVMOpaqueType*, unsigned int, const char*)}' to 'LLVMOpaqueValue* (*)(LLVMBuilderRef, LLVMTypeRef, LLVMValueRef, unsigned int, const char*) {aka LLVMOpaqueValue* (*)(LLVMOpaqueBuilder*, LLVMOpaqueType*, LLVMOpaqueValue*, unsigned int, const char*)}' [-fpermissive]
Attachments
Patch (1.85 KB, patch)
2015-10-27 12:02 PDT, Csaba Osztrogonác 		no flags
DetailsFormatted DiffDiff
Patch (3.43 KB, patch)
2015-10-27 12:29 PDT, Csaba Osztrogonác 		no flags
DetailsFormatted DiffDiff
Patch (3.43 KB, patch)
2015-10-28 02:52 PDT, Csaba Osztrogonác 		no flags
DetailsFormatted DiffDiff
Patch (1.73 KB, patch)
2015-11-09 03:03 PST, Csaba Osztrogonác 		no flags
DetailsFormatted DiffDiff
Show Obsolete (3) View All Add attachment proposed patch, testcase, etc.
Csaba Osztrogonác
Comment 1 2015-10-27 12:02:04 PDT
Created attachment 264147 [details] Patch WIP patch, it fixed the build with LLVM 3.7, but we need a fix works with 3.6 and 3.7 too.
Csaba Osztrogonác
Comment 2 2015-10-27 12:29:56 PDT
Created attachment 264150 [details] Patch
Csaba Osztrogonác
Comment 3 2015-10-28 02:52:56 PDT
Created attachment 264204 [details] Patch EFL EWS was flakey, let's see again.
Darin Adler
Comment 4 2015-10-31 11:01:00 PDT
Comment on attachment 264204 [details] Patch I think Filip should review this.
Csaba Osztrogonác
Comment 5 2015-11-05 01:24:50 PST
(In reply to comment #4) > Comment on attachment 264204 [details] > Patch > > I think Filip should review this. Filip, could you possibly check it?
Csaba Osztrogonác
Comment 6 2015-11-06 22:43:53 PST
Ping?
Filip Pizlo
Comment 7 2015-11-07 08:41:17 PST
Comment on attachment 264204 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=264204&action=review > Source/JavaScriptCore/llvm/LLVMAPI.h:50 > + > + // LLVMBuildLandingPad has different prototype with LLVM 3.7 and prior versions. > +#if LLVM_VERSION_MAJOR >= 4 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 7) > + LLVMValueRef (*BuildLandingPad)(LLVMBuilderRef B, LLVMTypeRef Ty, unsigned NumClauses, const char *Name); > +#else > + LLVMValueRef (*BuildLandingPad)(LLVMBuilderRef B, LLVMTypeRef Ty, LLVMValueRef PersFn, unsigned NumClauses, const char *Name); > +#endif Let's just remove this function instead. We don't call it, and it's a mistake for it to be in the API struct.
Csaba Osztrogonác
Comment 8 2015-11-09 03:03:18 PST
Created attachment 265037 [details] Patch OK, let's remove it. Should we do a general cleanup for other functions too, or just leave them unchaged until we run into any issue?
Filip Pizlo
Comment 9 2015-11-09 09:55:06 PST
(In reply to comment #8) > Created attachment 265037 [details] > Patch > > OK, let's remove it. Should we do a general cleanup for other functions too, > or just leave them unchaged until we run into any issue? Yes, I think that would be very useful!
WebKit Commit Bot
Comment 10 2015-11-09 10:36:59 PST
Comment on attachment 265037 [details] Patch Clearing flags on attachment: 265037 Committed r192164: <http://trac.webkit.org/changeset/192164>
WebKit Commit Bot
Comment 11 2015-11-09 10:37:04 PST
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.