git: 454819577fc9 - main - devel/phasar: update 2403 → 2503

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sun, 16 Mar 2025 07:30:21 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=454819577fc9e07ffd9b6f454caf54e4a8dce07b

commit 454819577fc9e07ffd9b6f454caf54e4a8dce07b
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-03-16 07:00:11 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-03-16 07:30:18 +0000

    devel/phasar: update 2403 → 2503
    
    Reported by:    portscout
---
 devel/phasar/Makefile                              |  17 +--
 devel/phasar/distinfo                              |  16 ++-
 devel/phasar/files/patch-CMakeLists.txt            |  20 ++-
 .../files/patch-lib_Pointer_PointsToInfo.cpp       |   6 +-
 devel/phasar/files/patch-lib_Utils_DOTGraph.cpp    |  12 ++
 devel/phasar/pkg-plist                             | 137 ++++++++++++++-------
 6 files changed, 142 insertions(+), 66 deletions(-)

diff --git a/devel/phasar/Makefile b/devel/phasar/Makefile
index 010194bd23d1..60a32c53f289 100644
--- a/devel/phasar/Makefile
+++ b/devel/phasar/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	phasar
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2403
-PORTREVISION=	3
+DISTVERSION=	2503
 CATEGORIES=	devel science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	LLVM-based static analysis framework
-WWW=		https://phasar.org/
+WWW=		https://phasar.org \
+		https://github.com/secure-software-engineering/phasar
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -14,21 +14,22 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LIB_DEPENDS=	libboost_graph.so:devel/boost-libs \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	bash:shells/bash
+TEST_DEPENDS=	googletest>0:devel/googletest
 
-USES=		cmake:testing llvm:lib,min=14,max=14 localbase:ldflags python shebangfix sqlite # compiler:c++17-lang
+USES=		cmake:testing llvm:lib,min=15,max=15 localbase:ldflags python shebangfix sqlite # compiler:c++17-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	secure-software-engineering
-GH_TUPLE=	google:googletest:e2239ee:googletest/external/googletest \
-		nlohmann:json:bc889af:json/external/json \
-		pboettch:json-schema-validator:491ac44:json_schema_validator/external/json-schema-validator
+GH_TUPLE=	nlohmann:json:9cca280:json/external/json \
+		pboettch:json-schema-validator:349cba9:json_schema_validator/external/json-schema-validator
 
 SHEBANG_GLOB=	*.py *.sh
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	PHASAR_BUILD_UNITTESTS
 CMAKE_ARGS=	-DPHASAR_CUSTOM_CONFIG_INSTALL_DIR=etc/phasar
+CMAKE_TESTING_ON=	PHASAR_BUILD_UNITTESTS
 
 CONFLICTS_INSTALL=	nlohmann-json # see https://github.com/secure-software-engineering/phasar/issues/715
 
@@ -43,4 +44,6 @@ post-install: # workaround for https://github.com/secure-software-engineering/ph
 		${STAGEDIR}${PREFIX}/include/gtest \
 		${STAGEDIR}${PREFIX}/include/nlohmann
 
+# tests as of 2503: 91% tests passed, 5 tests failed out of 54, see https://github.com/secure-software-engineering/phasar/issues/761
+
 .include <bsd.port.mk>
