@@ -627,8 +627,6 @@ extern "C" bool LLVMRustInlineAsmVerify(LLVMTypeRef Ty, char *Constraints,
627
627
unwrap<FunctionType>(Ty), StringRef (Constraints, ConstraintsLen)));
628
628
}
629
629
630
- typedef DIBuilder *LLVMRustDIBuilderRef;
631
-
632
630
template <typename DIT> DIT *unwrapDIPtr (LLVMMetadataRef Ref) {
633
631
return (DIT *)(Ref ? unwrap<MDNode>(Ref) : nullptr );
634
632
}
@@ -910,21 +908,21 @@ extern "C" void LLVMRustGlobalAddMetadata(LLVMValueRef Global, unsigned Kind,
910
908
}
911
909
912
910
extern " C" LLVMMetadataRef LLVMRustDIBuilderCreateCompileUnit (
913
- LLVMRustDIBuilderRef Builder, unsigned Lang, LLVMMetadataRef FileRef,
911
+ LLVMDIBuilderRef Builder, unsigned Lang, LLVMMetadataRef FileRef,
914
912
const char *Producer, size_t ProducerLen, bool isOptimized,
915
913
const char *Flags, unsigned RuntimeVer, const char *SplitName,
916
914
size_t SplitNameLen, LLVMRustDebugEmissionKind Kind, uint64_t DWOId,
917
915
bool SplitDebugInlining, LLVMRustDebugNameTableKind TableKind) {
918
916
auto *File = unwrapDI<DIFile>(FileRef);
919
917
920
- return wrap (Builder->createCompileUnit (
918
+ return wrap (unwrap ( Builder) ->createCompileUnit (
921
919
Lang, File, StringRef (Producer, ProducerLen), isOptimized, Flags,
922
920
RuntimeVer, StringRef (SplitName, SplitNameLen), fromRust (Kind), DWOId,
923
921
SplitDebugInlining, false , fromRust (TableKind)));
924
922
}
925
923
926
924
extern " C" LLVMMetadataRef
927
- LLVMRustDIBuilderCreateFile (LLVMRustDIBuilderRef Builder, const char *Filename,
925
+ LLVMRustDIBuilderCreateFile (LLVMDIBuilderRef Builder, const char *Filename,
928
926
size_t FilenameLen, const char *Directory,
929
927
size_t DirectoryLen, LLVMRustChecksumKind CSKind,
930
928
const char *Checksum, size_t ChecksumLen,
@@ -937,13 +935,13 @@ LLVMRustDIBuilderCreateFile(LLVMRustDIBuilderRef Builder, const char *Filename,
937
935
std::optional<StringRef> oSource{};
938
936
if (Source)
939
937
oSource = StringRef (Source, SourceLen);
940
- return wrap (Builder->createFile (StringRef (Filename, FilenameLen),
941
- StringRef (Directory, DirectoryLen), CSInfo ,
942
- oSource));
938
+ return wrap (unwrap ( Builder) ->createFile (StringRef (Filename, FilenameLen),
939
+ StringRef (Directory, DirectoryLen),
940
+ CSInfo, oSource));
943
941
}
944
942
945
943
extern " C" LLVMMetadataRef LLVMRustDIBuilderCreateFunction (
946
- LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
944
+ LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
947
945
size_t NameLen, const char *LinkageName, size_t LinkageNameLen,
948
946
LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty,
949
947
unsigned ScopeLine, LLVMRustDIFlags Flags, LLVMRustDISPFlags SPFlags,
@@ -952,7 +950,7 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFunction(
952
950
DITemplateParameterArray (unwrap<MDTuple>(TParam));
953
951
DISubprogram::DISPFlags llvmSPFlags = fromRust (SPFlags);
954
952
DINode::DIFlags llvmFlags = fromRust (Flags);
955
- DISubprogram *Sub = Builder->createFunction (
953
+ DISubprogram *Sub = unwrap ( Builder) ->createFunction (
956
954
unwrapDI<DIScope>(Scope), StringRef (Name, NameLen),
957
955
StringRef (LinkageName, LinkageNameLen), unwrapDI<DIFile>(File), LineNo,
958
956
unwrapDI<DISubroutineType>(Ty), ScopeLine, llvmFlags, llvmSPFlags,
@@ -963,15 +961,15 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFunction(
963
961
}
964
962
965
963
extern " C" LLVMMetadataRef LLVMRustDIBuilderCreateMethod (
966
- LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
964
+ LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
967
965
size_t NameLen, const char *LinkageName, size_t LinkageNameLen,
968
966
LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty,
969
967
LLVMRustDIFlags Flags, LLVMRustDISPFlags SPFlags, LLVMMetadataRef TParam) {
970
968
DITemplateParameterArray TParams =
971
969
DITemplateParameterArray (unwrap<MDTuple>(TParam));
972
970
DISubprogram::DISPFlags llvmSPFlags = fromRust (SPFlags);
973
971
DINode::DIFlags llvmFlags = fromRust (Flags);
974
- DISubprogram *Sub = Builder->createMethod (
972
+ DISubprogram *Sub = unwrap ( Builder) ->createMethod (
975
973
unwrapDI<DIScope>(Scope), StringRef (Name, NameLen),
976
974
StringRef (LinkageName, LinkageNameLen), unwrapDI<DIFile>(File), LineNo,
977
975
unwrapDI<DISubroutineType>(Ty), 0 , 0 ,
@@ -981,12 +979,12 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateMethod(
981
979
}
982
980
983
981
extern " C" LLVMMetadataRef LLVMRustDIBuilderCreateVariantPart (
984
- LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
982
+ LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
985
983
size_t NameLen, LLVMMetadataRef File, unsigned LineNumber,
986
984
uint64_t SizeInBits, uint32_t AlignInBits, LLVMRustDIFlags Flags,
987
985
LLVMMetadataRef Discriminator, LLVMMetadataRef Elements,
988
986
const char *UniqueId, size_t UniqueIdLen) {
989
- return wrap (Builder->createVariantPart (
987
+ return wrap (unwrap ( Builder) ->createVariantPart (
990
988
unwrapDI<DIDescriptor>(Scope), StringRef (Name, NameLen),
991
989
unwrapDI<DIFile>(File), LineNumber, SizeInBits, AlignInBits,
992
990
fromRust (Flags), unwrapDI<DIDerivedType>(Discriminator),
@@ -995,22 +993,22 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateVariantPart(
995
993
}
996
994
997
995
extern " C" LLVMMetadataRef LLVMRustDIBuilderCreateVariantMemberType (
998
- LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
996
+ LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
999
997
size_t NameLen, LLVMMetadataRef File, unsigned LineNo, uint64_t SizeInBits,
1000
998
uint32_t AlignInBits, uint64_t OffsetInBits, LLVMValueRef Discriminant,
1001
999
LLVMRustDIFlags Flags, LLVMMetadataRef Ty) {
1002
1000
llvm::ConstantInt *D = nullptr ;
1003
1001
if (Discriminant) {
1004
1002
D = unwrap<llvm::ConstantInt>(Discriminant);
1005
1003
}
1006
- return wrap (Builder->createVariantMemberType (
1004
+ return wrap (unwrap ( Builder) ->createVariantMemberType (
1007
1005
unwrapDI<DIDescriptor>(Scope), StringRef (Name, NameLen),
1008
1006
unwrapDI<DIFile>(File), LineNo, SizeInBits, AlignInBits, OffsetInBits, D,
1009
1007
fromRust (Flags), unwrapDI<DIType>(Ty)));
1010
1008
}
1011
1009
1012
1010
extern " C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable (
1013
- LLVMRustDIBuilderRef Builder, LLVMMetadataRef Context, const char *Name,
1011
+ LLVMDIBuilderRef Builder, LLVMMetadataRef Context, const char *Name,
1014
1012
size_t NameLen, const char *LinkageName, size_t LinkageNameLen,
1015
1013
LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty,
1016
1014
bool IsLocalToUnit, LLVMValueRef V, LLVMMetadataRef Decl = nullptr ,
@@ -1019,16 +1017,16 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable(
1019
1017
1020
1018
llvm::DIExpression *InitExpr = nullptr ;
1021
1019
if (llvm::ConstantInt *IntVal = llvm::dyn_cast<llvm::ConstantInt>(InitVal)) {
1022
- InitExpr = Builder->createConstantValueExpression (
1020
+ InitExpr = unwrap ( Builder) ->createConstantValueExpression (
1023
1021
IntVal->getValue ().getSExtValue ());
1024
1022
} else if (llvm::ConstantFP *FPVal =
1025
1023
llvm::dyn_cast<llvm::ConstantFP>(InitVal)) {
1026
- InitExpr = Builder->createConstantValueExpression (
1024
+ InitExpr = unwrap ( Builder) ->createConstantValueExpression (
1027
1025
FPVal->getValueAPF ().bitcastToAPInt ().getZExtValue ());
1028
1026
}
1029
1027
1030
1028
llvm::DIGlobalVariableExpression *VarExpr =
1031
- Builder->createGlobalVariableExpression (
1029
+ unwrap ( Builder) ->createGlobalVariableExpression (
1032
1030
unwrapDI<DIDescriptor>(Context), StringRef (Name, NameLen),
1033
1031
StringRef (LinkageName, LinkageNameLen), unwrapDI<DIFile>(File),
1034
1032
LineNo, unwrapDI<DIType>(Ty), IsLocalToUnit,
@@ -1041,17 +1039,17 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable(
1041
1039
}
1042
1040
1043
1041
extern " C" LLVMMetadataRef LLVMRustDIBuilderCreateVariable (
1044
- LLVMRustDIBuilderRef Builder, unsigned Tag, LLVMMetadataRef Scope,
1042
+ LLVMDIBuilderRef Builder, unsigned Tag, LLVMMetadataRef Scope,
1045
1043
const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNo,
1046
1044
LLVMMetadataRef Ty, bool AlwaysPreserve, LLVMRustDIFlags Flags,
1047
1045
unsigned ArgNo, uint32_t AlignInBits) {
1048
1046
if (Tag == 0x100 ) { // DW_TAG_auto_variable
1049
- return wrap (Builder->createAutoVariable (
1047
+ return wrap (unwrap ( Builder) ->createAutoVariable (
1050
1048
unwrapDI<DIDescriptor>(Scope), StringRef (Name, NameLen),
1051
1049
unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), AlwaysPreserve,
1052
1050
fromRust (Flags), AlignInBits));
1053
1051
} else {
1054
- return wrap (Builder->createParameterVariable (
1052
+ return wrap (unwrap ( Builder) ->createParameterVariable (
1055
1053
unwrapDI<DIDescriptor>(Scope), StringRef (Name, NameLen), ArgNo,
1056
1054
unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), AlwaysPreserve,
1057
1055
fromRust (Flags)));
@@ -1066,41 +1064,42 @@ extern "C" void LLVMRustDIBuilderInsertDeclareRecordAtEnd(
1066
1064
unwrap<DIExpression>(Expr), unwrap<DILocation>(DebugLoc), unwrap (Block));
1067
1065
}
1068
1066
1069
- extern " C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerator (
1070
- LLVMRustDIBuilderRef Builder, const char *Name, size_t NameLen,
1071
- const uint64_t Value[2 ], unsigned SizeInBits, bool IsUnsigned) {
1072
- return wrap (Builder->createEnumerator (
1067
+ extern " C" LLVMMetadataRef
1068
+ LLVMRustDIBuilderCreateEnumerator (LLVMDIBuilderRef Builder, const char *Name,
1069
+ size_t NameLen, const uint64_t Value[2 ],
1070
+ unsigned SizeInBits, bool IsUnsigned) {
1071
+ return wrap (unwrap (Builder)->createEnumerator (
1073
1072
StringRef (Name, NameLen),
1074
1073
APSInt (APInt (SizeInBits, ArrayRef<uint64_t >(Value, 2 )), IsUnsigned)));
1075
1074
}
1076
1075
1077
1076
extern " C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerationType (
1078
- LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
1077
+ LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
1079
1078
size_t NameLen, LLVMMetadataRef File, unsigned LineNumber,
1080
1079
uint64_t SizeInBits, uint32_t AlignInBits, LLVMMetadataRef Elements,
1081
1080
LLVMMetadataRef ClassTy, bool IsScoped) {
1082
- return wrap (Builder->createEnumerationType (
1081
+ return wrap (unwrap ( Builder) ->createEnumerationType (
1083
1082
unwrapDI<DIDescriptor>(Scope), StringRef (Name, NameLen),
1084
1083
unwrapDI<DIFile>(File), LineNumber, SizeInBits, AlignInBits,
1085
1084
DINodeArray (unwrapDI<MDTuple>(Elements)), unwrapDI<DIType>(ClassTy),
1086
1085
/* RunTimeLang */ 0 , " " , IsScoped));
1087
1086
}
1088
1087
1089
1088
extern " C" LLVMMetadataRef LLVMRustDIBuilderCreateTemplateTypeParameter (
1090
- LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
1089
+ LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
1091
1090
size_t NameLen, LLVMMetadataRef Ty) {
1092
1091
bool IsDefault = false ; // FIXME: should we ever set this true?
1093
- return wrap (Builder->createTemplateTypeParameter (
1092
+ return wrap (unwrap ( Builder) ->createTemplateTypeParameter (
1094
1093
unwrapDI<DIDescriptor>(Scope), StringRef (Name, NameLen),
1095
1094
unwrapDI<DIType>(Ty), IsDefault));
1096
1095
}
1097
1096
1098
1097
extern " C" void LLVMRustDICompositeTypeReplaceArrays (
1099
- LLVMRustDIBuilderRef Builder, LLVMMetadataRef CompositeTy,
1098
+ LLVMDIBuilderRef Builder, LLVMMetadataRef CompositeTy,
1100
1099
LLVMMetadataRef Elements, LLVMMetadataRef Params) {
1101
1100
DICompositeType *Tmp = unwrapDI<DICompositeType>(CompositeTy);
1102
- Builder->replaceArrays (Tmp, DINodeArray (unwrap<MDTuple>(Elements)),
1103
- DINodeArray (unwrap<MDTuple>(Params)));
1101
+ unwrap ( Builder) ->replaceArrays (Tmp, DINodeArray (unwrap<MDTuple>(Elements)),
1102
+ DINodeArray (unwrap<MDTuple>(Params)));
1104
1103
}
1105
1104
1106
1105
extern " C" LLVMMetadataRef
0 commit comments