Update to build against clang-3.5

Author: hiraditya

CMakeLists.txt

@@ -1,41 +1,47 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(demacrofier)
 
-##############################################################################
+###############################################################################
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 SET(HEADER_OUTPUT_PATH ${PROJECT_BINARY_DIR}/include)
 
 #SET(CFE_PREFIX_PATH "/home/hiraditya/Documents/llvm/llvm-3.1/install")
-SET(CFE_PREFIX_PATH "/media/space/opt_149739_build")
+#SET(CFE_PREFIX_PATH "/media/space/opt_149739_build")
+SET(CFE_PREFIX_PATH "/home/hiraditya/work/llvm/install")
+#SET(LLVM_PATH "/home/hiraditya/work/llvm/install")
+#SET(LLVM_PATH2 "/home/hiraditya/work/llvm/build")
 #SET(CFE_PREFIX_PATH "/home/hiraditya/Documents/llvm/install")
 
 SET(UTILITIES_PREFIX_PATH ".")
 
 INCLUDE_DIRECTORIES("${UTILITIES_PREFIX_PATH}/general_utilities")
 INCLUDE_DIRECTORIES("${CFE_PREFIX_PATH}/include")
-##############################################################################
+#INCLUDE_DIRECTORIES("${LLVM_PATH2}/include")
+#INCLUDE_DIRECTORIES("${LLVM_PATH}/include")
+###############################################################################
 #THIS HAS TO BE ADDED BEFORE SUPPLYING THE COMPILER FLAGS FOR THIS DIRECTORY FILES
 #THE CLANG LIBRARIES COMPILE WITH THE -fno-rtti FLAGS
 #AFTER THE LIBRARY HAS BEEN BUILT WE NEED TO SET THE COMPILER FLAGS ONCE AGAIN 
 #BECAUSE THE BOOST LIBRARIES USE rtti
 ADD_SUBDIRECTORY(ClangInterface)
-##############################################################################
+###############################################################################
 
 #SET(CMAKE_CXX_COMPILER "g++-4.5")
 #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -v -da -Q -std=c++0x")
 
-##############################################################################
+###############################################################################
 # Compiler options
+SET(LLVM_CXXFLAGS "-fPIC -fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers -pedantic -Wno-long-long -Wno-maybe-uninitialized -Wnon-virtual-dtor -Wno-comment -std=c++11 -ffunction-sections -fdata-sections -g")
 IF(CMAKE_COMPILER_IS_GNUCXX)
-  MESSAGE(STATUS "GCC detected - Adding compiler flags: -pedantic -O2 -std=c++0x")
-  SET(CMAKE_CXX_FLAGS "-pedantic -Wall -std=c++0x")
+  SET(CMAKE_CXX_FLAGS "-pedantic -Wall -std=c++11 -g ${LLVM_CXXFLAGS}")
+  MESSAGE(STATUS "GCC detected - Adding compiler flags ${CMAKE_CXX_FLAGS}")
 ELSEIF(MSVC)
   MESSAGE(STATUS "MSVC detected - Adding compiler flags")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-##############################################################################
-############## DEBUG MACROS #########################
+###############################################################################
+############################ DEBUG MACROS #####################################
 #ADD_DEFINITIONS(-DBUILD_NEW_MACRO_LIST)
 #ADD_DEFINITIONS(-DDEBUG_MACRO_USE_CASE)
 #ADD_DEFINITIONS(-DDEBUG_PARSER)
@@ -58,21 +64,21 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 #ADD_DEFINITIONS(-DDEBUG_SUGGESTION)
 #ADD_DEFINITIONS(-DGMACROS="${HEADER_OUTPUT_PATH}/gMacros.dat")
 #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -D BUILD_NEW_MACRO_LIST")
-##############################################################################
+###############################################################################
 
 
 
-############## INCLUDE DIRECTORIES RELATED TO CLANG #########################
+############## INCLUDE DIRECTORIES RELATED TO CLANG ###########################
 
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}")
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/ClangInterface")
 
-############## DEFINITIONS RELATED TO CLANG #########################
+############## DEFINITIONS RELATED TO CLANG ###################################
 ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS)
 ADD_DEFINITIONS(-D__STDC_FORMAT_MACROS)
 ADD_DEFINITIONS(-D__STDC_LIMIT_MACROS)
 ADD_DEFINITIONS(-D_GNU_SOURCE)
