ControlGraph::TMetaInfo::readsArguments now stores indices of accesse…

…d args Issue: #17 Issue: #92
0x7CFE · Jul 17, 2016 · cc2e736 · cc2e736
1 parent 3fc7659
commit cc2e736
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/include/analysis.h b/include/analysis.h
@@ -524,7 +524,6 @@ class ControlGraph {
         bool usesSelf;
         bool usesSuper;
 
-        bool readsArguments;
         bool readsFields;
         bool writesFields;
 
@@ -535,6 +534,7 @@ class ControlGraph {
         typedef std::vector<std::size_t> TIndexList;
         TIndexList readsTemporaries;
         TIndexList writesTemporaries;
+        TIndexList readsArguments;
 
         static void insertIndex(std::size_t index, TIndexList& list) {
             if (std::find(list.begin(), list.end(), index) == list.end())

diff --git a/src/ControlGraph.cpp b/src/ControlGraph.cpp
@@ -14,7 +14,6 @@ ControlGraph::TMetaInfo::TMetaInfo() :
     hasBackEdgeTau(false),
     usesSelf(false),
     usesSuper(false),
-    readsArguments(false),
     readsFields(false),
     writesFields(false),
     hasPrimitive(false)
@@ -190,7 +189,7 @@ void GraphConstructor::processNode(InstructionNode* node)
         case opcode::pushArgument:
             if (instruction.getArgument() == 0)
                 m_graph->getMeta().usesSelf = true;
-            m_graph->getMeta().readsArguments = true;
+            ControlGraph::TMetaInfo::insertIndex(instruction.getArgument(), m_graph->getMeta().readsArguments);
 
         case opcode::pushInstance:
             m_graph->getMeta().readsFields = true;