From 1d2f00faea9523a1bed93085a800063e88f09482 Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Thu, 28 May 2020 09:30:00 -0700 Subject: [PATCH] [IR] move out modules unrelated to IR Summary: IR/ should contain modules pertaining to the core IR of infer, i.e. how CFGs are represented (including SIL). These categories of modules were moved: - Access paths and HIL are an abstraction on top of SIL used by certain analyses. Moving the corresponding modules to IR/ makes this clearer as they are not really part of the IR (they are less fundamental than SIL). - Error reporting is also something for other analyses, not part of IR. Moved a bunch of modules related to that to absint/. - Same for ProcnameDispatcher - biabduction-speficic modules: Objc_models, BiabductionModels - test-determinator-specific modules: JProcname Reviewed By: ezgicicek Differential Revision: D21722368 fbshipit-source-id: b28e9bdac --- infer/src/{IR => absint}/AccessPath.ml | 0 infer/src/{IR => absint}/AccessPath.mli | 0 infer/src/{IR => absint}/CallSite.ml | 0 infer/src/{IR => absint}/CallSite.mli | 0 infer/src/{IR => absint}/Errlog.ml | 0 infer/src/{IR => absint}/Errlog.mli | 0 infer/src/{IR => absint}/Exceptions.ml | 0 infer/src/{IR => absint}/Exceptions.mli | 0 infer/src/{IR => absint}/HilExp.ml | 0 infer/src/{IR => absint}/HilExp.mli | 0 infer/src/{IR => absint}/HilInstr.ml | 0 infer/src/{IR => absint}/HilInstr.mli | 0 infer/src/{IR => absint}/IssueLog.ml | 0 infer/src/{IR => absint}/IssueLog.mli | 0 infer/src/{IR => absint}/Localise.ml | 0 infer/src/{IR => absint}/Localise.mli | 0 infer/src/{IR => absint}/Mleak_buckets.ml | 0 infer/src/{IR => absint}/Mleak_buckets.mli | 0 infer/src/{IR => absint}/ProcnameDispatcher.ml | 0 infer/src/{IR => absint}/ProcnameDispatcher.mli | 0 infer/src/{IR => biabduction}/BiabductionModels.ml | 0 infer/src/{IR => biabduction}/BiabductionModels.mli | 0 infer/src/{IR => biabduction}/Objc_models.ml | 0 infer/src/{IR => biabduction}/Objc_models.mli | 0 infer/src/clang/dune.in | 6 ++++-- infer/src/integration/dune.in | 4 ++-- infer/src/java/dune.in | 4 ++-- infer/src/{IR => test_determinator}/JProcname.ml | 0 infer/src/{IR => test_determinator}/JProcname.mli | 0 29 files changed, 8 insertions(+), 6 deletions(-) rename infer/src/{IR => absint}/AccessPath.ml (100%) rename infer/src/{IR => absint}/AccessPath.mli (100%) rename infer/src/{IR => absint}/CallSite.ml (100%) rename infer/src/{IR => absint}/CallSite.mli (100%) rename infer/src/{IR => absint}/Errlog.ml (100%) rename infer/src/{IR => absint}/Errlog.mli (100%) rename infer/src/{IR => absint}/Exceptions.ml (100%) rename infer/src/{IR => absint}/Exceptions.mli (100%) rename infer/src/{IR => absint}/HilExp.ml (100%) rename infer/src/{IR => absint}/HilExp.mli (100%) rename infer/src/{IR => absint}/HilInstr.ml (100%) rename infer/src/{IR => absint}/HilInstr.mli (100%) rename infer/src/{IR => absint}/IssueLog.ml (100%) rename infer/src/{IR => absint}/IssueLog.mli (100%) rename infer/src/{IR => absint}/Localise.ml (100%) rename infer/src/{IR => absint}/Localise.mli (100%) rename infer/src/{IR => absint}/Mleak_buckets.ml (100%) rename infer/src/{IR => absint}/Mleak_buckets.mli (100%) rename infer/src/{IR => absint}/ProcnameDispatcher.ml (100%) rename infer/src/{IR => absint}/ProcnameDispatcher.mli (100%) rename infer/src/{IR => biabduction}/BiabductionModels.ml (100%) rename infer/src/{IR => biabduction}/BiabductionModels.mli (100%) rename infer/src/{IR => biabduction}/Objc_models.ml (100%) rename infer/src/{IR => biabduction}/Objc_models.mli (100%) rename infer/src/{IR => test_determinator}/JProcname.ml (100%) rename infer/src/{IR => test_determinator}/JProcname.mli (100%) diff --git a/infer/src/IR/AccessPath.ml b/infer/src/absint/AccessPath.ml similarity index 100% rename from infer/src/IR/AccessPath.ml rename to infer/src/absint/AccessPath.ml diff --git a/infer/src/IR/AccessPath.mli b/infer/src/absint/AccessPath.mli similarity index 100% rename from infer/src/IR/AccessPath.mli rename to infer/src/absint/AccessPath.mli diff --git a/infer/src/IR/CallSite.ml b/infer/src/absint/CallSite.ml similarity index 100% rename from infer/src/IR/CallSite.ml rename to infer/src/absint/CallSite.ml diff --git a/infer/src/IR/CallSite.mli b/infer/src/absint/CallSite.mli similarity index 100% rename from infer/src/IR/CallSite.mli rename to infer/src/absint/CallSite.mli diff --git a/infer/src/IR/Errlog.ml b/infer/src/absint/Errlog.ml similarity index 100% rename from infer/src/IR/Errlog.ml rename to infer/src/absint/Errlog.ml diff --git a/infer/src/IR/Errlog.mli b/infer/src/absint/Errlog.mli similarity index 100% rename from infer/src/IR/Errlog.mli rename to infer/src/absint/Errlog.mli diff --git a/infer/src/IR/Exceptions.ml b/infer/src/absint/Exceptions.ml similarity index 100% rename from infer/src/IR/Exceptions.ml rename to infer/src/absint/Exceptions.ml diff --git a/infer/src/IR/Exceptions.mli b/infer/src/absint/Exceptions.mli similarity index 100% rename from infer/src/IR/Exceptions.mli rename to infer/src/absint/Exceptions.mli diff --git a/infer/src/IR/HilExp.ml b/infer/src/absint/HilExp.ml similarity index 100% rename from infer/src/IR/HilExp.ml rename to infer/src/absint/HilExp.ml diff --git a/infer/src/IR/HilExp.mli b/infer/src/absint/HilExp.mli similarity index 100% rename from infer/src/IR/HilExp.mli rename to infer/src/absint/HilExp.mli diff --git a/infer/src/IR/HilInstr.ml b/infer/src/absint/HilInstr.ml similarity index 100% rename from infer/src/IR/HilInstr.ml rename to infer/src/absint/HilInstr.ml diff --git a/infer/src/IR/HilInstr.mli b/infer/src/absint/HilInstr.mli similarity index 100% rename from infer/src/IR/HilInstr.mli rename to infer/src/absint/HilInstr.mli diff --git a/infer/src/IR/IssueLog.ml b/infer/src/absint/IssueLog.ml similarity index 100% rename from infer/src/IR/IssueLog.ml rename to infer/src/absint/IssueLog.ml diff --git a/infer/src/IR/IssueLog.mli b/infer/src/absint/IssueLog.mli similarity index 100% rename from infer/src/IR/IssueLog.mli rename to infer/src/absint/IssueLog.mli diff --git a/infer/src/IR/Localise.ml b/infer/src/absint/Localise.ml similarity index 100% rename from infer/src/IR/Localise.ml rename to infer/src/absint/Localise.ml diff --git a/infer/src/IR/Localise.mli b/infer/src/absint/Localise.mli similarity index 100% rename from infer/src/IR/Localise.mli rename to infer/src/absint/Localise.mli diff --git a/infer/src/IR/Mleak_buckets.ml b/infer/src/absint/Mleak_buckets.ml similarity index 100% rename from infer/src/IR/Mleak_buckets.ml rename to infer/src/absint/Mleak_buckets.ml diff --git a/infer/src/IR/Mleak_buckets.mli b/infer/src/absint/Mleak_buckets.mli similarity index 100% rename from infer/src/IR/Mleak_buckets.mli rename to infer/src/absint/Mleak_buckets.mli diff --git a/infer/src/IR/ProcnameDispatcher.ml b/infer/src/absint/ProcnameDispatcher.ml similarity index 100% rename from infer/src/IR/ProcnameDispatcher.ml rename to infer/src/absint/ProcnameDispatcher.ml diff --git a/infer/src/IR/ProcnameDispatcher.mli b/infer/src/absint/ProcnameDispatcher.mli similarity index 100% rename from infer/src/IR/ProcnameDispatcher.mli rename to infer/src/absint/ProcnameDispatcher.mli diff --git a/infer/src/IR/BiabductionModels.ml b/infer/src/biabduction/BiabductionModels.ml similarity index 100% rename from infer/src/IR/BiabductionModels.ml rename to infer/src/biabduction/BiabductionModels.ml diff --git a/infer/src/IR/BiabductionModels.mli b/infer/src/biabduction/BiabductionModels.mli similarity index 100% rename from infer/src/IR/BiabductionModels.mli rename to infer/src/biabduction/BiabductionModels.mli diff --git a/infer/src/IR/Objc_models.ml b/infer/src/biabduction/Objc_models.ml similarity index 100% rename from infer/src/IR/Objc_models.ml rename to infer/src/biabduction/Objc_models.ml diff --git a/infer/src/IR/Objc_models.mli b/infer/src/biabduction/Objc_models.mli similarity index 100% rename from infer/src/IR/Objc_models.mli rename to infer/src/biabduction/Objc_models.mli diff --git a/infer/src/clang/dune.in b/infer/src/clang/dune.in index 97bfd18ff..f072eb337 100644 --- a/infer/src/clang/dune.in +++ b/infer/src/clang/dune.in @@ -16,8 +16,10 @@ let clang = (flags (:standard -open Core -open IStdlib -open IStd -open OpenSource -open ATDGenerated - -open IBase -open IR -open Absint -open Checkers -open TestDeterminators)) - (libraries oUnit core IStdlib ATDGenerated IBase IR Absint Checkers TestDeterminators) + -open IBase -open IR -open Absint -open Checkers -open TestDeterminators + -open Biabduction -open Backend)) + (libraries oUnit core IStdlib ATDGenerated IBase IR Absint Checkers + TestDeterminators Biabduction Backend) (preprocess (pps ppx_compare)) )|} (if clang then ":standard \\ ClangFrontendStubs" else "ClangFrontendStubs") diff --git a/infer/src/integration/dune.in b/infer/src/integration/dune.in index 6fc607fdd..45e2215f2 100644 --- a/infer/src/integration/dune.in +++ b/infer/src/integration/dune.in @@ -16,9 +16,9 @@ let library = (flags (:standard -open Core -open IStdlib -open IStd -open OpenSource -open ATDGenerated - -open IBase -open IR -open BO -open Costlib -open Concurrency -open Backend + -open IBase -open IR -open Absint -open BO -open Costlib -open Concurrency -open Backend -open TestDeterminators -open ClangFrontend -open ASTLanguage -open JavaFrontend %s %s)) - (libraries xmlm core IStdlib ATDGenerated IBase IR BO Costlib Concurrency Backend + (libraries xmlm core IStdlib ATDGenerated IBase IR Absint BO Costlib Concurrency Backend TestDeterminators ClangFrontend ASTLanguage JavaFrontend) (preprocess (pps ppx_compare)) ) diff --git a/infer/src/java/dune.in b/infer/src/java/dune.in index eebddcee7..0f3a5e5c8 100644 --- a/infer/src/java/dune.in +++ b/infer/src/java/dune.in @@ -18,8 +18,8 @@ let java = (flags (:standard -open Core -open IStdlib -open IStd -open OpenSource -open ATDGenerated - -open IBase -open IR -open Absint)) - (libraries %s core IStdlib ATDGenerated IBase IR Absint) + -open IBase -open IR -open Absint -open Biabduction -open Backend)) + (libraries %s core IStdlib ATDGenerated IBase IR Absint Biabduction Backend) (preprocess (pps ppx_compare)) )|} (if java then ":standard \\ JavaFrontendStubs" else "JavaFrontendStubs") diff --git a/infer/src/IR/JProcname.ml b/infer/src/test_determinator/JProcname.ml similarity index 100% rename from infer/src/IR/JProcname.ml rename to infer/src/test_determinator/JProcname.ml diff --git a/infer/src/IR/JProcname.mli b/infer/src/test_determinator/JProcname.mli similarity index 100% rename from infer/src/IR/JProcname.mli rename to infer/src/test_determinator/JProcname.mli