[llvm-commits] [poolalloc] r166576 - in /poolalloc/trunk: ./ lib/DSA/DataStructure.cpp lib/DSA/Local.cpp lib/DSA/SanityCheck.cpp tools/WatchDog/

[John Criswell]

Author: criswell
Date: Wed Oct 24 10:45:34 2012
New Revision: 166576

URL: http://llvm.org/viewvc/llvm-project?rev=166576&view=rev
Log:
Merged in bug fixes from the release_30 branch.
The fixes include compilation fixes for Release builds and having the DSA
local pass ignore LLVM debug intrinsics.

Modified:
    poolalloc/trunk/   (props changed)
    poolalloc/trunk/lib/DSA/DataStructure.cpp
    poolalloc/trunk/lib/DSA/Local.cpp
    poolalloc/trunk/lib/DSA/SanityCheck.cpp
    poolalloc/trunk/tools/WatchDog/   (props changed)

Propchange: poolalloc/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 24 10:45:34 2012
@@ -1 +1,2 @@
 /poolalloc/branches/release_26:97820-104253
+/poolalloc/branches/release_30:161126-166575

Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=166576&r1=166575&r2=166576&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DataStructure.cpp (original)
+++ poolalloc/trunk/lib/DSA/DataStructure.cpp Wed Oct 24 10:45:34 2012
@@ -1401,7 +1401,9 @@
   DSScalarMap &SM = G.getScalarMap();
   EquivalenceClasses<const GlobalValue*> &GlobalECs = SM.getGlobalECs();
 
+#ifndef NDEBUG
   bool MadeChange = false;
+#endif
   std::vector<const GlobalValue*> SMGVV(SM.global_begin(), SM.global_end());
 
   for (std::vector<const GlobalValue*>::iterator GI = SMGVV.begin(),
@@ -1434,7 +1436,9 @@
 
     // Finally, remove the global from the ScalarMap.
     SM.erase(GV);
+#ifndef NDEBUG
     MadeChange = true;
+#endif
   }
 
   DEBUG(if(MadeChange) G.AssertGraphOK());

Modified: poolalloc/trunk/lib/DSA/Local.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=166576&r1=166575&r2=166576&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/Local.cpp (original)
+++ poolalloc/trunk/lib/DSA/Local.cpp Wed Oct 24 10:45:34 2012
@@ -21,6 +21,7 @@
 #include "llvm/Intrinsics.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Instructions.h"
+#include "llvm/IntrinsicInst.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/CommandLine.h"
@@ -933,6 +934,13 @@
 ///
 bool GraphBuilder::visitIntrinsic(CallSite CS, Function *F) {
   ++NumIntrinsicCall;
+
+  //
+  // If this is a debug intrinsic, then don't do any special processing.
+  //
+  if (isa<DbgInfoIntrinsic>(CS.getInstruction()))
+    return true;
+
   switch (F->getIntrinsicID()) {
   case Intrinsic::vastart: {
     visitVAStartInst(CS);

Modified: poolalloc/trunk/lib/DSA/SanityCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/SanityCheck.cpp?rev=166576&r1=166575&r2=166576&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/SanityCheck.cpp (original)
+++ poolalloc/trunk/lib/DSA/SanityCheck.cpp Wed Oct 24 10:45:34 2012
@@ -87,11 +87,15 @@
   // of the load is loaded.
   //
   DSNode::LinkMapTy::iterator linki = PtrNode->edge_begin();
+#ifndef NDEBUG
   bool found = false;
+#endif
   for (; linki != PtrNode->edge_end(); ++linki) {
     DSNodeHandle & LinkNode = linki->second;
     if (LinkNode.getNode() == ResultNode) {
+#ifndef NDEBUG
       found = true;
+#endif
     }
   }
 

Propchange: poolalloc/trunk/tools/WatchDog/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 24 10:45:34 2012
@@ -1 +1,2 @@
+/poolalloc/branches/release_30/tools/WatchDog:161126-166575
 /safecode/branches/release_26/tools/WatchDog:97821-104255