azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[llvm][update][5.0.0] llvm 5.0.0

Browse Source
This commit is contained in:
Vasily Levchenko
2017-12-01 09:29:38 +03:00
committed by Vasily Levchenko
parent e2d2ed5237
commit 3a6cb76dc1
15 changed files with 127 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
llvmDebugInfoC/build.gradle
+4 -1
View File
@@ -21,8 +21,11 @@ model {
components {
debugInfo(NativeLibrarySpec) {
sources.cpp.source.srcDirs "src/main/cpp"
binaries.withType(StaticLibraryBinarySpec) { binary ->
cppCompiler.args "--std=c++11", "-g", "-fPIC", "-I${llvmDir}/include", "-I${projectDir}/src/main/include"
if (!project.parent.convention.plugins.platformInfo.isWindows())
cppCompiler.args "-fPIC"
cppCompiler.args "--std=c++11", "-g", "-I${llvmDir}/include", "-I${projectDir}/src/main/include"
linker.args "-L${llvmDir}/lib", "-lLLVMCore", "-lLLVMSupport"
}
binaries.withType(SharedLibraryBinarySpec) { binary ->
llvmDebugInfoC/src/main/cpp/DebugInfoC.cpp
+8 -10
View File
@@ -29,7 +29,7 @@
*/
namespace llvm {
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DIBuilder, DIBuilderRef)
//DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DIBuilder, DIBuilderRef)
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DICompileUnit, DICompileUnitRef)
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DIFile, DIFileRef)
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DIBasicType, DIBasicTypeRef)
@@ -45,7 +45,7 @@ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DILocalVariable, DILocalVariableRef)
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DIExpression, DIExpressionRef)
// from Module.cpp
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Module, LLVMModuleRef)
//DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Module, LLVMModuleRef)
}
/**
@@ -68,7 +68,8 @@ DICompileUnitRef DICreateCompilationUnit(DIBuilderRef builder, unsigned int lang
const char *file, const char* dir,
const char * producer, int isOptimized,
const char * flags, unsigned int rv) {
return llvm::wrap(llvm::unwrap(builder)->createCompileUnit(lang, file, dir, producer, isOptimized, flags, rv));
llvm::DIBuilder *D = llvm::unwrap(builder);
return llvm::wrap(llvm::unwrap(builder)->createCompileUnit(lang, D->createFile(file, dir), producer, isOptimized, flags, rv));
}
DIFileRef DICreateFile(DIBuilderRef builder, const char *filename, const char *directory) {
@@ -76,7 +77,7 @@ DIFileRef DICreateFile(DIBuilderRef builder, const char *filename, const char *d
}
DIBasicTypeRef DICreateBasicType(DIBuilderRef builder, const char* name, uint64_t sizeInBits, uint64_t alignment, unsigned encoding) {
return llvm::wrap(llvm::unwrap(builder)->createBasicType(name, sizeInBits, alignment, encoding));
return llvm::wrap(llvm::unwrap(builder)->createBasicType(name, sizeInBits, encoding));
}
DIModuleRef DICreateModule(DIBuilderRef builder, DIScopeOpaqueRef scope,
@@ -111,7 +112,7 @@ DICompositeTypeRef DICreateStructType(DIBuilderRef refBuilder,
DICompositeTypeRef refPlace) {
auto builder = llvm::unwrap(refBuilder);
if ((flags & DI_FORWARD_DECLARAION) != 0) {
return llvm::wrap(builder->createStructType(llvm::unwrap(scope), name, NULL, 0, 0, 0, flags, NULL, NULL));
return llvm::wrap(builder->createStructType(llvm::unwrap(scope), name, NULL, 0, 0, 0, (llvm::DINode::DIFlags)flags, NULL, NULL));
}
std::vector<llvm::Metadata *> typeElements;
for(int i = 0; i < elementsCount; ++i) {
@@ -121,7 +122,7 @@ DICompositeTypeRef DICreateStructType(DIBuilderRef refBuilder,
auto composite = builder->createStructType(llvm::unwrap(scope),
name, llvm::unwrap(file),
lineNumber,
sizeInBits, alignInBits, flags,
sizeInBits, alignInBits, (llvm::DINode::DIFlags)flags,
llvm::unwrap(derivedFrom),
elementsArray);
builder->replaceTemporary(llvm::TempDIType(llvm::unwrap(refPlace)), composite);
@@ -158,7 +159,7 @@ DIDerivedTypeRef DICreateMemberType(DIBuilderRef refBuilder,
sizeInBits,
alignInBits,
offsetInBits,
flags,
(llvm::DINode::DIFlags)flags,
llvm::unwrap(type)));
}
@@ -270,8 +271,5 @@ int DISubprogramDescribesFunction(DISubprogramRef sp, LLVMValueRef fn) {
return llvm::unwrap(sp)->describes(llvm::cast<llvm::Function>(llvm::unwrap(fn)));
}
void DIScopeDump(DIScopeOpaqueRef scope) {
llvm::unwrap(scope)->dump();
}
} /* extern "C" */
llvmDebugInfoC/src/main/include/DebugInfoC.h
+4 -2
View File
@@ -20,7 +20,9 @@
# ifdef __cplusplus
extern "C" {
# endif
typedef struct DIBuilder *DIBuilderRef;
typedef struct LLVMOpaqueDIBuilder *DIBuilderRef;
//typedef struct DIBuilder *DIBuilderRef;
typedef struct DICompileUnit *DICompileUnitRef;
typedef struct DIFile *DIFileRef;
typedef struct DIBasicType *DIBasicTypeRef;
@@ -103,7 +105,7 @@ const char* LLVMBuilderGetCurrentBbName(LLVMBuilderRef builder);
const char *DIGetSubprogramLinkName(DISubprogramRef sp);
LLVMValueRef LLVMBuilderGetCurrentFunction(LLVMBuilderRef builder);
int DISubprogramDescribesFunction(DISubprogramRef sp, LLVMValueRef fn);
void DIScopeDump(DIScopeOpaqueRef scope);
//void DIScopeDump(DIScopeOpaqueRef scope);
# ifdef __cplusplus
}
# endif