Initial Subzero WASM prototype.

src/IceCfgNode.cpp

 //===- subzero/src/IceCfgNode.cpp - Basic block (node) implementation -----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 21 matching lines @@
 // Returns the name the node was created with. If no name was given, it
 // synthesizes a (hopefully) unique name.
 IceString CfgNode::getName() const {
   if (NameIndex >= 0)
     return Func->getIdentifierName(NameIndex);
   return "__" + std::to_string(LabelNumber);
 }
 
 // Adds an instruction to either the Phi list or the regular instruction list.
 // Validates that all Phis are added before all regular instructions.
-void CfgNode::appendInst(Inst *Instr) {
+void CfgNode::appendInst(Inst *Instr, bool AllowPhisAnywhere) {
   ++InstCountEstimate;
+
+  if (auto Dest = Instr->getDest()) {

[Jim Stichnoth, 2016/03/29 17:49:57]

auto *
here and below

[Eric Holk, 2016/03/29 22:58:07]

Done.

+    Dest->setDefNode(this);
+  }
+
+  if (auto Br = llvm::dyn_cast<InstBr>(Instr)) {
+    if (auto N = Br->getTargetTrue()) {
+      N->addInEdge(this);
+      addOutEdge(N);
+    }
+    if (auto N = Br->getTargetFalse()) {
+      N->addInEdge(this);
+      addOutEdge(N);
+    }
+  }
+
   if (auto *Phi = llvm::dyn_cast<InstPhi>(Instr)) {
-    if (!Insts.empty()) {
+    if (!AllowPhisAnywhere && !Insts.empty()) {
       Func->setError("Phi instruction added to the middle of a block");
+      assert(false);

[JF, 2016/03/28 18:17:13]

llvm_unreachable

[Jim Stichnoth, 2016/03/29 17:49:57]

actually just remove the assert.

[Eric Holk, 2016/03/29 19:54:08]

Actually, I didn't mean to keep this assert here anyway, so I just removed it.

Done.

       return;
     }
     Phis.push_back(Phi);
   } else {
     Insts.push_back(Instr);
   }
+  Instr->setCfgNode(this);
 }
 
 namespace {
 template <typename List> void removeDeletedAndRenumber(List *L, Cfg *Func) {
   const bool DoDelete =
       BuildDefs::minimal() || !GlobalContext::getFlags().getKeepDeletedInsts();
   auto I = L->begin(), E = L->end(), Next = I;
   for (++Next; I != E; I = Next++) {
     if (DoDelete && I->isDeleted()) {
       L->erase(I);
@@ skipping 13 matching lines @@
 
 // When a node is created, the OutEdges are immediately known, but the InEdges
 // have to be built up incrementally. After the CFG has been constructed, the
 // computePredecessors() pass finalizes it by creating the InEdges list.
 void CfgNode::computePredecessors() {
   for (CfgNode *Succ : OutEdges)
     Succ->InEdges.push_back(this);
 }
 
 void CfgNode::computeSuccessors() {
+  OutEdges.clear();
+  InEdges.clear();
   OutEdges = Insts.rbegin()->getTerminatorEdges();
 }
 
 // Validate each Phi instruction in the node with respect to control flow. For
 // every phi argument, its label must appear in the predecessor list. For each
 // predecessor, there must be a phi argument with that label. We don't check
 // that phi arguments with the same label have the same value.
 void CfgNode::validatePhis() {
   for (Inst &Instr : Phis) {
     auto *Phi = llvm::cast<InstPhi>(&Instr);
@@ skipping 771 matching lines @@
     if (I.isDeleted())
       continue;
     if (I.isUnconditionalBranch())
       Branch = &I;
     else if (!I.isRedundantAssign())
       return;
   }
   // Make sure there is actually a successor to repoint in-edges to.
   if (OutEdges.empty())
     return;
-  assert(OutEdges.size() == 1);
+  assert(OutEdges.size() == 1 || OutEdges[0] == OutEdges[1]);
   // Don't try to delete a self-loop.
   if (OutEdges[0] == this)
     return;
   // Make sure the node actually contains (ends with) an unconditional branch.
   if (Branch == nullptr)
     return;
 
   Branch->setDeleted();
   CfgNode *Successor = OutEdges.front();
   // Repoint all this node's in-edges to this node's successor, unless this
@@ skipping 561 matching lines @@
   auto *Instr = InstIntrinsicCall::create(
       Func, 5, Func->makeVariable(IceType_i64), RMWI64Name, Info->Info);
   Instr->addArg(AtomicRMWOp);
   Instr->addArg(Counter);
   Instr->addArg(One);
   Instr->addArg(OrderAcquireRelease);
   Insts.push_front(Instr);
 }
 
 } // end of namespace Ice