Merge pull request #19070 from JuliaLang/yyc/tests/llvm

Fix compilation on LLVM 4.0
JuliaLang · Oct 24, 2016 · f56d594 · f56d594 · nanosoldier · Oct 24, 2016
2 parents b3d7ee1 + 1b35490
commit f56d594
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/cgutils.cpp b/src/cgutils.cpp
@@ -123,7 +123,14 @@ static DIType julia_type_to_di(jl_value_t *jt, DIBuilder *dbuilder, bool isboxed
  }
  if (jl_is_bitstype(jt)) {
  uint64_t SizeInBits = jl_datatype_nbits(jdt);
- #if JL_LLVM_VERSION >= 30700
+ #if JL_LLVM_VERSION >= 40000
+ llvm::DIType *t = dbuilder->createBasicType(
+ jl_symbol_name(jdt->name->name),
+ SizeInBits,
+ llvm::dwarf::DW_ATE_unsigned);
+ jdt->ditype = t;
+ return t;
+ #elif JL_LLVM_VERSION >= 30700
  llvm::DIType *t = dbuilder->createBasicType(
  jl_symbol_name(jdt->name->name),
  SizeInBits,

diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -4429,6 +4429,7 @@ static std::unique_ptr<Module> emit_function(jl_method_instance_t *lam, jl_code_
  jl_varinfo_t &varinfo = ctx.slots[i];
  if (varinfo.isArgument || s == compiler_temp_sym || s == unused_sym)
  continue;
+ // LLVM 4.0: Assume the variable has default alignment
 #if JL_LLVM_VERSION >= 30800
  varinfo.dinfo = dbuilder.createAutoVariable(
 #else