diff --git a/devel/phasar/distinfo b/devel/phasar/distinfo
index 0fdd4c2263aa..4afbc13c82eb 100644
--- a/devel/phasar/distinfo
+++ b/devel/phasar/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1713056991
-SHA256 (secure-software-engineering-phasar-v2403_GH0.tar.gz) = 57a9b47e763ed746d61b69dced0519c039f5c49245a28d2f9167ac9879f45dbc
-SIZE (secure-software-engineering-phasar-v2403_GH0.tar.gz) = 7447366
-SHA256 (google-googletest-e2239ee_GH0.tar.gz) = 47a8ca2e1be737588628cbc82726a7c4fed060ae0098709003845e3ef298da2f
-SIZE (google-googletest-e2239ee_GH0.tar.gz) = 886254
-SHA256 (nlohmann-json-bc889af_GH0.tar.gz) = 769f4b3a051f5139f367801c52acfcda969aea13fa230fd2b133ab9908a01ea2
-SIZE (nlohmann-json-bc889af_GH0.tar.gz) = 8097638
-SHA256 (pboettch-json-schema-validator-491ac44_GH0.tar.gz) = 30be9e6235a3343345b5c1a292bb1d8e4b3f8623002a1da88dcf5ddd03208167
-SIZE (pboettch-json-schema-validator-491ac44_GH0.tar.gz) = 79632
+TIMESTAMP = 1742108395
+SHA256 (secure-software-engineering-phasar-v2503_GH0.tar.gz) = 3f46464ddb5451886f4926a144d44333f9f5320be01fbde705186be2fec230c7
+SIZE (secure-software-engineering-phasar-v2503_GH0.tar.gz) = 7520485
+SHA256 (nlohmann-json-9cca280_GH0.tar.gz) = 68c2ca874e6ee3940938ba409e65f231684784aabf4041094d4c02fa4fa3bc2b
+SIZE (nlohmann-json-9cca280_GH0.tar.gz) = 8053755
+SHA256 (pboettch-json-schema-validator-349cba9_GH0.tar.gz) = e2cf35fc41ffa87c043bb8285e1aeb45d32f4a9f393ed7f744a5938cf3bfcbee
+SIZE (pboettch-json-schema-validator-349cba9_GH0.tar.gz) = 77890
diff --git a/devel/phasar/files/patch-CMakeLists.txt b/devel/phasar/files/patch-CMakeLists.txt
index 0ce37d7799e8..fe96d54d1b47 100644
--- a/devel/phasar/files/patch-CMakeLists.txt
+++ b/devel/phasar/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2024-03-02 09:55:57 UTC
+--- CMakeLists.txt.orig	2025-03-14 12:56:24 UTC
 +++ CMakeLists.txt
-@@ -111,7 +111,7 @@ if (NOT "${PHASAR_TARGET_ARCH_INTERNAL}" STREQUAL "")
+@@ -125,7 +125,7 @@ if (NOT "${PHASAR_TARGET_ARCH_INTERNAL}" STREQUAL "")
    check_cxx_compiler_flag("-march=${PHASAR_TARGET_ARCH_INTERNAL}" MARCH_SUPPORTED)
    if (MARCH_SUPPORTED)
      message(STATUS "Target architecture '${PHASAR_TARGET_ARCH_INTERNAL}' enabled")
@@ -9,8 +9,8 @@
    else()
      message(WARNING "Target architecture '${PHASAR_TARGET_ARCH_INTERNAL}' not supported. Fallback to generic build")
    endif()
