From a0b020caf5fa2aac3ffe7ea7e455cf7c5ec7839e Mon Sep 17 00:00:00 2001
From: Anwesh Tuladhar <atuladhar@meta.com>
Date: Tue, 24 Sep 2024 15:37:51 -0700
Subject: [PATCH] Remove unused headers from Frame.h

Summary: `Frame.h` quite a few unused headers. Removed them and included them where necessary.

Reviewed By: dkgi

Differential Revision: D63342713

fbshipit-source-id: 414fa23d8f72d9fbf993e72c235ddf32b8db974f
---
 source/BackwardTaintTransfer.cpp          | 1 +
 source/ForwardTaintTransfer.cpp           | 1 +
 source/Frame.cpp                          | 2 --
 source/Frame.h                            | 9 +--------
 source/KindFrames.h                       | 2 ++
 source/Model.cpp                          | 1 +
 source/PostprocessTraces.cpp              | 1 +
 source/PropagationConfig.cpp              | 2 ++
 source/Taint.cpp                          | 1 +
 source/TaintConfig.cpp                    | 1 +
 source/model-generator/ModelGenerator.cpp | 1 +
 source/model-generator/ModelTemplates.cpp | 1 +
 source/tests/Test.h                       | 1 +
 13 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/source/BackwardTaintTransfer.cpp b/source/BackwardTaintTransfer.cpp
index 229da37e..cde0004f 100644
--- a/source/BackwardTaintTransfer.cpp
+++ b/source/BackwardTaintTransfer.cpp
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <mariana-trench/AccessPathFactory.h>
 #include <mariana-trench/ArtificialMethods.h>
 #include <mariana-trench/BackwardTaintTransfer.h>
 #include <mariana-trench/CallGraph.h>
diff --git a/source/ForwardTaintTransfer.cpp b/source/ForwardTaintTransfer.cpp
index 46266c05..187f27e4 100644
--- a/source/ForwardTaintTransfer.cpp
+++ b/source/ForwardTaintTransfer.cpp
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <mariana-trench/AccessPathFactory.h>
 #include <mariana-trench/ArtificialMethods.h>
 #include <mariana-trench/CallGraph.h>
 #include <mariana-trench/ClassProperties.h>
diff --git a/source/Frame.cpp b/source/Frame.cpp
index 83bea88d..46ee4fde 100644
--- a/source/Frame.cpp
+++ b/source/Frame.cpp
@@ -19,8 +19,6 @@
 #include <mariana-trench/JsonValidation.h>
 #include <mariana-trench/Log.h>
 #include <mariana-trench/OriginFactory.h>
