commit 1fd80c722c1a2d4c31d43a0df35ccbd49d9c2b5a
author Thomas Lively <tlively@google.com> Mon Jun 27 14:47:21 2016 -0700
committer Thomas Lively <tlively@google.com> Mon Jun 27 14:47:21 2016 -0700
tree 97f39e8f2a7a5add6648655495e566bd343589f6
parent 9dd397d322848cbc9c54e80acb6dc0a2b30aaeb7

Instrumented local variables and implemented runtime.

BUG=https://bugs.chromium.org/p/nativeclient/issues/detail?id=4374
R=kschimpf@google.com

Review URL: https://codereview.chromium.org/2095763002 .

src/IceCfg.cpp

diff --git a/src/IceCfg.cpp b/src/IceCfg.cpp
index a113b95..c2b4d06 100644
--- a/src/IceCfg.cpp
+++ b/src/IceCfg.cpp
@@ -645,16 +645,19 @@
   getTarget()->lowerArguments();
 }
 
-void Cfg::sortAndCombineAllocas(CfgVector<Inst *> &Allocas,
+void Cfg::sortAndCombineAllocas(CfgVector<InstAlloca *> &Allocas,
                                 uint32_t CombinedAlignment, InstList &Insts,
                                 AllocaBaseVariableType BaseVariableType) {
   if (Allocas.empty())
     return;
   // Sort by decreasing alignment.
-  std::sort(Allocas.begin(), Allocas.end(), [](Inst *I1, Inst *I2) {
-    auto *A1 = llvm::dyn_cast<InstAlloca>(I1);
-    auto *A2 = llvm::dyn_cast<InstAlloca>(I2);
-    return A1->getAlignInBytes() > A2->getAlignInBytes();
+  std::sort(Allocas.begin(), Allocas.end(), [](InstAlloca *A1, InstAlloca *A2) {
+    uint32_t Align1 = A1->getAlignInBytes();
+    uint32_t Align2 = A2->getAlignInBytes();
+    if (Align1 == Align2)
+      return A1->getNumber() > A2->getNumber();
+    else
+      return Align1 > Align2;
   });
   // Process the allocas in order of decreasing stack alignment.  This allows
   // us to pack less-aligned pieces after more-aligned ones, resulting in less
@@ -746,6 +749,8 @@
   bool HasLargeAlignment = false;
   bool HasDynamicAllocation = false;
   for (Inst &Instr : EntryNode->getInsts()) {
+    if (Instr.isDeleted())
+      continue;
     if (auto *Alloca = llvm::dyn_cast<InstAlloca>(&Instr)) {
       uint32_t AlignmentParam = Alloca->getAlignInBytes();
       if (AlignmentParam > StackAlignment)
@@ -769,6 +774,8 @@
     if (Node == EntryNode)
       continue;
     for (Inst &Instr : Node->getInsts()) {
+      if (Instr.isDeleted())
+        continue;
       if (llvm::isa<InstAlloca>(&Instr)) {
         // Allocations outside the entry block require a frame pointer.
         HasDynamicAllocation = true;
@@ -784,13 +791,15 @@
   // Collect the Allocas into the two vectors.
   // Allocas in the entry block that have constant size and alignment less
   // than or equal to the function's stack alignment.
-  CfgVector<Inst *> FixedAllocas;
+  CfgVector<InstAlloca *> FixedAllocas;
   // Allocas in the entry block that have constant size and alignment greater
   // than the function's stack alignment.
-  CfgVector<Inst *> AlignedAllocas;
+  CfgVector<InstAlloca *> AlignedAllocas;
   // Maximum alignment used by any alloca.
   uint32_t MaxAlignment = StackAlignment;
   for (Inst &Instr : EntryNode->getInsts()) {
+    if (Instr.isDeleted())
+      continue;
     if (auto *Alloca = llvm::dyn_cast<InstAlloca>(&Instr)) {
       if (!llvm::isa<Constant>(Alloca->getSizeInBytes()))
         continue;