Merge pull request #33916 from JuliaLang/jn/llvm9-10

llvm: supporting work for using v9 and v10-dev

Author: vtjnash

src/ccall.cpp

@@ -1981,7 +1981,7 @@ jl_cgval_t function_sig_t::emit_a_ccall(
                     // ARM and AArch64 can use a LLVM type larger than the julia type.
                     // When this happens, cast through memory.
                     auto slot = emit_static_alloca(ctx, resultTy);
-                    slot->setAlignment(boxalign);
+                    slot->setAlignment(Align(boxalign));
                     ctx.builder.CreateAlignedStore(result, slot, boxalign);
                     emit_memcpy(ctx, strct, tbaa, slot, tbaa, rtsz, boxalign, tbaa);
                 }

src/cgutils.cpp

@@ -2265,7 +2265,7 @@ static AllocaInst *try_emit_union_alloca(jl_codectx_t &ctx, jl_uniontype_t *ut,
         Type *AT = ArrayType::get(IntegerType::get(jl_LLVMContext, 8 * min_align), (nbytes + min_align - 1) / min_align);
         AllocaInst *lv = emit_static_alloca(ctx, AT);
         if (align > 1)
-            lv->setAlignment(align);
+            lv->setAlignment(Align(align));
         return lv;
     }
     return NULL;

src/clangsa/GCChecker.cpp

@@ -17,7 +17,9 @@
 #else
 #include "clang/StaticAnalyzer/Core/CheckerRegistry.h"
 #endif
+
 #include <iostream>
+#include <memory>
 
 #if defined(__GNUC__)
 #  define USED_FUNC __attribute__((used))
@@ -28,12 +30,18 @@
 #  define USED_FUNC
 #endif
 
+#if LLVM_VERSION_MAJOR >= 10
+using std::make_unique;
+#else
+using llvm::make_unique;
+#endif
+
 namespace {
     using namespace clang;
     using namespace ento;
 
     #define PDP std::shared_ptr<PathDiagnosticPiece>
-    #define MakePDP llvm::make_unique<PathDiagnosticEventPiece>
+    #define MakePDP make_unique<PathDiagnosticEventPiece>
 
     class GCChecker : public Checker<eval::Call,
                                             check::BeginFunction,
@@ -387,13 +395,13 @@ PDP GCChecker::GCValueBugVisitor::ExplainNoPropagationFromExpr(const clang::Expr
     const ValueState *ValS = N->getState()->get<GCValueMap>(Parent);
     assert(ValS);
     if (ValS->isPotentiallyFreed()) {
-        BR.addVisitor(llvm::make_unique<GCValueBugVisitor>(Parent));
+        BR.addVisitor(make_unique<GCValueBugVisitor>(Parent));
         return MakePDP(Pos, "Root not propagated because it may have been freed. Tracking.");
     } else if (ValS->isRooted()) {
-        BR.addVisitor(llvm::make_unique<GCValueBugVisitor>(Parent));
+        BR.addVisitor(make_unique<GCValueBugVisitor>(Parent));
         return MakePDP(Pos, "Root was not propagated due to a bug. Tracking base value.");
     } else {
-        BR.addVisitor(llvm::make_unique<GCValueBugVisitor>(Parent));
+        BR.addVisitor(make_unique<GCValueBugVisitor>(Parent));
         return MakePDP(Pos, "No Root to propagate. Tracking.");
     }
 }
@@ -506,8 +514,8 @@ void GCChecker::report_error(callback f, CheckerContext &C, const char *message)
     if (!BT)
         BT.reset(new BugType(this, "Invalid GC thingy",
                            categories::LogicError));
-    auto Report = llvm::make_unique<BugReport>(*BT, message, N);
-    Report->addVisitor(llvm::make_unique<GCBugVisitor>());
+    auto Report = make_unique<BugReport>(*BT, message, N);
+    Report->addVisitor(make_unique<GCBugVisitor>());
     f(Report.get());
     C.emitReport(std::move(Report));
 }