-##############################################################################
+###############################################################################
 ADD_LIBRARY(cpp2cxx-core SHARED
                 RlCategory.cpp
                 ReplacementList.cpp
@@ -89,7 +95,7 @@ ADD_LIBRARY(cpp2cxx-core SHARED
                 ConfigScheme.cpp
               )
 
-############## SPECIFYING THE LINK DIRECTORIES #########################
+#################### SPECIFYING THE LINK DIRECTORIES ##########################
 # Library directory paths
 LINK_DIRECTORIES(
    "/usr/lib"
@@ -98,7 +104,7 @@ LINK_DIRECTORIES(
    "${CFE_PREFIX_PATH}/lib"
 )
 
-##############################################################################
+###############################################################################
 ADD_EXECUTABLE(cpp2cxx-suggest
                 MainSuggest.cpp
               )
@@ -108,11 +114,13 @@ ADD_EXECUTABLE(cpp2cxx-finalize
               )
 FILE(COPY "cpp2cxx-validate.py" DESTINATION ${EXECUTABLE_OUTPUT_PATH})
 FILE(COPY "gMacros.dat" DESTINATION ${HEADER_OUTPUT_PATH})
-#############################################################################
+###############################################################################
 #ADD_LIBRARY()
 #FIND_LIBRARY()
-TARGET_LINK_LIBRARIES(cpp2cxx-suggest cpp2cxx-core boost_wave boost_program_options ASTConsumer
-libclang)
+TARGET_LINK_LIBRARIES(cpp2cxx-suggest cpp2cxx-core boost_system boost_wave
+ boost_program_options ASTConsumer clang
+)
 
-TARGET_LINK_LIBRARIES(cpp2cxx-finalize cpp2cxx-core boost_wave boost_program_options ASTConsumer
-libclang)
+TARGET_LINK_LIBRARIES(cpp2cxx-finalize cpp2cxx-core boost_system boost_wave
+ boost_program_options ASTConsumer clang
+)

ClangInterface/ASTConsumer.cpp

@@ -86,24 +86,24 @@ int MyASTConsumer::InitializeCI(CompilerInstance& ci,
     std::cout<<"\n\nSearch paths output from ASTConsumer:\n"<<search_paths;
 //    if(ci.hasSema())
 //      std::cout<<"Sema from start";
-    ci.createDiagnostics(0,NULL);
+    ci.createDiagnostics(0,nullptr);
     TargetOptions to;
     /// set the language to c++98
-    ci.getInvocation().setLangDefaults(clang::InputKind::IK_CXX,
+    ci.getInvocation().setLangDefaults(ci.getLangOpts(), clang::InputKind::IK_CXX,
                                        clang::LangStandard::lang_cxx11);
 
 //    if(ci.getInvocation().getLangOpts()->CPlusPlus)
 //      std::cout<<"c++ is defined now";
 
     to.Triple = llvm::sys::getDefaultTargetTriple();
-    TargetInfo *pti = TargetInfo::CreateTargetInfo(ci.getDiagnostics(), to);
+    TargetInfo *pti = TargetInfo::CreateTargetInfo(ci.getDiagnostics(), &to);
     ci.setTarget(pti);
 
     ci.createFileManager();
 //      if(ci.hasSema())
 //      std::cout<<"Sema before source manager";
     ci.createSourceManager(ci.getFileManager());
-    ci.createPreprocessor();
+    ci.createPreprocessor(clang::TranslationUnitKind::TU_Complete);
 
     /// \brief to enable parsing of exceptions by the clang front end
     ci.getLangOpts().CXXExceptions = 1;
@@ -141,7 +141,7 @@ int MyASTConsumer::InitializeCI(CompilerInstance& ci,
     std::for_each(search_paths.begin(), search_paths.end(),
                   [&HSOpts](std::string const& search_path) {
                   HSOpts.AddPath(search_path, clang::frontend::Angled,
-                                 false, false, false);
+                                 false, false);
                   });
 
 /// clang specific include
@@ -463,7 +463,7 @@ int MyASTConsumer::InitializeCI(CompilerInstance& ci,
     FrontendOptions& FEOpts = ci.getFrontendOpts();
 
     PP.getBuiltinInfo().InitializeBuiltins(PP.getIdentifierTable(),
-                                        PP.getLangOptions());
+                                        PP.getLangOpts());
     clang::InitializePreprocessor(PP, PPOpts, HSOpts, FEOpts);
     //astConsumer = new MyASTConsumer();
     ci.setASTConsumer(this);

ClangInterface/ASTConsumer.hpp

@@ -15,6 +15,7 @@
 #include "clang/Basic/TargetOptions.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/FileManager.h"
+#include "clang/Basic/LangOptions.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/SourceLocation.h"

ClangInterface/CMakeLists.txt

@@ -9,7 +9,7 @@ add_definitions(-D__STDC_LIMIT_MACROS)
 ADD_DEFINITIONS(-D_GNU_SOURCE)
 #add_definitions(-DCLANG_AST_DEBUG)
 
-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}  "-std=c++0x -fno-rtti -g")
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}  "-std=c++11 -fno-rtti -g")
 #set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}  "-cc1")
 
 link_directories("${CFE_PREFIX_PATH}/lib")
