ChangeLog

2015-10-27  Csaba Osztrogonác  <ossy@webkit.org>

        [FTL] Fix the build with LLVM 3.7

        https://bugs.webkit.org/show_bug.cgi?id=150595

        Reviewed by NOBODY (OOPS!).

        * llvm/LLVMAPI.h:

        * llvm/LLVMAPIFunctions.h:

        * llvm/library/LLVMExports.cpp:

        (initializeAndGetJSCLLVMAPI):

2015-10-24  Brian Burg  <bburg@apple.com>

        Teach create_hash_table to omit builtins macros when generating tables for native-only objects

Source/JavaScriptCore/llvm/LLVMAPI.h

@@struct LLVMAPI {

    
    // Functions that we add conditionally.

    void (*AddLowerSwitchPass)(LLVMPassManagerRef PM);

    // 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

};

extern LLVMAPI* llvm;

Source/JavaScriptCore/llvm/LLVMAPIFunctions.h

    macro(LLVMValueRef, BuildSwitch, (LLVMBuilderRef, LLVMValueRef V, LLVMBasicBlockRef Else, unsigned NumCases)) \

    macro(LLVMValueRef, BuildIndirectBr, (LLVMBuilderRef B, LLVMValueRef Addr, unsigned NumDests)) \

    macro(LLVMValueRef, BuildInvoke, (LLVMBuilderRef, LLVMValueRef Fn, LLVMValueRef *Args, unsigned NumArgs, LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch, const char *Name)) \

415 macro(LLVMValueRef, BuildLandingPad, (LLVMBuilderRef B, LLVMTypeRef Ty, LLVMValueRef PersFn, unsigned NumClauses, const char *Name)) \

    macro(LLVMValueRef, BuildResume, (LLVMBuilderRef B, LLVMValueRef Exn)) \

    macro(LLVMValueRef, BuildUnreachable, (LLVMBuilderRef)) \

    macro(void, AddCase, (LLVMValueRef Switch, LLVMValueRef OnVal, LLVMBasicBlockRef Dest)) \

Source/JavaScriptCore/llvm/library/LLVMExports.cpp

@@extern "C" JSC::LLVMAPI* initializeAndGetJSCLLVMAPI(

#if LLVM_VERSION_MAJOR >= 4 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 6)

    result->AddLowerSwitchPass = LLVMAddLowerSwitchPass;

#endif

139

    // Add LLVMBuildLandingPad manually, because it has different prototype with LLVM 3.7 and prior versions.

    result->BuildLandingPad = LLVMBuildLandingPad;

    return result;

}