fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallivm: attach DataLayout to module too, not just pass manager.

Browse source 
It looks like it was possible to attach it to both for a long time, however
since llvm r217548 attaching it to just the pass manager is no longer
sufficient and causes bugs (see http://llvm.org/bugs/show_bug.cgi?id=20903).

Tested-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Rafael Ávila de Espíndola 2014-09-16 03:46:02 +02:00 • committed by Roland Scheidegger
parent 145fef9636
commit f6e71ff9eb
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/auxiliary/gallivm/lp_bld_init.c
View file

@ -139,6 +139,7 @@ enum LLVM_CodeGenOpt_Level {
static boolean static boolean
create_pass_manager(struct gallivm_state *gallivm) create_pass_manager(struct gallivm_state *gallivm)
{ {
char *td_str;
assert(!gallivm->passmgr); assert(!gallivm->passmgr);
assert(gallivm->target); assert(gallivm->target);
@ -146,8 +147,14 @@ create_pass_manager(struct gallivm_state *gallivm)
if (!gallivm->passmgr) if (!gallivm->passmgr)
return FALSE; return FALSE;
// Old versions of LLVM get the DataLayout from the pass manager.
LLVMAddTargetData(gallivm->target, gallivm->passmgr); LLVMAddTargetData(gallivm->target, gallivm->passmgr);
// New ones from the Module.
td_str = LLVMCopyStringRepOfTargetData(gallivm->target);
LLVMSetDataLayout(gallivm->module, td_str);
free(td_str);
if ((gallivm_debug & GALLIVM_DEBUG_NO_OPT) == 0) { if ((gallivm_debug & GALLIVM_DEBUG_NO_OPT) == 0) {
/* These are the passes currently listed in llvm-c/Transforms/Scalar.h, /* These are the passes currently listed in llvm-c/Transforms/Scalar.h,
* but there are more on SVN. * but there are more on SVN.