Argument node

Author: AlexDenisov

include/Builder.h

@@ -19,6 +19,7 @@ class Builder {
   Node &newBasicBlockNode();
   Node &newInstructionNode();
   Node &newValueNode();
+  Node &newArgumentNode();
   Node &newTypeNode();
 
   Edge &newEdge(uint64_t source, uint64_t target);

include/Emitter.h

@@ -36,6 +36,7 @@ class Emitter {
   Node &newBasicBlockNode(const llvm::Value *value);
   Node &newInstructionNode(const llvm::Value *value);
   Node &newValueNode(const llvm::Value *value);
+  Node &newArgumentNode(const llvm::Value *value);
 
   Node &node(const llvm::Value *value);
 

include/Node.h

@@ -6,10 +6,9 @@
 
 namespace llvm2graphml {
 
-enum class NodeKind { Module, Function, BasicBlock, Instruction, Value, Type };
+enum class NodeKind { Module, Function, Argument, BasicBlock, Instruction, Value, Type };
 
 enum class ValueKind {
-  Argument,
   ConstantInt,
   ConstantFP,
   ConstantPointerNull,

src/Builder.cpp

@@ -44,8 +44,10 @@ Node &Builder::newValueNode() {
   return newNode(NodeKind::Value);
 }
 
+Node &Builder::newArgumentNode() {
+  return newNode(NodeKind::Argument);
+}
+
 Node &Builder::newTypeNode() {
   return newNode(NodeKind::Type);
 }
-
-/// Edge Connectors

src/EdgeConnector.cpp

@@ -24,6 +24,7 @@ Edge &EdgeConnector::function(Node &to) {
 }
 
 Edge &EdgeConnector::argument(const Node &to) {
+  assert(to.getKind() == NodeKind::Argument);
   return edge(to.getID(), EdgeKind::Argument);
 }
 

src/Emitter.cpp

@@ -97,6 +97,9 @@ Node &Emitter::emit(const llvm::Value *value) {
     case llvm::Value::BasicBlockVal: {
       fillIn(llvm::cast<llvm::BasicBlock>(value), newBasicBlockNode(value));
     } break;
+    case llvm::Value::ArgumentVal: {
+      fillIn(llvm::cast<llvm::Argument>(value), newArgumentNode(value));
+    } break;
 
 #define GRAPHML_HANDLE_VALUE(Name)                                                                 \
   case Value::Name##Val: {                                                                         \
@@ -114,7 +117,6 @@ Node &Emitter::emit(const llvm::Value *value) {
       GRAPHML_HANDLE_VALUE(GlobalAlias)
       GRAPHML_HANDLE_VALUE(GlobalIFunc)
       GRAPHML_HANDLE_VALUE(GlobalVariable)
-      GRAPHML_HANDLE_VALUE(Argument)
 #include "llvm/IR/Value.def"
 #undef GRAPHML_HANDLE_VALUE
     default:
@@ -157,6 +159,12 @@ Node &Emitter::newValueNode(const llvm::Value *value) {
   return node;
 }
 
+Node &Emitter::newArgumentNode(const llvm::Value *value) {
+  Node &node = builder.newArgumentNode();
+  emittedValues[value] = &node;
+  return node;
+}
+
 Node &Emitter::node(const llvm::Value *value) {
   return *emittedValues.at(value);
 }

src/Node.cpp

@@ -18,13 +18,13 @@ static std::string nodeKindToString(NodeKind kind) {
     return "value";
   case NodeKind::Type:
     return "type";
+  case NodeKind::Argument:
+    return "argument";
   }
 }
 
 static std::string valueKindToString(ValueKind kind) {
   switch (kind) {
-  case ValueKind::Argument:
-    return "argument";
   case ValueKind::ConstantInt:
     return "constantInt";
   case ValueKind::ConstantFP:

tests/integration-tests/instruction/test.groovy

@@ -86,8 +86,7 @@ dump(g.V().has('basicBlock', 'name', 'entry')
 dump(g.V().has('basicBlock', 'name', 'entry')
           .out('instruction').has('opcode', 'icmp')
           .outE('operand').has('order', 0).inV()
-          .valueMap('name', 'kind').order().by(values))
-// CHECK-NEXT: kind=[argument]
+          .valueMap('name').order().by(values))
 // CHECK-NEXT: name=[x]
 
 :exit