@@ -19,7 +19,12 @@ add_library(ASTConsumer SHARED
     ASTConsumer.cpp
   )
 
-target_link_libraries(ASTConsumer  
- libclang
+target_link_libraries(ASTConsumer
+LLVMLTO LLVMObjCARCOpts LLVMLinker LLVMipo LLVMVectorize LLVMBitWriter LLVMIRReader LLVMAsmParser LLVMXCoreDisassembler LLVMXCoreCodeGen LLVMXCoreDesc LLVMXCoreInfo LLVMXCoreAsmPrinter LLVMSystemZDisassembler LLVMSystemZCodeGen LLVMSystemZAsmParser LLVMSystemZDesc LLVMSystemZInfo LLVMSystemZAsmPrinter LLVMSparcDisassembler LLVMSparcCodeGen LLVMSparcAsmParser LLVMSparcDesc LLVMSparcInfo LLVMSparcAsmPrinter LLVMR600CodeGen LLVMR600Desc LLVMR600Info LLVMR600AsmPrinter LLVMPowerPCDisassembler LLVMPowerPCCodeGen LLVMPowerPCAsmParser LLVMPowerPCDesc LLVMPowerPCInfo LLVMPowerPCAsmPrinter LLVMNVPTXCodeGen LLVMNVPTXDesc LLVMNVPTXInfo LLVMNVPTXAsmPrinter LLVMMSP430CodeGen LLVMMSP430Desc LLVMMSP430Info LLVMMSP430AsmPrinter LLVMMipsDisassembler LLVMMipsCodeGen LLVMMipsAsmParser LLVMMipsDesc LLVMMipsInfo LLVMMipsAsmPrinter LLVMHexagonCodeGen LLVMHexagonAsmPrinter LLVMHexagonDesc LLVMHexagonInfo LLVMCppBackendCodeGen LLVMCppBackendInfo LLVMARMDisassembler LLVMARMCodeGen LLVMARMAsmParser LLVMARMDesc LLVMARMInfo LLVMARMAsmPrinter LLVMARM64Disassembler LLVMARM64CodeGen LLVMARM64AsmParser LLVMARM64Desc LLVMARM64Info LLVMARM64AsmPrinter LLVMARM64Utils LLVMAArch64Disassembler LLVMAArch64CodeGen LLVMAArch64AsmParser LLVMAArch64Desc LLVMAArch64Info LLVMAArch64AsmPrinter LLVMAArch64Utils LLVMTableGen LLVMDebugInfo LLVMOption LLVMX86Disassembler LLVMX86AsmParser LLVMX86CodeGen LLVMSelectionDAG LLVMAsmPrinter LLVMMCParser LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter LLVMX86Utils LLVMJIT LLVMLineEditor LLVMMCDisassembler LLVMInstrumentation LLVMInterpreter LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMProfileData LLVMMCJIT LLVMTarget LLVMRuntimeDyld LLVMExecutionEngine LLVMMC LLVMObject LLVMBitReader LLVMCore LLVMSupport
+clangFrontendTool clangFrontend clangDriver clangSerialization clangCodeGen
+clangParse clangSema clangStaticAnalyzerFrontend clangStaticAnalyzerCheckers
+clangStaticAnalyzerCore clangAnalysis clangARCMigrate clangRewriteFrontend clangRewriteCore
+clangEdit clangAST clangLex clangBasic
+#clangAnalysis clangAST clangASTMatchers clangBasic clangCodeGen clangDriver clangDynamicASTMatchers clangEdit clangFrontend clangLex clangParse clangSema clangTooling clang
+pthread z dl
   )
-

ClangInterface/TrackMacro.cpp

@@ -27,7 +27,7 @@ void TrackMacro::MacroExpands(const Token &MacroNameTok, const MacroInfo* MI,
   //std::cout<<"Macro "<<tok::getTokenName(MacroNameTok.getKind())<< " has expanded here\n\t";
   /// testing if the macro is defined in the same file
   /// so that global macros can be skipped
-  if(sm->isFromMainFile(MI->getDefinitionLoc())) {
+  if(sm->isInMainFile(MI->getDefinitionLoc())) {
     PresumedLoc presumed = sm->getPresumedLoc(Range.getBegin());
 #ifdef CLANG_AST_DEBUG
     std::cout<<"\nMacro "<<MacroNameTok.getIdentifierInfo()->getNameStart()
@@ -92,7 +92,7 @@ void TrackMacro::MacroDefined(const Token &MacroNameTok, const MacroInfo* MI)
 {
   //if(MacroIsLocal(MI->getDefinitionLoc())) {
   CollectedMacroInfo cmi;
-  if(sm->isFromMainFile(MI->getDefinitionLoc())) {
+  if(sm->isInMainFile(MI->getDefinitionLoc())) {
     PresumedLoc presumed = sm->getPresumedLoc(MI->getDefinitionLoc());
 
 #ifdef CLANG_AST_DEBUG

ConfigScheme.cpp

@@ -76,8 +76,8 @@ void ConfigScheme::SetDemacroficationScheme(std::string const& demac_gran,
   pDemacroficationScheme->globalMacrosRaw = global_mac_raw;
   pDemacroficationScheme->globalMacrosFormatted = global_mac_formatted;
   std::for_each(mac_prev_demac.begin(),mac_prev_demac.end(),
-                [&pDemacroficationScheme](std::string const& str) {
-                pDemacroficationScheme->macrosPreventingDemacrofication.insert(str);
+                [this](std::string const& str) {
+                this->pDemacroficationScheme->macrosPreventingDemacrofication.insert(str);
                });
   pDemacroficationScheme->multipleDefinitions = multiple_definitions;
   pDemacroficationScheme->performCleanup = cleanup;

DepAnalyzer.h

@@ -132,8 +132,8 @@ void DepAnalyzer<Vertex_t>::DoTopologicalSort(std::vector<Vertex_t*>& v)
   typename std::vector<Vd_t> topo_order;
   boost::topological_sort(depGraph,std::back_inserter(topo_order));
   std::for_each(topo_order.begin(),topo_order.end(),
-                [&v,&depGraph](Vd_t vd) {
-                  v.push_back(depGraph[vd]);
+                [&v, this](Vd_t vd) {
+                  v.push_back(this->depGraph[vd]);
                 });
 #ifdef DEBUG_MACRO_DEPENDENCY      
   std::cout<<"Printing the total order:\n";

DepGraph.h

@@ -69,7 +69,7 @@ struct Node {
     ~Node()
     {
       std::for_each(vecMacro.begin(),vecMacro.end(),
-        [&vecMacro](PPMacro* mac) {
+        [](PPMacro* mac) {
           delete mac;
           mac=NULL;
         });

Parser.cpp

@@ -698,9 +698,9 @@ void Parser::Demacrofy(std::ostream& stat, bool multiple_definitions_allowed)
         pm_iter = pTree->GetMacro(*it);
         /// to be looked for exact macro
         std::for_each(pm_iter.first,pm_iter.second,
-          [it,&m_ptr,&defn_counter](std::pair<token_type,PPMacro*> tm_pair) {
+          [this,&m_ptr,&defn_counter](std::pair<token_type,PPMacro*> tm_pair) {
             ++defn_counter;
-            if(tm_pair.first.get_position() == it->get_position())
+            if(tm_pair.first.get_position() == this->it->get_position())
               m_ptr = tm_pair.second;
           });
         // if there was no match then throw error, although it is unlikely

ReplacementList.cpp

@@ -47,8 +47,8 @@ void ReplacementList::set_replacement_list_str(std::string const& str,
   rl_str = str;
   if(!argId.empty()) {
     std::for_each(argId.begin(),argId.end(),
-      [&funArgId](std::pair<token_type,int> p_ti) {
-      funArgId.push_back(p_ti.first);
+      [this](std::pair<token_type,int> p_ti) {
+      this->funArgId.push_back(p_ti.first);
     });
   }
 //    std::cout<<"repl_string: "<<replacement_list_str<<std::endl;

RlParser.cpp

@@ -439,9 +439,9 @@ void RlParser::Expression8()
       //post increment operator
       rl_dcat = RlDCat::dependent;
       std::for_each(funArgId.begin(),funArgId.end(),
-        [&rl_dcat,it](token_type tok) {
-          if(*it == tok)
-            rl_dcat = RlDCat::independent;
+        [this](token_type tok) {
+          if(*this->it == tok)
+            this->rl_dcat = RlDCat::independent;
         });
       Match(T_IDENTIFIER);
       rl_ttype.reject_type = IsRejectPredefinedMacro(id_value.str());