int Optimized, const char *Flags,
unsigned RuntimeVersion) {
DIBuilder *D = unwrap(Dref);
- DICompileUnit CU = D->createCompileUnit(Lang, File, Dir, Producer, Optimized,
- Flags, RuntimeVersion);
- return wrap(CU);
+ return wrap(D->createCompileUnit(Lang, File, Dir, Producer, Optimized, Flags,
+ RuntimeVersion));
}
LLVMMetadataRef LLVMDIBuilderCreateFile(LLVMDIBuilderRef Dref, const char *File,
const char *Dir) {
DIBuilder *D = unwrap(Dref);
- DIFile F = D->createFile(File, Dir);
- return wrap(F);
+ return wrap(D->createFile(File, Dir));
}
LLVMMetadataRef LLVMDIBuilderCreateLexicalBlock(LLVMDIBuilderRef Dref,
unsigned Line,
unsigned Column) {
DIBuilder *D = unwrap(Dref);
- DILexicalBlock LB =
- D->createLexicalBlock(DIDescriptor(unwrap<MDLocalScope>(Scope)),
- unwrap<MDFile>(File), Line, Column);
+ auto *LB = D->createLexicalBlock(unwrap<DILocalScope>(Scope),
+ unwrap<DIFile>(File), Line, Column);
return wrap(LB);
}
LLVMMetadataRef File,
unsigned Discriminator) {
DIBuilder *D = unwrap(Dref);
- DILexicalBlockFile LBF =
- D->createLexicalBlockFile(DIDescriptor(unwrap<MDLocalScope>(Scope)),
- unwrap<MDFile>(File), Discriminator);
- return wrap(LBF);
+ return wrap(D->createLexicalBlockFile(unwrap<DILocalScope>(Scope),
+ unwrap<DIFile>(File), Discriminator));
}
LLVMMetadataRef LLVMDIBuilderCreateFunction(
LLVMMetadataRef CompositeType, int IsLocalToUnit, int IsDefinition,
unsigned ScopeLine, unsigned Flags, int IsOptimized, LLVMValueRef Func) {
DIBuilder *D = unwrap(Dref);
- DISubprogram SP = D->createFunction(
- DIDescriptor(unwrap<MDScope>(Scope)), Name, LinkageName,
- File ? unwrap<MDFile>(File) : nullptr, Line,
- unwrap<MDCompositeTypeBase>(CompositeType), IsLocalToUnit, IsDefinition,
- ScopeLine, Flags, IsOptimized, unwrap<Function>(Func));
- return wrap(SP);
+ return wrap(D->createFunction(unwrap<DIScope>(Scope), Name, LinkageName,
+ File ? unwrap<DIFile>(File) : nullptr, Line,
+ unwrap<DISubroutineType>(CompositeType),
+ IsLocalToUnit, IsDefinition, ScopeLine, Flags,
+ IsOptimized, unwrap<Function>(Func)));
}
LLVMMetadataRef LLVMDIBuilderCreateLocalVariable(
- LLVMDIBuilderRef Dref, unsigned Tag, LLVMMetadataRef Scope,
+ LLVMDIBuilderRef Dref, unsigned, LLVMMetadataRef Scope,
const char *Name, LLVMMetadataRef File, unsigned Line, LLVMMetadataRef Ty,
int AlwaysPreserve, unsigned Flags, unsigned ArgNo) {
DIBuilder *D = unwrap(Dref);
- DIVariable V = D->createLocalVariable(
- Tag, DIDescriptor(unwrap<MDScope>(Scope)), Name, unwrap<MDFile>(File),
- Line, unwrap<MDType>(Ty), AlwaysPreserve, Flags, ArgNo);
- return wrap(V);
+ // FIXME: Update the Go bindings to match the DIBuilder API.
+ if (ArgNo)
+ return wrap(D->createParameterVariable(
+ unwrap<DIScope>(Scope), Name, ArgNo, unwrap<DIFile>(File), Line,
+ unwrap<DIType>(Ty), AlwaysPreserve, Flags));
+ return wrap(D->createAutoVariable(unwrap<DIScope>(Scope), Name,
+ unwrap<DIFile>(File), Line,
+ unwrap<DIType>(Ty), AlwaysPreserve, Flags));
}
LLVMMetadataRef LLVMDIBuilderCreateBasicType(LLVMDIBuilderRef Dref,
uint64_t AlignInBits,
unsigned Encoding) {
DIBuilder *D = unwrap(Dref);
- DIBasicType T = D->createBasicType(Name, SizeInBits, AlignInBits, Encoding);
- return wrap(T);
+ return wrap(D->createBasicType(Name, SizeInBits, AlignInBits, Encoding));
}
LLVMMetadataRef LLVMDIBuilderCreatePointerType(LLVMDIBuilderRef Dref,
uint64_t AlignInBits,
const char *Name) {
DIBuilder *D = unwrap(Dref);
- DIDerivedType T = D->createPointerType(unwrap<MDType>(PointeeType),
- SizeInBits, AlignInBits, Name);
- return wrap(T);
+ return wrap(D->createPointerType(unwrap<DIType>(PointeeType), SizeInBits,
+ AlignInBits, Name));
}
LLVMMetadataRef
LLVMDIBuilderCreateSubroutineType(LLVMDIBuilderRef Dref, LLVMMetadataRef File,
LLVMMetadataRef ParameterTypes) {
DIBuilder *D = unwrap(Dref);
- DICompositeType CT =
- D->createSubroutineType(File ? unwrap<MDFile>(File) : nullptr,
- DITypeArray(unwrap<MDTuple>(ParameterTypes)));
- return wrap(CT);
+ return wrap(
+ D->createSubroutineType(File ? unwrap<DIFile>(File) : nullptr,
+ DITypeRefArray(unwrap<MDTuple>(ParameterTypes))));
}
LLVMMetadataRef LLVMDIBuilderCreateStructType(
uint64_t AlignInBits, unsigned Flags, LLVMMetadataRef DerivedFrom,
LLVMMetadataRef ElementTypes) {
DIBuilder *D = unwrap(Dref);
- DICompositeType CT = D->createStructType(
- DIDescriptor(unwrap<MDScope>(Scope)), Name,
- File ? unwrap<MDFile>(File) : nullptr, Line, SizeInBits, AlignInBits,
- Flags, DerivedFrom ? unwrap<MDType>(DerivedFrom) : nullptr,
- ElementTypes ? DIArray(unwrap<MDTuple>(ElementTypes)) : nullptr);
- return wrap(CT);
+ return wrap(D->createStructType(
+ unwrap<DIScope>(Scope), Name, File ? unwrap<DIFile>(File) : nullptr, Line,
+ SizeInBits, AlignInBits, Flags,
+ DerivedFrom ? unwrap<DIType>(DerivedFrom) : nullptr,
+ ElementTypes ? DINodeArray(unwrap<MDTuple>(ElementTypes)) : nullptr));
}
LLVMMetadataRef LLVMDIBuilderCreateReplaceableCompositeType(
unsigned RuntimeLang, uint64_t SizeInBits, uint64_t AlignInBits,
unsigned Flags) {
DIBuilder *D = unwrap(Dref);
- DICompositeType CT = D->createReplaceableCompositeType(
- Tag, Name, DIDescriptor(unwrap<MDScope>(Scope)),
- File ? unwrap<MDFile>(File) : nullptr, Line, RuntimeLang, SizeInBits,
- AlignInBits, Flags);
- return wrap(CT);
+ return wrap(D->createReplaceableCompositeType(
+ Tag, Name, unwrap<DIScope>(Scope), File ? unwrap<DIFile>(File) : nullptr,
+ Line, RuntimeLang, SizeInBits, AlignInBits, Flags));
}
LLVMMetadataRef
uint64_t AlignInBits, uint64_t OffsetInBits,
unsigned Flags, LLVMMetadataRef Ty) {
DIBuilder *D = unwrap(Dref);
- DIDerivedType DT = D->createMemberType(
- DIDescriptor(unwrap<MDScope>(Scope)), Name,
- File ? unwrap<MDFile>(File) : nullptr, Line, SizeInBits, AlignInBits,
- OffsetInBits, Flags, unwrap<MDType>(Ty));
- return wrap(DT);
+ return wrap(D->createMemberType(
+ unwrap<DIScope>(Scope), Name, File ? unwrap<DIFile>(File) : nullptr, Line,
+ SizeInBits, AlignInBits, OffsetInBits, Flags, unwrap<DIType>(Ty)));
}
LLVMMetadataRef LLVMDIBuilderCreateArrayType(LLVMDIBuilderRef Dref,
LLVMMetadataRef ElementType,
LLVMMetadataRef Subscripts) {
DIBuilder *D = unwrap(Dref);
- DICompositeType CT =
- D->createArrayType(SizeInBits, AlignInBits, unwrap<MDType>(ElementType),
- DIArray(unwrap<MDTuple>(Subscripts)));
- return wrap(CT);
+ return wrap(D->createArrayType(SizeInBits, AlignInBits,
+ unwrap<DIType>(ElementType),
+ DINodeArray(unwrap<MDTuple>(Subscripts))));
}
LLVMMetadataRef LLVMDIBuilderCreateTypedef(LLVMDIBuilderRef Dref,
LLVMMetadataRef File, unsigned Line,
LLVMMetadataRef Context) {
DIBuilder *D = unwrap(Dref);
- DIDerivedType DT = D->createTypedef(
- unwrap<MDType>(Ty), Name, File ? unwrap<MDFile>(File) : nullptr, Line,
- Context ? DIDescriptor(unwrap<MDScope>(Context)) : DIDescriptor());
- return wrap(DT);
+ return wrap(D->createTypedef(unwrap<DIType>(Ty), Name,
+ File ? unwrap<DIFile>(File) : nullptr, Line,
+ Context ? unwrap<DIScope>(Context) : nullptr));
}
LLVMMetadataRef LLVMDIBuilderGetOrCreateSubrange(LLVMDIBuilderRef Dref,
int64_t Lo, int64_t Count) {
DIBuilder *D = unwrap(Dref);
- DISubrange S = D->getOrCreateSubrange(Lo, Count);
- return wrap(S);
+ return wrap(D->getOrCreateSubrange(Lo, Count));
}
LLVMMetadataRef LLVMDIBuilderGetOrCreateArray(LLVMDIBuilderRef Dref,
DIBuilder *D = unwrap(Dref);
Metadata **DataValue = unwrap(Data);
ArrayRef<Metadata *> Elements(DataValue, Length);
- DIArray A = D->getOrCreateArray(Elements);
+ DINodeArray A = D->getOrCreateArray(Elements);
return wrap(A.get());
}
DIBuilder *D = unwrap(Dref);
Metadata **DataValue = unwrap(Data);
ArrayRef<Metadata *> Elements(DataValue, Length);
- DITypeArray A = D->getOrCreateTypeArray(Elements);
+ DITypeRefArray A = D->getOrCreateTypeArray(Elements);
return wrap(A.get());
}
LLVMMetadataRef LLVMDIBuilderCreateExpression(LLVMDIBuilderRef Dref,
int64_t *Addr, size_t Length) {
DIBuilder *D = unwrap(Dref);
- DIExpression Expr = D->createExpression(ArrayRef<int64_t>(Addr, Length));
- return wrap(Expr);
+ return wrap(D->createExpression(ArrayRef<int64_t>(Addr, Length)));
}
LLVMValueRef LLVMDIBuilderInsertDeclareAtEnd(LLVMDIBuilderRef Dref,
LLVMMetadataRef VarInfo,
LLVMMetadataRef Expr,
LLVMBasicBlockRef Block) {
+ // Fail immediately here until the llgo folks update their bindings. The
+ // called function is going to assert out anyway.
+ llvm_unreachable("DIBuilder API change requires a DebugLoc");
+
DIBuilder *D = unwrap(Dref);
- Instruction *Instr =
- D->insertDeclare(unwrap(Storage), unwrap<MDLocalVariable>(VarInfo),
- unwrap<MDExpression>(Expr), unwrap(Block));
+ Instruction *Instr = D->insertDeclare(
+ unwrap(Storage), unwrap<DILocalVariable>(VarInfo),
+ unwrap<DIExpression>(Expr), /* DebugLoc */ nullptr, unwrap(Block));
return wrap(Instr);
}
LLVMMetadataRef VarInfo,
LLVMMetadataRef Expr,
LLVMBasicBlockRef Block) {
+ // Fail immediately here until the llgo folks update their bindings. The
+ // called function is going to assert out anyway.
+ llvm_unreachable("DIBuilder API change requires a DebugLoc");
+
DIBuilder *D = unwrap(Dref);
Instruction *Instr = D->insertDbgValueIntrinsic(
- unwrap(Val), Offset, unwrap<MDLocalVariable>(VarInfo),
- unwrap<MDExpression>(Expr), unwrap(Block));
+ unwrap(Val), Offset, unwrap<DILocalVariable>(VarInfo),
+ unwrap<DIExpression>(Expr), /* DebugLoc */ nullptr, unwrap(Block));
return wrap(Instr);
}
projects / oota-llvm.git / blobdiff