add isl_aff_mod_val

[platform/upstream/isl.git] / interface / extract_interface.cc

diff --git a/interface/extract_interface.cc b/interface/extract_interface.cc
index 006a3bf..5aa6294 100644 (file)
--- a/interface/extract_interface.cc
+++ b/interface/extract_interface.cc
@@ -31,6 +31,8 @@
  * Sven Verdoolaege.
  */ 
 
+#include "isl_config.h"
+
 #include <assert.h>
 #include <iostream>
 #include <llvm/Support/raw_ostream.h>
@@ -49,7 +51,11 @@
 #include <clang/Driver/Tool.h>
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Frontend/CompilerInvocation.h>
+#ifdef HAVE_BASIC_DIAGNOSTICOPTIONS_H
+#include <clang/Basic/DiagnosticOptions.h>
+#else
 #include <clang/Frontend/DiagnosticOptions.h>
+#endif
 #include <clang/Frontend/TextDiagnosticPrinter.h>
 #include <clang/Frontend/Utils.h>
 #include <clang/Lex/HeaderSearch.h>
@@ -57,7 +63,6 @@
 #include <clang/Parse/ParseAST.h>
 #include <clang/Sema/Sema.h>
 
-#include "isl_config.h"
 #include "extract_interface.h"
 #include "python.h"
 
@@ -110,14 +115,14 @@ struct MyASTConsumer : public ASTConsumer {
        set<RecordDecl *> types;
        set<FunctionDecl *> functions;
 
-       virtual void HandleTopLevelDecl(DeclGroupRef D) {
+       virtual HandleTopLevelDeclReturn HandleTopLevelDecl(DeclGroupRef D) {
                Decl *decl;
 
                if (!D.isSingleDecl())
-                       return;
+                       return HandleTopLevelDeclContinue;
                decl = D.getSingleDecl();
                if (!is_exported(decl))
-                       return;
+                       return HandleTopLevelDeclContinue;
                switch (decl->getKind()) {
                case Decl::Record:
                        types.insert(cast<RecordDecl>(decl));
@@ -128,6 +133,7 @@ struct MyASTConsumer : public ASTConsumer {
                default:
                        break;
                }
+               return HandleTopLevelDeclContinue;
        }
 };
 
@@ -139,12 +145,18 @@ static Driver *construct_driver(const char *binary, DiagnosticsEngine &Diags)
        return new Driver(binary, llvm::sys::getDefaultTargetTriple(),
                            "", false, false, Diags);
 }
-#else
+#elif defined(HAVE_ISPRODUCTION)
 static Driver *construct_driver(const char *binary, DiagnosticsEngine &Diags)
 {
        return new Driver(binary, llvm::sys::getDefaultTargetTriple(),
                            "", false, Diags);
 }
+#else
+static Driver *construct_driver(const char *binary, DiagnosticsEngine &Diags)
+{
+       return new Driver(binary, llvm::sys::getDefaultTargetTriple(),
+                           "", Diags);
+}
 #endif
 
 /* Create a CompilerInvocation object that stores the command line
@@ -161,7 +173,7 @@ static CompilerInvocation *construct_invocation(const char *filename,
        Argv.push_back(binary);
        Argv.push_back(filename);
        const llvm::OwningPtr<Compilation> compilation(
-               driver->BuildCompilation(ArrayRef<const char *>(Argv)));
+               driver->BuildCompilation(llvm::ArrayRef<const char *>(Argv)));
        JobList &Jobs = compilation->getJobs();
 
        Command *cmd = cast<Command>(*Jobs.begin());
@@ -187,14 +199,83 @@ static CompilerInvocation *construct_invocation(const char *filename,
 
 #endif
 
+#ifdef HAVE_BASIC_DIAGNOSTICOPTIONS_H
+
+static TextDiagnosticPrinter *construct_printer(void)
+{
+       return new TextDiagnosticPrinter(llvm::errs(), new DiagnosticOptions());
+}
+
+#else
+
+static TextDiagnosticPrinter *construct_printer(void)
+{
+       DiagnosticOptions DO;
+       return new TextDiagnosticPrinter(llvm::errs(), DO);
+}
+
+#endif
+
+#ifdef CREATETARGETINFO_TAKES_POINTER
+
+static TargetInfo *create_target_info(CompilerInstance *Clang,
+       DiagnosticsEngine &Diags)
+{
+       TargetOptions &TO = Clang->getTargetOpts();
+       TO.Triple = llvm::sys::getDefaultTargetTriple();
+       return TargetInfo::CreateTargetInfo(Diags, &TO);
+}
+
+#else
+
+static TargetInfo *create_target_info(CompilerInstance *Clang,
+       DiagnosticsEngine &Diags)
+{
+       TargetOptions &TO = Clang->getTargetOpts();
+       TO.Triple = llvm::sys::getDefaultTargetTriple();
+       return TargetInfo::CreateTargetInfo(Diags, TO);
+}
+
+#endif
+
+#ifdef CREATEDIAGNOSTICS_TAKES_ARG
+
+static void create_diagnostics(CompilerInstance *Clang)
+{
+       Clang->createDiagnostics(0, NULL, construct_printer());
+}
+
+#else
+
+static void create_diagnostics(CompilerInstance *Clang)
+{
+       Clang->createDiagnostics(construct_printer());
+}
+
+#endif
+
+#ifdef ADDPATH_TAKES_4_ARGUMENTS
+
+void add_path(HeaderSearchOptions &HSO, string Path)
+{
+       HSO.AddPath(Path, frontend::Angled, false, false);
+}
+
+#else
+
+void add_path(HeaderSearchOptions &HSO, string Path)
+{
+       HSO.AddPath(Path, frontend::Angled, true, false, false);
+}
+
+#endif
+
 int main(int argc, char *argv[])
 {
        llvm::cl::ParseCommandLineOptions(argc, argv);
 
        CompilerInstance *Clang = new CompilerInstance();
-       DiagnosticOptions DO;
-       Clang->createDiagnostics(0, NULL,
-                               new TextDiagnosticPrinter(llvm::errs(), DO));
+       create_diagnostics(Clang);
        DiagnosticsEngine &Diags = Clang->getDiagnostics();
        Diags.setSuppressSystemWarnings(true);
        CompilerInvocation *invocation =
@@ -203,9 +284,7 @@ int main(int argc, char *argv[])
                Clang->setInvocation(invocation);
        Clang->createFileManager();
        Clang->createSourceManager(Clang->getFileManager());
-       TargetOptions TO;
-       TO.Triple = llvm::sys::getDefaultTargetTriple();
-       TargetInfo *target = TargetInfo::CreateTargetInfo(Diags, TO);
+       TargetInfo *target = create_target_info(Clang, Diags);
        Clang->setTarget(target);
        CompilerInvocation::setLangDefaults(Clang->getLangOpts(), IK_C,
                                            LangStandard::lang_unspecified);
@@ -215,7 +294,7 @@ int main(int argc, char *argv[])
        HSO.ResourceDir = ResourceDir;
 
        for (int i = 0; i < Includes.size(); ++i)
-               HSO.AddPath(Includes[i], frontend::Angled, true, false, false);
+               add_path(HSO, Includes[i]);
 
        PO.addMacroDef("__isl_give=__attribute__((annotate(\"isl_give\")))");
        PO.addMacroDef("__isl_keep=__attribute__((annotate(\"isl_keep\")))");