start clang 3.7 support

Fix llvm::Module::getDataLayout() return value changed to reference.
Fix clang::CodeGen lots change.
Fix clang::ASTUnit load change.
Fix llvm::Object::SymbolRef getName and getCommonSize change.
Fix Seme.h contains emit method conflict with Qt emit keyword.
compiled clang 3.7 support.

Author: drswinghead

Diff for: CMakeLists.txt

@@ -44,7 +44,10 @@ string(REPLACE "-std=gnu++11" "-std=c++17 -std=c++1z" NEW_FLAGS ${CMAKE_CXX_FLAG
 string(REPLACE "-std=c++11" "-std=c++17 -std=c++1z" NEW_FLAGS ${CMAKE_CXX_FLAGS})
 set(CMAKE_CXX_FLAGS "${NEW_FLAGS}")
 
-set(LLVM_SRC_DIR2 "./llvm-3.6.0.src")  # maybe a symlink
+# set(LLVM_SRC_DIR2 "./llvm-3.5.0.src")  # maybe a symlink
+# set(LLVM_SRC_DIR2 "./llvm-3.6.0.src")  # maybe a symlink
+# set(LLVM_SRC_DIR2 "./llvm-3.6.2.src")  # maybe a symlink
+set(LLVM_SRC_DIR2 "./llvm-3.7.0.src")  # maybe a symlink
 set(CLANG_SRC_DIR2 ${LLVM_SRC_DIR2}/tools/clang)
 include_directories(${CLANG_SRC_DIR2}/lib/CodeGen ${CLANG_SRC_DIR2}/lib/ ${LLVM_SRC_DIR2}/lib/)
 
@@ -98,7 +101,8 @@ set(handby_exe_SRCS
     block.cpp
 )
 
-set(CLANGLIBS  -lclang -lLLVM-3.6
+# set(CLANGLIBS  -lclang -lLLVM-3.6
+set(CLANGLIBS  -lclang
 		 -lclangTooling
 		-lclangFrontendTool  
 		-lclangFrontend
@@ -141,4 +145,4 @@ qt5_use_modules(handby Core Gui Widgets Network WebSockets)
 # add_subdirectory(demos)
 #add_subdirectory(uitools/rcc)
 add_subdirectory(uitools/rbuic)
-add_subdirectory(uitools/rbrcc)
+add_subdirectory(uitools/rbrcc)

Diff for: ChangeLog

@@ -1,11 +1,43 @@
+2015-10
+	llvm-3.6 => llvm-3.7, qt5.5。注意编译器与内嵌入的llvm-src版本要相同。
+	1。llvm::Module->getDataLayout() 从返回指针，改为返回引用了，不能再qDebug()直接输出
+	2。变化最大的看来是clang::CodeGen这部分，大面积编译不过。
+	CodeGenModule构造方法，添加了两个参数，clang::HeaderSearchOptions&和clang::PreprocessorOptions&。
+	看能不能采用默认构造方法构造这两个参数。
+	clang::CreateLLVMCodeGen()添加了两个参数，clang::HeaderSearchOptions&和clang::PreprocessorOptions&，
+	并去掉了一个参数clang::TargetOptions&。
+	3。clang::CodeGenerator去掉了一个参数,bool DefinitionRequired。
+	4。clang::EmitBackendOutput改了一个参数类型，llvm::raw_string_ostream * => llvm::raw_pwrite_stream *。
+	需要添加一层，llvm::buffer_ostream bufstm(llvm::raw_string_ostream&);
+	5。clang::FunctionDecl去掉了个方法，getCorrespondingUnsizedGlobalDeallocationFunction
+	这个在llvm-3.7.0去掉了。
+	这段代码直接去掉，没见到替代方法。
+	6。clang::ASTUnit::LoadFromASTFile方法改变，添加了一个参数PCHContainerReader&。
+	这个参数需要手动构造还是怎么初始化呢？反正默认构造不行，这是个抽像类。
+	需要从CompilerInstance取出来，CI.getPCHContainerReader()。
+	正好FrontEngine已经构造了默认的CompilerInstance对象可以使用。
+	7。clang::ASTUnit::LoadFromCompilerInvocation两个参数全部改了。
+	8。llvm::object::SymbolRef的getName()方法去掉了参数，直接返回。
+	getSize方法改为getCommonSize方法，直接返回。
+	9。<clang/Sema/Sema.h>定义了个emit，与Qt的emit冲突了。
+	这个可不容易解决了。
+	临时把/usr/include/clang/Sema/Sema.h中的emit改名emit1,能编译过去，结果啥样不知道。
+	不过代码中应该并未真正使用到这个Sema中的emit函数。
+
+	总的来说，改动不算太大。运行测试再看效果。
+
+2015-5
+	优化JIT引擎。
+	llvm::Module拆分优化。
+
 2015-3
 	优化IR生成引擎中的ast遍历。
 	升级到依赖llvm-3.6库。
-	
+
 2014-11
 	直接存储ruby VALUE类型作为hash的key值，不再使用rb_hash计算一次。
 	实现诸如qApp的Qt全局变量getter/setter。
 
 2014-10
 	基本的jit执行。
-	
+

Diff for: compilerengine.cpp

@@ -49,11 +49,11 @@ void test_raw_codegen()
     clang::CodeGenOptions &cgopt = ci.getCodeGenOpts();
 
     llvm::DataLayout dlo("hehhe");
-    clang::CodeGen::CodeGenModule cgmod(astctx, cgopt, mod, dlo, diag);
+    // clang::CodeGen::CodeGenModule cgmod(astctx, cgopt, mod, dlo, diag);
 
-    cgmod.EmitAnnotationString("hhhh");
+    // cgmod.EmitAnnotationString("hhhh");
 
-    clang::CodeGen::CodeGenFunction cgf(cgmod);
+    // clang::CodeGen::CodeGenFunction cgf(cgmod);
 }
 
 
@@ -697,7 +697,9 @@ llvm::Module* CompilerEngine::conv_ctor(clang::ASTContext &ctx, clang::CXXConstr
 
     // llvm::DataLayout dlo("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128");
     llvm::DataLayout dlo(ctx.getTargetInfo().getTargetDescription());
-    clang::CodeGen::CodeGenModule cgmod(ctx, cgopt, *mod, dlo, diag);
+    clang::HeaderSearchOptions headersearchopts;
+    clang::PreprocessorOptions ppopts;
+    clang::CodeGen::CodeGenModule cgmod(ctx, headersearchopts, ppopts, cgopt, *mod, dlo, diag);
     auto &cgtypes = cgmod.getTypes();
     auto cgf = new clang::CodeGen::CodeGenFunction(cgmod);
 
@@ -804,7 +806,9 @@ llvm::Module* CompilerEngine::conv_method(clang::ASTContext &ctx, clang::CXXMeth
 
     // llvm::DataLayout dlo("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128");
     llvm::DataLayout dlo(ctx.getTargetInfo().getTargetDescription());
-    clang::CodeGen::CodeGenModule cgmod(ctx, cgopt, *mod, dlo, diag);
+    clang::HeaderSearchOptions headersearchopts;
+    clang::PreprocessorOptions ppopts;
+    clang::CodeGen::CodeGenModule cgmod(ctx, headersearchopts, ppopts, cgopt, *mod, dlo, diag);
     auto &cgtypes = cgmod.getTypes();
     auto cgf = new clang::CodeGen::CodeGenFunction(cgmod);
 
@@ -926,7 +930,9 @@ QString CompilerEngine::mangle_ctor(clang::ASTContext &ctx, clang::CXXConstructo
 
     // llvm::DataLayout dlo("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128");
     llvm::DataLayout dlo(ctx.getTargetInfo().getTargetDescription());
-    clang::CodeGen::CodeGenModule cgmod(ctx, cgopt, *mod, dlo, diag);
+    clang::HeaderSearchOptions headersearchopts;
+    clang::PreprocessorOptions ppopts;
+    clang::CodeGen::CodeGenModule cgmod(ctx, headersearchopts, ppopts, cgopt, *mod, dlo, diag);
     auto &cgtypes = cgmod.getTypes();
     auto cgf = new clang::CodeGen::CodeGenFunction(cgmod);
 
@@ -952,7 +958,9 @@ QString CompilerEngine::mangle_dtor(clang::ASTContext &ctx, clang::CXXDestructor
 
     // llvm::DataLayout dlo("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128");
     llvm::DataLayout dlo(ctx.getTargetInfo().getTargetDescription());
-    clang::CodeGen::CodeGenModule cgmod(ctx, cgopt, *mod, dlo, diag);
+    clang::HeaderSearchOptions headersearchopts;
+    clang::PreprocessorOptions ppopts;
+    clang::CodeGen::CodeGenModule cgmod(ctx, headersearchopts, ppopts, cgopt, *mod, dlo, diag);
     auto &cgtypes = cgmod.getTypes();
     auto cgf = new clang::CodeGen::CodeGenFunction(cgmod);
 
@@ -978,7 +986,9 @@ QString CompilerEngine::mangle_method(clang::ASTContext &ctx, clang::CXXMethodDe
 
     // llvm::DataLayout dlo("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128");
     llvm::DataLayout dlo(ctx.getTargetInfo().getTargetDescription());
-    clang::CodeGen::CodeGenModule cgmod(ctx, cgopt, *mod, dlo, diag);
+    clang::HeaderSearchOptions headersearchopts;
+    clang::PreprocessorOptions ppopts;
+    clang::CodeGen::CodeGenModule cgmod(ctx, headersearchopts, ppopts, cgopt, *mod, dlo, diag);
     auto &cgtypes = cgmod.getTypes();
     auto cgf = new clang::CodeGen::CodeGenFunction(cgmod);
 
@@ -2059,7 +2069,10 @@ CompilerEngine::createCompilerUnit(clang::ASTUnit *unit, clang::NamedDecl *decl)
     //  llvm::DataLayout dlo("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128");
     llvm::DataLayout *pdlo = new llvm::DataLayout(ctx.getTargetInfo().getTargetDescription());
     auto &dlo = *pdlo;
-    cu->mcgm = new clang::CodeGen::CodeGenModule(ctx, cgopt, *cu->mmod, dlo, diag);
+    clang::HeaderSearchOptions headersearchopts;
+    clang::PreprocessorOptions ppopts;
+    cu->mcgm = new clang::CodeGen::CodeGenModule(ctx, headersearchopts, ppopts, cgopt, *cu->mmod, dlo, diag);
+    // cu->mcgm = new clang::CodeGen::CodeGenModule(ctx, cgopt, *cu->mmod, dlo, diag);
     cu->mcgf = new clang::CodeGen::CodeGenFunction(*cu->mcgm);
 
     // 
@@ -2127,13 +2140,16 @@ bool CompilerEngine::tryCompile(clang::CXXRecordDecl *decl, clang::ASTContext &c
 
     clang::ExternalASTSource *eas = ctx.getExternalSource();
 
-    clang::CodeGenerator *cgtor = clang::CreateLLVMCodeGen(diag, "testmm", cgopt, tgopt, vmctx);
+    clang::HeaderSearchOptions HeaderSearchOpts;
+    clang::PreprocessorOptions PreprocessorOpts;
+    clang::CodeGenerator *cgtor =
+        clang::CreateLLVMCodeGen(diag, "testmm", HeaderSearchOpts, PreprocessorOpts, cgopt, vmctx);
     qDebug()<<cgtor<<eas;
 
 
     cgtor->Initialize(ctx);
     cgtor->HandleTranslationUnit(ctx);
-    cgtor->HandleVTable(decl, true);
+    cgtor->HandleVTable(decl);
     cgtor->HandleTagDeclDefinition(decl);
 
     int cnter = 0;
@@ -2159,7 +2175,9 @@ bool CompilerEngine::tryCompile(clang::CXXRecordDecl *decl, clang::ASTContext &c
 
     std::string stmc;
     llvm::raw_string_ostream stmo(stmc);
-    clang::EmitBackendOutput(diag, cgopt, tgopt, lgopt, "thisok", mod, clang::Backend_EmitLL, &stmo);
+    llvm::buffer_ostream bufstm(stmo);
+    // clang::EmitBackendOutput(diag, cgopt, tgopt, lgopt, "thisok", mod, clang::Backend_EmitLL, &stmo);
+    clang::EmitBackendOutput(diag, cgopt, tgopt, lgopt, "thisok", mod, clang::Backend_EmitLL, &bufstm);
     /*
       void EmitBackendOutput(DiagnosticsEngine &Diags, const CodeGenOptions &CGOpts,
                          const TargetOptions &TOpts, const LangOptions &LOpts,
@@ -2322,7 +2340,9 @@ bool CompilerEngine::tryCompile2(clang::CXXRecordDecl *decl, clang::ASTContext &
     // llvm::DataLayout dlo("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128");
     llvm::DataLayout dlo(ctx.getTargetInfo().getTargetDescription());
     qDebug()<<"heeeeee...";
-    clang::CodeGen::CodeGenModule cgmod(ctx, cgopt, mod, dlo, diag);
+    clang::HeaderSearchOptions headersearchopts;
+    clang::PreprocessorOptions ppopts;
+    clang::CodeGen::CodeGenModule cgmod(ctx, headersearchopts, ppopts, cgopt, mod, dlo, diag);
 
     // cgmod.EmitAnnotationString("hhhh");
 
@@ -2619,13 +2639,6 @@ void testGenerateCode(clang::CodeGen::CodeGenModule &CGM, clang::GlobalDecl GD,
     // Emit the standard function prologue.
     // StartFunction(GD, ResTy, Fn, FnInfo, Args, Loc, BodyRange.getBegin());
 
-    FunctionDecl *UnsizedDealloc = 
-        FD->getCorrespondingUnsizedGlobalDeallocationFunction();
-    bool ok = (UnsizedDealloc != NULL);
-    qDebug()<<UnsizedDealloc<<ok;
-    if (UnsizedDealloc) {
-        qDebug()<<"error match if";
-    }
     // Generate the body of the function.
     // PGO.assignRegionCounters(GD.getDecl(), CurFn);
     if (isa<CXXDestructorDecl>(FD)) {
@@ -2664,13 +2677,6 @@ void testGenerateCode(clang::CodeGen::CodeGenModule &CGM, clang::GlobalDecl GD,
         // EmitFunctionBody(Args, Body);
         qDebug()<<"hhhhhhhhhhh";
         // } else if (UnsizedDealloc != NULL) {
-    } else if (FunctionDecl *UnsizedDealloc = 
-               FD->getCorrespondingUnsizedGlobalDeallocationFunction()) {
-        // Global sized deallocation functions get an implicit weak definition if
-        // they don't have an explicit definition.
-        // EmitSizedDeallocationFunction(*this, UnsizedDealloc);
-        // EmitSizedDeallocationFunction(CGM, UnsizedDealloc);
-        qDebug()<<"why hereeeeeeeeee"<<UnsizedDealloc<<(UnsizedDealloc != NULL);
     } else {
         qDebug()<<"hhhhhhhhhhh";
         llvm_unreachable("no definition for emitted function");
@@ -2763,13 +2769,14 @@ bool CompilerEngine::tryCompile_tpl(clang::ClassTemplateDecl *decl, clang::ASTCo
 
     // llvm::DataLayout dlo("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128");
     llvm::DataLayout dlo(ctx.getTargetInfo().getTargetDescription());
-
-    clang::CodeGen::CodeGenModule cgmod(ctx, cgopt, mod, dlo, diag);
+    clang::HeaderSearchOptions HeaderSearchOpts;
+    clang::PreprocessorOptions PreprocessorOpts;
+    clang::CodeGen::CodeGenModule cgmod(ctx, HeaderSearchOpts, PreprocessorOpts, cgopt, mod, dlo, diag);
 
     qDebug()<<"heeeeee...";
     clang::CodeGen::CodeGenFunction cgf(cgmod, false);
 
-    qDebug()<<cgmod.getMangledName(mthdecl).data();
+    // qDebug()<<cgmod.getMangledName(mthdecl).data();
     auto mgctx = ctx.createMangleContext();
     std::string stms;
     llvm::raw_string_ostream stmo(stms);
@@ -2823,7 +2830,7 @@ bool CompilerEngine::tryCompile_tpl(clang::ClassTemplateDecl *decl, clang::ASTCo
             qDebug()<<cnter++<<sd;
             int jcnter = 0;
             auto &al = sd->getTemplateArgs();
-            for (int j = 0; j < al.size(); j++) {
+            for (unsigned int j = 0; j < al.size(); j++) {
                 qDebug()<<jcnter++<<al.get(j).getAsType().getAsString().data();
                 QString tplat = al.get(j).getAsType().getAsString().data();
                 if (tplat == "char") {
@@ -2897,7 +2904,7 @@ bool CompilerEngine::tryCompile_tpl(clang::ClassTemplateDecl *decl, clang::ASTCo
         //     Ty = getTypes().ConvertType(cast<ValueDecl>(GD.getDecl())->getType());
         // cgtypes.ConvertType(clang::cast<clang::ValueDecl>(td)->getType());
         qDebug()<<cgm.getMangledName(clang::GlobalDecl(td)).data();
-        qDebug()<<td<<td->getCorrespondingUnsizedGlobalDeallocationFunction()
+        qDebug()<<td  // <<td->getCorrespondingUnsizedGlobalDeallocationFunction()
                 <<td->isLambdaStaticInvoker()<<td->isInstance(); // 0x12345, 0x0, false
         cgf.GenerateCode(td, f, FI);
         // testGenerateCode(cgm, clang::GlobalDecl(td), f, FI);

Diff for: ctrlengine.cpp

@@ -72,7 +72,7 @@ void *CtrlEngine::vm_new(QString klass, QVector<QVariant> uargs)
     } else {
         // auto mod = mce->conv_ctor(mfe->getASTContext(), ctor_decl);
         auto tmod = mce->conv_ctor2(mfe->getASTUnit(), ctor_decl, dargs);
-        qDebug()<<tmod<<tmod->getDataLayout();
+        qDebug()<<tmod<<&tmod->getDataLayout();
         TEMP_DEBUG();
         qtmod = tmod;
 
@@ -204,7 +204,7 @@ bool CtrlEngine::vm_delete(void *kthis, QString klass)
         qtmod = mman->get(modname);
     } else {
         auto mod = mce->conv_dtor(mfe->getASTUnit(), dtor_decl);
-        qDebug()<<mod<<mod->getDataLayout();
+        qDebug()<<mod<<&mod->getDataLayout();
         // mod->dump();
         qtmod = mod;
 
@@ -396,7 +396,7 @@ QVariant CtrlEngine::vm_call(void *kthis, QString klass, QString method, QVector
     } else {
         // auto mod = mce->conv_method(mfe->getASTContext(), mth_decl);
         auto mod = mce->conv_method2(mfe->getASTUnit(), mth_decl);
-        qDebug()<<mod<<mod->getDataLayout();
+        qDebug()<<mod<<&mod->getDataLayout();
         qtmod = mod;
 
         // mce->conv_ctor(mfe->getASTContext(), ctor_decl);
@@ -478,7 +478,7 @@ QVariant CtrlEngine::vm_static_call(QString klass, QString method, QVector<QVari
     } else {
         // auto mod = mce->conv_method(mfe->getASTContext(), mth_decl);
         auto mod = mce->conv_method2(mfe->getASTUnit(), mth_decl);
-        qDebug()<<mod<<mod->getDataLayout();
+        qDebug()<<mod<<&mod->getDataLayout();
         // mce->conv_ctor(mfe->getASTContext(), ctor_decl);
         qtmod = mod;
     }
@@ -566,7 +566,7 @@ QString CtrlEngine::vm_qdebug(void *kthis, QString klass)
             qtmod = mman->get(modname);
         } else {
             auto mod = mce->conv_function2(mfe->getASTUnit(), fun_decl);
-            qDebug()<<mod<<mod->getDataLayout();
+            qDebug()<<mod<<&mod->getDataLayout();
             qtmod = mod;
             // mce->conv_ctor(mfe->getASTContext(), ctor_decl);
             // QString symname = mce->mangle_method(mfe->getASTContext(), mth_decl);

Diff for: frontengine.cpp

@@ -138,12 +138,20 @@ bool FrontEngine::loadPreparedASTFile()
     clang::IntrusiveRefCntPtr<clang::DiagnosticsEngine> mydiag
         = clang::CompilerInstance::createDiagnostics(new clang::DiagnosticOptions(), Client, true);
     clang::FileSystemOptions fsopts;
+    const clang::PCHContainerReader &pchreader = this->mcis->getPCHContainerReader();
 
     QDateTime btime = QDateTime::currentDateTime();
     std::unique_ptr<clang::ASTUnit> unit
-        = clang::ASTUnit::LoadFromASTFile(astfile, mydiag, fsopts, false, clang::None, true, true, true);
+        = clang::ASTUnit::LoadFromASTFile(astfile, pchreader, mydiag, fsopts, false, clang::None, true, true, true);
     // false, clang::None,
     // true, true, true);
+    // std::unique_ptr<ASTUnit> ASTUnit::LoadFromASTFile(
+    //                                                   const std::string &Filename,
+    //                                                   const PCHContainerReader &PCHContainerRdr,
+    //                                                   IntrusiveRefCntPtr<DiagnosticsEngine> Diags,
+    //                                                   const FileSystemOptions &FileSystemOpts, bool OnlyLocalDecls,
+    //                                                   ArrayRef<RemappedFile> RemappedFiles, bool CaptureDiagnostics,
+    //                                                   bool AllowPCHWithCompilerErrors, bool UserFilesAreVolatile) {
     // clang::ASTUnit::LoadFromASTFile(const std::string &Filename, 
     //                                 IntrusiveRefCntPtr<clang::DiagnosticsEngine> Diags, 
     //                                 const clang::FileSystemOptions &FileSystemOpts, 
@@ -237,9 +245,10 @@ bool FrontEngine::parseHeader()
     std::string astfile = "data/qthdrsrc.ast";
     clang::IntrusiveRefCntPtr<clang::DiagnosticsEngine> mydiag;
     clang::FileSystemOptions fsopts;
+    const clang::PCHContainerReader &pchreader = this->mcis->getPCHContainerReader();
 
     QDateTime btime = QDateTime::currentDateTime();
-    std::unique_ptr<clang::ASTUnit> unit = clang::ASTUnit::LoadFromASTFile(astfile, mydiag, fsopts);
+    std::unique_ptr<clang::ASTUnit> unit = clang::ASTUnit::LoadFromASTFile(astfile, pchreader, mydiag, fsopts);
         // clang::ASTUnit::LoadFromASTFile(const std::string &Filename, 
         //                                 IntrusiveRefCntPtr<clang::DiagnosticsEngine> Diags, 
         //                                 const clang::FileSystemOptions &FileSystemOpts, 
@@ -321,8 +330,12 @@ bool FrontEngine::parseHeader(QString path)
     QDateTime btime = QDateTime::currentDateTime();
     clang::IntrusiveRefCntPtr<clang::DiagnosticsEngine> mydiag;
     //        clang::CompilerInstance::createDiagnostics(mcis->
-    std::unique_ptr<clang::ASTUnit> pastu = 
-        clang::ASTUnit::LoadFromCompilerInvocation(mciv, mydiag);
+    std::shared_ptr<clang::PCHContainerOperations> PCHContainerOps = this->mcis->getPCHContainerOperations();
+
+    std::unique_ptr<clang::ASTUnit> pastu =
+        clang::ASTUnit::LoadFromCompilerInvocation(mciv, PCHContainerOps, mydiag, false, true,
+                                                   true, clang::TU_Complete, true, true, true);
+        // clang::ASTUnit::LoadFromCompilerInvocation(mciv, mydiag);
     clang::ASTContext &tctx = pastu->getASTContext();
     QDateTime etime = QDateTime::currentDateTime();
 
@@ -1047,7 +1060,7 @@ FrontEngine::find_ctor_decl(clang::CXXRecordDecl *decl,
     // else ctors.count() == 1
 
     clang::CXXConstructorDecl *ctor = ctors.at(0);
-    Q_ASSERT(md);
+    Q_ASSERT(ctor);
     return ctor;
 }
 

Diff for: ivm/clvmjitlistener.cpp

@@ -23,13 +23,13 @@ static void dumpObjectFile(const llvm::object::ObjectFile &Obj)
     qDebug()<<Obj.getType()<<(llvm::isa<llvm::object::ELFObjectFileBase>(pObj));
     // <<(llvm::isa<llvm::object::ELFObjectFile<???> >(pObj));
 
-    for (auto sym : Obj.symbols()) {
+    for (llvm::object::SymbolRef sym : Obj.symbols()) {
         std::string name;
-        llvm::StringRef rname(name);
-        uint64_t sz = 0;
-        sym.getName(rname);
-        sym.getSize(sz);
-        // qDebug()<<"sym:"<<&sym<<sz<<rname.str().c_str();
+        // llvm::StringRef rname(name);
+        llvm::ErrorOr<llvm::StringRef> rname = sym.getName();
+        // sym.getSize(sz);
+        uint64_t sz = sym.getCommonSize();
+        qDebug()<<"sym:"<<&sym<<sz<<rname->str().c_str();
     }
 
     for (auto sec : Obj.sections()) {

Diff for: namelookup.cpp

@@ -4,6 +4,7 @@
 #include <clang/AST/ASTContext.h>
 #include <clang/AST/Decl.h>
 #include <clang/AST/DeclCXX.h>
+// 需要把Sema.h中的emit()函数改名，否则会与Qt中的emit冲突。
 #include <clang/Sema/Sema.h>
 #include <clang/Sema/Lookup.h>
 #include <clang/Frontend/ASTUnit.h>