From c28e27be2b9649c39970d0e8b731be2b99ed7a29 Mon Sep 17 00:00:00 2001
From: Ajay Mohan <ajmohan@ucsd.edu>
Date: Mon, 7 Dec 2015 06:59:23 +0000
Subject: [PATCH] Reduce Compile Errors

---
 llvm/src/lib/CSE231/WorkList.cpp | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/llvm/src/lib/CSE231/WorkList.cpp b/llvm/src/lib/CSE231/WorkList.cpp
index 7af834f..b6f73b8 100644
--- a/llvm/src/lib/CSE231/WorkList.cpp
+++ b/llvm/src/lib/CSE231/WorkList.cpp
@@ -8,56 +8,61 @@
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Instruction.h"                                               
 #include "llvm/Pass.h"
-#include "llvm/Support/raw_ostream.h"                                          
-#include "llvm/Support/InstIterator.h"   
+#include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/STLExtras.h"
+#include <list>
+#include <map>
+#include <string>
+#include <set>
 using namespace llvm;
 namespace{
 class Edge{
     public:
         BasicBlock *BB;
         Instruction *IB;
-        bool isBlock(false);
-        bool isInstruction(false);
-}
+        bool isBlock;
+        bool isInstruction;
+        Edge() : isBlock(false), isInstruction(false) { }
+};
 class CPElement{
     public:
         //The variable 
-        String variable;
+        StringRef variable;
         //the value it holds
         int value;
-}
+};
 
-void Worklist(Function *F)
+void Worklist(Function *FB)
 {
     SmallVector<Edge*,256> WorkList;
 
     //Map of Edge(Basic Block/Instruction) to computed value
-    std::map<Edge*, std::set<CPElement> M;
+    std::map<Edge*, std::set<CPElement> > M;
     //And its iterator
     std::map<Edge*, std::set<CPElement>::iterator MI;
    
     //Null Element to initialize edge mappings 
-    CPElement ElementNull = new CPElement(); 
-    
-    ElementNull.variable = new String("phi");   
+    CPElement ElementNull; 
+    ElementNull.variable = "phi";   
     ElementNull.value = -1;
 
     //For every BasicBlock 
     //Add them to the Map
     //And store ElementNull as their value
     for(Function::iterator BB = FB->begin(), BE = FB->end(); BB != BE; ++BB) {
-        Edge BasicBlockEdge = new Edge();
+        Edge BasicBlockEdge;
         BasicBlockEdge.isBlock = true;
         BasicBlockEdge.BB = BB;
-        M[BasicBlockEdge] = ElementNull 
+        M[BasicBlockEdge] = ElementNull; 
         for (BasicBlock::iterator IB = BB->begin(), IE = BB->end();IB != IE; ++IB) { 
             //For every InstructionBlock
             //Add them to the Map
             //And store ElementNull as their value
-            Edge InstructionEdge = new Edge();
+            Edge InstructionEdge;
             InstructionEdge.isInstruction = true;
             InstructionEdge.IB = IB;
             M[InstructionEdge] = ElementNull;
         }
     }   
 }
+}
-- 
1.9.1