blah

Cisco-Talos · Dec 15, 2023 · 27756ab · 27756ab
1 parent a3e1666
commit 27756ab
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 139 deletions.
diff --git a/clambcc/clambc-compiler.py b/clambcc/clambc-compiler.py
@@ -553,8 +553,6 @@ def createInputSourceFile(clangLLVM: ClangLLVM, name: str, args: list, options:
         , 'verify'
         , 'clambc-remove-fshl'
         , 'verify'
-        , 'clambc-remove-pointer-phis'
-        , 'verify'
         , 'clambc-lowering-notfinal' # perform lowering pass
         , 'verify'
         , 'lowerswitch'

diff --git a/libclambcc/CMakeLists.txt b/libclambcc/CMakeLists.txt
@@ -8,7 +8,7 @@ add_subdirectory(ClamBCPreserveABIs)
 add_subdirectory(ClamBCAnalyzer)
 add_subdirectory(Common)
 add_subdirectory(ClamBCVerifier)
-add_subdirectory(ClamBCRemovePointerPHIs)
+#add_subdirectory(ClamBCRemovePointerPHIs)
 add_subdirectory(ClamBCLowering)
 add_subdirectory(ClamBCRemoveFreezeInsts)
 add_subdirectory(ClamBCWriter)

diff --git a/libclambcc/ClamBCRemovePointerPHIs/ClamBCRemovePointerPHIs.cpp b/libclambcc/ClamBCRemovePointerPHIs/ClamBCRemovePointerPHIs.cpp
@@ -22,11 +22,9 @@ using namespace llvm;
 
 namespace
 {
-//class ClambcRemovePointerPHIs : public FunctionPass
 class ClamBCRemovePointerPHIs : public PassInfoMixin<ClamBCRemovePointerPHIs>
 {
   protected:
-    //Function *pFunc = nullptr;
       llvm::Module * pMod = nullptr;
 
     std::vector<PHINode *> gatherPHIs(llvm::Function * pFunc)
@@ -182,7 +180,6 @@ class ClamBCRemovePointerPHIs : public PassInfoMixin<ClamBCRemovePointerPHIs>
         if (not pn->getType()->isPointerTy()) {
             return false;
         }
-        //std::vector<Value*> delLst;
 
         Value *pBasePtr = findBasePointer(pn);
         if (nullptr == pBasePtr) { /*No unique base pointer.*/
@@ -293,17 +290,12 @@ class ClamBCRemovePointerPHIs : public PassInfoMixin<ClamBCRemovePointerPHIs>
     }
 
   public:
-//    static char ID;
-    ClamBCRemovePointerPHIs()
-        /*: FunctionPass(ID)*/ {}
+    ClamBCRemovePointerPHIs() {}
 
-#if 0
-    bool runOnFunction(Function &F) override
-#else
     virtual PreservedAnalyses run(Module & m, ModuleAnalysisManager & mam)
-#endif
     {
 
+        /*Currently unused.  Will remove after the RC phase.*/
         DEBUGERR << "TODO: EVALUATE WHETHER OR NOT I NEED THIS" << "<END>\n"; return PreservedAnalyses::all();
 
         pMod = &m;
@@ -334,14 +326,6 @@ class ClamBCRemovePointerPHIs : public PassInfoMixin<ClamBCRemovePointerPHIs>
 
 } // end of anonymous namespace
 
-#if 0
-char ClambcRemovePointerPHIs::ID = 0;
-static RegisterPass<ClambcRemovePointerPHIs> X("clambc-remove-pointer-phis", "Remove PHI Nodes with pointers",
-                                               false /* Only looks at CFG */,
-                                               false /* Analysis Pass */);
-#else
-
-
 // This part is the new way of registering your pass
 extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK
 llvmGetPassPluginInfo() {
@@ -365,6 +349,4 @@ llvmGetPassPluginInfo() {
 
 
 
-#endif
-
 
diff --git a/libclambcc/ClamBCRemoveSelectInsts/ClamBCRemoveSelectInsts.cpp b/libclambcc/ClamBCRemoveSelectInsts/ClamBCRemoveSelectInsts.cpp
diff --git a/libclambcc/ClamBCRemoveUndefs/ClamBCRemoveUndefs.cpp b/libclambcc/ClamBCRemoveUndefs/ClamBCRemoveUndefs.cpp
@@ -16,6 +16,23 @@
 #include "Common/ClamBCUtilities.h"
 using namespace llvm;
 
+
+
+#if 0
+
+
+THIS APPEARS TO NO LONGER BE NEEDED.  LEAVING IN PLACE DURING THE RC PHASE, JUST IN CASE.
+
+
+
+#endif
+
+
+
+
+
+
+
 namespace
 {
 /*