-@@ -220,10 +220,12 @@ endif()
- endif()
+@@ -248,11 +248,13 @@ set(PHASAR_DEPS_INSTALL_DESTINATION ${CMAKE_INSTALL_LI
+ set(PHASAR_DEPS_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/phasar/deps)
  
  # Filesystem
 +if (FALSE)
@@ -18,7 +18,17 @@
    set(PHASAR_STD_FILESYSTEM c++fs)
  else()
    set(PHASAR_STD_FILESYSTEM stdc++fs)
-+endif()
  endif()
++endif()
  
  # Config
+ set(PHASAR_CUSTOM_CONFIG_INSTALL_DIR "" CACHE STRING "If set, customizes the directory, where configuration files for PhASAR are installed (default is ${CMAKE_INSTALL_PREFIX}/.phasar-config)")
+@@ -407,6 +409,8 @@ if (PHASAR_BUILD_UNITTESTS)
+ # Add Phasar unittests and build all IR test code
+ if (PHASAR_BUILD_UNITTESTS)
+   message("Phasar unittests")
++
++  find_package(GTest CONFIG REQUIRED)
+ 
+   enable_testing()
+   add_subdirectory(unittests)
diff --git a/devel/phasar/files/patch-lib_Pointer_PointsToInfo.cpp b/devel/phasar/files/patch-lib_Pointer_PointsToInfo.cpp
index cc1e589eeb10..169fa499358e 100644
--- a/devel/phasar/files/patch-lib_Pointer_PointsToInfo.cpp
+++ b/devel/phasar/files/patch-lib_Pointer_PointsToInfo.cpp
@@ -1,10 +1,10 @@
 - workaround for https://github.com/secure-software-engineering/phasar/issues/718
 
---- lib/Pointer/PointsToInfo.cpp.orig	2024-04-26 06:58:43 UTC
+--- lib/Pointer/PointsToInfo.cpp.orig	2025-03-14 12:56:24 UTC
 +++ lib/Pointer/PointsToInfo.cpp
-@@ -19,6 +19,7 @@
- 
+@@ -20,6 +20,7 @@
  #include <array>
+ #include <tuple>
  #include <utility>
 +#include <vector>
  
diff --git a/devel/phasar/files/patch-lib_Utils_DOTGraph.cpp b/devel/phasar/files/patch-lib_Utils_DOTGraph.cpp
new file mode 100644
index 000000000000..0cc92bdb2c3d
--- /dev/null
+++ b/devel/phasar/files/patch-lib_Utils_DOTGraph.cpp
@@ -0,0 +1,12 @@
+- https://github.com/secure-software-engineering/phasar/issues/762
+
+--- lib/Utils/DOTGraph.cpp.orig	2025-03-16 05:23:34 UTC
++++ lib/Utils/DOTGraph.cpp
+@@ -23,6 +23,7 @@
+ #include <fstream>
+ #include <iterator>
+ #include <ostream>
++#include <sstream>
+ #include <utility>
+ 
+ namespace psr {
diff --git a/devel/phasar/pkg-plist b/devel/phasar/pkg-plist
index f4af43f0f818..5cc25da79866 100644
--- a/devel/phasar/pkg-plist
+++ b/devel/phasar/pkg-plist
@@ -1,6 +1,5 @@
 bin/DB/phasar-create-db-scheme.sql
 bin/DB/phasar-sql2cpp.py
-bin/myphasartool
 bin/phasar-cli
 bin/phasar-compile2llvmIR.py
 bin/phasar-mkconfig.sh
@@ -8,6 +7,7 @@ bin/phasar-plot-pamm.py
 %%ETCDIR%%/DOTGraphConfig.json
 %%ETCDIR%%/README.txt
 %%ETCDIR%%/TaintConfigSchema.json
+%%ETCDIR%%/double-free-config.json
 %%ETCDIR%%/glibc_function_list_v1-04.05.17.conf
 %%ETCDIR%%/llvm_intrinsics_function_list_v1-04.05.17.conf
 %%ETCDIR%%/phasar-source-sink-function.json
@@ -30,12 +30,12 @@ include/phasar/ControlFlow/CallGraph.h
 include/phasar/ControlFlow/CallGraphAnalysisType.def
 include/phasar/ControlFlow/CallGraphAnalysisType.h
 include/phasar/ControlFlow/CallGraphBase.h
+include/phasar/ControlFlow/CallGraphData.h
 include/phasar/ControlFlow/ICFGBase.h
+include/phasar/ControlFlow/SparseCFGBase.h
+include/phasar/ControlFlow/SparseCFGProvider.h
 include/phasar/ControlFlow/SpecialMemberFunctionType.def
 include/phasar/ControlFlow/SpecialMemberFunctionType.h
-include/phasar/Controller.h
-include/phasar/Controller/AnalysisController.h
-include/phasar/Controller/AnalysisControllerEmitterOptions.h
 include/phasar/DB.h
 include/phasar/DB/Hexastore.h
 include/phasar/DB/ProjectIRDBBase.h
@@ -49,18 +49,34 @@ include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h
 include/phasar/DataFlow/IfdsIde/EdgeFunctions.h
 include/phasar/DataFlow/IfdsIde/EntryPointUtils.h
 include/phasar/DataFlow/IfdsIde/FlowFunctions.h
+include/phasar/DataFlow/IfdsIde/GenericFlowFunction.h
 include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
 include/phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h
 include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
 include/phasar/DataFlow/IfdsIde/InitialSeeds.h
+include/phasar/DataFlow/IfdsIde/Solver/Compressor.h
 include/phasar/DataFlow/IfdsIde/Solver/ESGEdgeKind.h
+include/phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCache.h
+include/phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCacheStats.h
 include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCache.h
+include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheNG.h
+include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheStats.h
+include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCache.h
+include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCacheStats.h
+include/phasar/DataFlow/IfdsIde/Solver/GenericSolverResults.h
 include/phasar/DataFlow/IfdsIde/Solver/IDESolver.h
 include/phasar/DataFlow/IfdsIde/Solver/IDESolverAPIMixin.h
 include/phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h
+include/phasar/DataFlow/IfdsIde/Solver/IdBasedSolverResults.h
+include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h
+include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverBase.h
+include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverResults.h
+include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolverStats.h
 include/phasar/DataFlow/IfdsIde/Solver/JumpFunctions.h
 include/phasar/DataFlow/IfdsIde/Solver/PathAwareIDESolver.h
 include/phasar/DataFlow/IfdsIde/Solver/PathEdge.h
+include/phasar/DataFlow/IfdsIde/Solver/StaticIDESolverConfig.h
+include/phasar/DataFlow/IfdsIde/Solver/WorkListTraits.h
 include/phasar/DataFlow/IfdsIde/SolverResults.h
 include/phasar/DataFlow/IfdsIde/SpecialSummaries.h
 include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h
@@ -86,47 +102,34 @@ include/phasar/PhasarClang/RandomChangeFrontendAction.h
 include/phasar/PhasarClang/RandomChangeVisitor.h
 include/phasar/PhasarLLVM.h
 include/phasar/PhasarLLVM/ControlFlow.h
+include/phasar/PhasarLLVM/ControlFlow/EntryFunctionUtils.h
+include/phasar/PhasarLLVM/ControlFlow/GlobalCtorsDtorsModel.h
 include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h
 include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
 include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h
+include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCallGraph.h
+include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.h
 include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
+include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h
 include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h
 include/phasar/PhasarLLVM/ControlFlow/Resolver/DTAResolver.h
 include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h
 include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h
 include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h
 include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
+include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFG.h
+include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFGProvider.h
+include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h
+include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
 include/phasar/PhasarLLVM/DB.h
 include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h
 include/phasar/PhasarLLVM/DataFlow.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberEntry.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStatsWriter.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/ExtendedValue.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h
+include/phasar/PhasarLLVM/DataFlow/IfdsIde/FunctionDataFlowFacts.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h
+include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFunctionDataFlowFacts.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMSolverResults.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h
+include/phasar/PhasarLLVM/DataFlow/IfdsIde/LibCSummary.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AllSanitized.h
@@ -139,6 +142,7 @@ include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Transf
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
+include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h
@@ -158,7 +162,6 @@ include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h
-include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSProtoAnalysis.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSignAnalysis.h
 include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.h
@@ -189,9 +192,11 @@ include/phasar/PhasarLLVM/Passes/ExampleModulePass.h
 include/phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h
 include/phasar/PhasarLLVM/Passes/ValueAnnotationPass.h
 include/phasar/PhasarLLVM/Pointer.h
+include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h
 include/phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h
 include/phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h
 include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
+include/phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h
 include/phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
 include/phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h
 include/phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h
@@ -205,8 +210,11 @@ include/phasar/PhasarLLVM/TaintConfig/TaintConfigData.h
 include/phasar/PhasarLLVM/TaintConfig/TaintConfigUtilities.h
 include/phasar/PhasarLLVM/TypeHierarchy.h
 include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h
+include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchyData.h
 include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h
+include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyData.h
 include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
+include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTableData.h
 include/phasar/PhasarLLVM/Utils.h
 include/phasar/PhasarLLVM/Utils/Annotation.h
 include/phasar/PhasarLLVM/Utils/BasicBlockOrdering.h
@@ -251,14 +259,17 @@ include/phasar/Utils/DOTGraph.h
 include/phasar/Utils/DebugOutput.h
 include/phasar/Utils/DefaultAnalysisPrinter.h
 include/phasar/Utils/DefaultValue.h
+include/phasar/Utils/EmptyBaseOptimizationUtils.h
 include/phasar/Utils/EnumFlags.h
 include/phasar/Utils/EquivalenceClassMap.h
 include/phasar/Utils/ErrorHandling.h
 include/phasar/Utils/GraphTraits.h
 include/phasar/Utils/IO.h
+include/phasar/Utils/InitPhasar.h
 include/phasar/Utils/IotaIterator.h
 include/phasar/Utils/JoinLattice.h
 include/phasar/Utils/Logger.h
+include/phasar/Utils/Macros.h
 include/phasar/Utils/MaybeUniquePtr.h
 include/phasar/Utils/MemoryResource.h
 include/phasar/Utils/NlohmannLogging.h
@@ -267,33 +278,30 @@ include/phasar/Utils/Nullable.h
 include/phasar/Utils/OnTheFlyAnalysisPrinter.h
 include/phasar/Utils/PAMM.h
 include/phasar/Utils/PAMMMacros.h
+include/phasar/Utils/PointerUtils.h
 include/phasar/Utils/Printer.h
 include/phasar/Utils/RepeatIterator.h
+include/phasar/Utils/SemiRing.h
 include/phasar/Utils/SeverityLevel.def
 include/phasar/Utils/Soundness.def
 include/phasar/Utils/Soundness.h
 include/phasar/Utils/StableVector.h
 include/phasar/Utils/Table.h
+include/phasar/Utils/TableWrappers.h
 include/phasar/Utils/Timer.h
 include/phasar/Utils/TypeTraits.h
 include/phasar/Utils/Utilities.h
-lib/cmake/nlohmann_json_schema_validator/nlohmann_json_schema_validatorConfig.cmake
-lib/cmake/nlohmann_json_schema_validator/nlohmann_json_schema_validatorConfigVersion.cmake
-lib/cmake/nlohmann_json_schema_validator/nlohmann_json_schema_validatorTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/nlohmann_json_schema_validator/nlohmann_json_schema_validatorTargets.cmake
+lib/cmake/phasar/PhasarDepsExports-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/phasar/PhasarDepsExports.cmake
 lib/cmake/phasar/PhasarExports-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/phasar/PhasarExports.cmake
 lib/cmake/phasar/phasarConfig.cmake
 lib/cmake/phasar/phasarConfigVersion.cmake
-lib/libnlohmann_json_schema_validator.so
-lib/libnlohmann_json_schema_validator.so.2
-lib/libnlohmann_json_schema_validator.so.2.2.0
 lib/libphasar.so
 lib/libphasar_analysis_strategy.so
 lib/libphasar_clang.so
 lib/libphasar_config.so
 lib/libphasar_controlflow.so
-lib/libphasar_controller.so
 lib/libphasar_db.so
 lib/libphasar_llvm.so
 lib/libphasar_llvm_controlflow.so
@@ -309,7 +317,52 @@ lib/libphasar_passes.so
 lib/libphasar_pointer.so
 lib/libphasar_taintconfig.so
 lib/libphasar_utils.so
-share/cmake/nlohmann_json/nlohmann_jsonConfig.cmake
-share/cmake/nlohmann_json/nlohmann_jsonConfigVersion.cmake
-share/cmake/nlohmann_json/nlohmann_jsonTargets.cmake
-share/pkgconfig/nlohmann_json.pc
+lib/phasar/deps/include/nlohmann/adl_serializer.hpp
+lib/phasar/deps/include/nlohmann/byte_container_with_subtype.hpp
+lib/phasar/deps/include/nlohmann/detail/abi_macros.hpp
+lib/phasar/deps/include/nlohmann/detail/conversions/from_json.hpp
+lib/phasar/deps/include/nlohmann/detail/conversions/to_chars.hpp
+lib/phasar/deps/include/nlohmann/detail/conversions/to_json.hpp
+lib/phasar/deps/include/nlohmann/detail/exceptions.hpp
+lib/phasar/deps/include/nlohmann/detail/hash.hpp
+lib/phasar/deps/include/nlohmann/detail/input/binary_reader.hpp
+lib/phasar/deps/include/nlohmann/detail/input/input_adapters.hpp
+lib/phasar/deps/include/nlohmann/detail/input/json_sax.hpp
+lib/phasar/deps/include/nlohmann/detail/input/lexer.hpp
+lib/phasar/deps/include/nlohmann/detail/input/parser.hpp
+lib/phasar/deps/include/nlohmann/detail/input/position_t.hpp
+lib/phasar/deps/include/nlohmann/detail/iterators/internal_iterator.hpp
+lib/phasar/deps/include/nlohmann/detail/iterators/iter_impl.hpp
+lib/phasar/deps/include/nlohmann/detail/iterators/iteration_proxy.hpp
+lib/phasar/deps/include/nlohmann/detail/iterators/iterator_traits.hpp
+lib/phasar/deps/include/nlohmann/detail/iterators/json_reverse_iterator.hpp
+lib/phasar/deps/include/nlohmann/detail/iterators/primitive_iterator.hpp
+lib/phasar/deps/include/nlohmann/detail/json_custom_base_class.hpp
+lib/phasar/deps/include/nlohmann/detail/json_pointer.hpp
+lib/phasar/deps/include/nlohmann/detail/json_ref.hpp
+lib/phasar/deps/include/nlohmann/detail/macro_scope.hpp
+lib/phasar/deps/include/nlohmann/detail/macro_unscope.hpp
+lib/phasar/deps/include/nlohmann/detail/meta/call_std/begin.hpp
+lib/phasar/deps/include/nlohmann/detail/meta/call_std/end.hpp
+lib/phasar/deps/include/nlohmann/detail/meta/cpp_future.hpp
+lib/phasar/deps/include/nlohmann/detail/meta/detected.hpp
+lib/phasar/deps/include/nlohmann/detail/meta/identity_tag.hpp
+lib/phasar/deps/include/nlohmann/detail/meta/is_sax.hpp
+lib/phasar/deps/include/nlohmann/detail/meta/std_fs.hpp
+lib/phasar/deps/include/nlohmann/detail/meta/type_traits.hpp
+lib/phasar/deps/include/nlohmann/detail/meta/void_t.hpp
+lib/phasar/deps/include/nlohmann/detail/output/binary_writer.hpp
+lib/phasar/deps/include/nlohmann/detail/output/output_adapters.hpp
+lib/phasar/deps/include/nlohmann/detail/output/serializer.hpp
+lib/phasar/deps/include/nlohmann/detail/string_concat.hpp
+lib/phasar/deps/include/nlohmann/detail/string_escape.hpp
+lib/phasar/deps/include/nlohmann/detail/value_t.hpp
+lib/phasar/deps/include/nlohmann/json-schema.hpp
+lib/phasar/deps/include/nlohmann/json.hpp
+lib/phasar/deps/include/nlohmann/json_fwd.hpp
+lib/phasar/deps/include/nlohmann/ordered_map.hpp
+lib/phasar/deps/include/nlohmann/thirdparty/hedley/hedley.hpp
+lib/phasar/deps/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
+lib/phasar/deps/lib/libnlohmann_json_schema_validator.so
+lib/phasar/deps/lib/libnlohmann_json_schema_validator.so.2
+lib/phasar/deps/lib/libnlohmann_json_schema_validator.so.2.3.0