@@ -522,10 +530,10 @@ void GCChecker::report_value_error(CheckerContext &C, SymbolRef Sym, const char
     if (!BT)
         BT.reset(new BugType(this, "Invalid GC thingy",
                            categories::LogicError));
-    auto Report = llvm::make_unique<BugReport>(*BT, message, N);
-    Report->addVisitor(llvm::make_unique<GCValueBugVisitor>(Sym));
-    Report->addVisitor(llvm::make_unique<GCBugVisitor>());
-    Report->addVisitor(llvm::make_unique<ConditionBRVisitor>());
+    auto Report = make_unique<BugReport>(*BT, message, N);
+    Report->addVisitor(make_unique<GCValueBugVisitor>(Sym));
+    Report->addVisitor(make_unique<GCBugVisitor>());
+    Report->addVisitor(make_unique<ConditionBRVisitor>());
     if (!range.isInvalid()) {
         Report->addRange(range);
     }

src/codegen.cpp

@@ -2701,7 +2701,7 @@ static bool emit_builtin_call(jl_codectx_t &ctx, jl_cgval_t *ret, jl_value_t *f,
                         ConstantAsMetadata::get(ConstantInt::get(T_int8, union_max)) }));
                     AllocaInst *lv = emit_static_alloca(ctx, AT);
                     if (al > 1)
-                        lv->setAlignment(al);
+                        lv->setAlignment(Align(al));
                     emit_memcpy(ctx, lv, tbaa_arraybuf, ctx.builder.CreateInBoundsGEP(AT, data, idx), tbaa_arraybuf, elsz, al, false);
                     *ret = mark_julia_slot(lv, ety, ctx.builder.CreateNUWAdd(ConstantInt::get(T_int8, 1), tindex), tbaa_arraybuf);
                 }
@@ -3156,7 +3156,7 @@ static jl_cgval_t emit_call_specfun_other(jl_codectx_t &ctx, jl_code_instance_t
     case jl_returninfo_t::Union:
         result = emit_static_alloca(ctx, ArrayType::get(T_int8, returninfo.union_bytes));
         if (returninfo.union_align > 1)
-            result->setAlignment(returninfo.union_align);
+            result->setAlignment(Align(returninfo.union_align));
         argvals[idx] = result;
         idx++;
         break;
@@ -3564,18 +3564,16 @@ static jl_cgval_t emit_varinfo(jl_codectx_t &ctx, jl_varinfo_t &vi, jl_sym_t *va
             AllocaInst *varslot = cast<AllocaInst>(vi.value.V);
             Type *T = varslot->getAllocatedType();
             assert(!varslot->isArrayAllocation() && "variables not expected to be VLA");
-            AllocaInst *ssaslot = emit_static_alloca(ctx, T);
-            unsigned al = varslot->getAlignment();
-            if (al)
-                ssaslot->setAlignment(al);
+            AllocaInst *ssaslot = cast<AllocaInst>(varslot->clone());
+            ssaslot->insertAfter(varslot);
             if (vi.isVolatile) {
                 Value *unbox = ctx.builder.CreateLoad(vi.value.V, true);
                 ctx.builder.CreateStore(unbox, ssaslot);
             }
             else {
                 const DataLayout &DL = jl_data_layout;
                 uint64_t sz = DL.getTypeStoreSize(T);
-                emit_memcpy(ctx, ssaslot, tbaa_stack, vi.value, sz, al);
+                emit_memcpy(ctx, ssaslot, tbaa_stack, vi.value, sz, ssaslot->getAlignment());
             }
             Value *tindex = NULL;
             if (vi.pTIndex)
@@ -5253,7 +5251,7 @@ static Function *gen_invoke_wrapper(jl_method_instance_t *lam, jl_value_t *jlret
     case jl_returninfo_t::Union:
         result = ctx.builder.CreateAlloca(ArrayType::get(T_int8, f.union_bytes));
         if (f.union_align > 1)
-            result->setAlignment(f.union_align);
+            result->setAlignment(Align(f.union_align));
         args[idx] = result;
         idx++;
         break;
@@ -5708,7 +5706,7 @@ static std::unique_ptr<Module> emit_function(
 
     if (returninfo.cc == jl_returninfo_t::Union) {
         f->addAttribute(1, Attribute::getWithDereferenceableBytes(jl_LLVMContext, returninfo.union_bytes));
-        f->addAttribute(1, Attribute::getWithAlignment(jl_LLVMContext, returninfo.union_align));
+        f->addAttribute(1, Attribute::getWithAlignment(jl_LLVMContext, Align(returninfo.union_align)));
     }
 
 #ifdef JL_DEBUG_BUILD