-#include <mariana-trench/SanitizerSetTransform.h>
-#include <mariana-trench/TaggedRootSet.h>
 #include <mariana-trench/TaintConfig.h>
 
 namespace marianatrench {
diff --git a/source/Frame.h b/source/Frame.h
index e885a31b..8a77ee66 100644
--- a/source/Frame.h
+++ b/source/Frame.h
@@ -16,13 +16,10 @@
 #include <sparta/HashedSetAbstractDomain.h>
 
 #include <mariana-trench/Access.h>
-#include <mariana-trench/AccessPathFactory.h>
 #include <mariana-trench/Assert.h>
 #include <mariana-trench/CallClassIntervalContext.h>
 #include <mariana-trench/CallInfo.h>
-#include <mariana-trench/CallKind.h>
 #include <mariana-trench/CanonicalName.h>
-#include <mariana-trench/ClassIntervals.h>
 #include <mariana-trench/Compiler.h>
 #include <mariana-trench/ExportOriginsMode.h>
 #include <mariana-trench/ExtraTraceSet.h>
@@ -31,16 +28,12 @@
 #include <mariana-trench/FeatureSet.h>
 #include <mariana-trench/IncludeMacros.h>
 #include <mariana-trench/Kind.h>
-#include <mariana-trench/KindFactory.h>
 #include <mariana-trench/Method.h>
 #include <mariana-trench/OriginSet.h>
 #include <mariana-trench/PathTreeDomain.h>
-#include <mariana-trench/PatriciaTreeSetAbstractDomain.h>
 #include <mariana-trench/Position.h>
-#include <mariana-trench/Sanitizer.h>
+#include <mariana-trench/PropagationKind.h>
 #include <mariana-trench/TaggedRootSet.h>
-#include <mariana-trench/TransformKind.h>
-#include <mariana-trench/TransformsFactory.h>
 
 namespace marianatrench {
 
diff --git a/source/KindFrames.h b/source/KindFrames.h
index ce9790d7..5e26fe0a 100644
--- a/source/KindFrames.h
+++ b/source/KindFrames.h
@@ -20,7 +20,9 @@
 #include <mariana-trench/CallClassIntervalContext.h>
 #include <mariana-trench/Frame.h>
 #include <mariana-trench/IncludeMacros.h>
+#include <mariana-trench/Sanitizer.h>
 #include <mariana-trench/TaintConfig.h>
+#include <mariana-trench/TransformKind.h>
 
 namespace marianatrench {
 
diff --git a/source/Model.cpp b/source/Model.cpp
index 12d84c98..5ec3191a 100644
--- a/source/Model.cpp
+++ b/source/Model.cpp
@@ -11,6 +11,7 @@
 #include <Show.h>
 #include <TypeUtil.h>
 
+#include <mariana-trench/AccessPathFactory.h>
 #include <mariana-trench/Assert.h>
 #include <mariana-trench/ClassHierarchies.h>
 #include <mariana-trench/ClassProperties.h>
diff --git a/source/PostprocessTraces.cpp b/source/PostprocessTraces.cpp
index df533efb..300ac856 100644
--- a/source/PostprocessTraces.cpp
+++ b/source/PostprocessTraces.cpp
@@ -11,6 +11,7 @@
 #include <mariana-trench/Methods.h>
 #include <mariana-trench/PostprocessTraces.h>
 #include <mariana-trench/Registry.h>
+#include <mariana-trench/TransformsFactory.h>
 
 namespace marianatrench {
 
diff --git a/source/PropagationConfig.cpp b/source/PropagationConfig.cpp
index 79757198..53e920f4 100644
--- a/source/PropagationConfig.cpp
+++ b/source/PropagationConfig.cpp
@@ -5,7 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <mariana-trench/AccessPathFactory.h>
 #include <mariana-trench/JsonValidation.h>
+#include <mariana-trench/KindFactory.h>
 #include <mariana-trench/PropagationConfig.h>
 #include <mariana-trench/TransformsFactory.h>
 
diff --git a/source/Taint.cpp b/source/Taint.cpp
index 8cc49b94..9dd8a9e1 100644
--- a/source/Taint.cpp
+++ b/source/Taint.cpp
@@ -9,6 +9,7 @@
 #include <iterator>
 #include <unordered_set>
 
+#include <mariana-trench/AccessPathFactory.h>
 #include <mariana-trench/Constants.h>
 #include <mariana-trench/JsonValidation.h>
 #include <mariana-trench/Taint.h>
diff --git a/source/TaintConfig.cpp b/source/TaintConfig.cpp
index 4a47ed95..4488a91e 100644
--- a/source/TaintConfig.cpp
+++ b/source/TaintConfig.cpp
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <mariana-trench/AccessPathFactory.h>
 #include <mariana-trench/Context.h>
 #include <mariana-trench/ExtraTraceSet.h>
 #include <mariana-trench/JsonValidation.h>
diff --git a/source/model-generator/ModelGenerator.cpp b/source/model-generator/ModelGenerator.cpp
index 8f0e1334..1f2fad73 100644
--- a/source/model-generator/ModelGenerator.cpp
+++ b/source/model-generator/ModelGenerator.cpp
@@ -15,6 +15,7 @@
 #include <Resolver.h>
 #include <Walkers.h>
 
+#include <mariana-trench/AccessPathFactory.h>
 #include <mariana-trench/FeatureFactory.h>
 #include <mariana-trench/Fields.h>
 #include <mariana-trench/JsonValidation.h>
diff --git a/source/model-generator/ModelTemplates.cpp b/source/model-generator/ModelTemplates.cpp
index a2e2a2ca..5ff7cbf5 100644
--- a/source/model-generator/ModelTemplates.cpp
+++ b/source/model-generator/ModelTemplates.cpp
@@ -9,6 +9,7 @@
 #include <mariana-trench/JsonValidation.h>
 #include <mariana-trench/KindFactory.h>
 #include <mariana-trench/Log.h>
+#include <mariana-trench/TransformsFactory.h>
 #include <mariana-trench/constraints/MethodConstraints.h>
 #include <mariana-trench/constraints/ParameterConstraints.h>
 #include <mariana-trench/model-generator/ModelTemplates.h>
diff --git a/source/tests/Test.h b/source/tests/Test.h
index 1b127877..f9bbcfdc 100644
--- a/source/tests/Test.h
+++ b/source/tests/Test.h
@@ -15,6 +15,7 @@
 
 #include <DexStore.h>
 
+#include <mariana-trench/AccessPathFactory.h>
 #include <mariana-trench/ArtificialMethods.h>
 #include <mariana-trench/CallGraph.h>
 #include <mariana-trench/ClassHierarchies.h>