[llvm-commits] [poolalloc] r130445 - in /poolalloc/trunk: lib/DSA/DSTest.cpp test/dsa/local/union_P2I.ll test/dsa/types/array2struct.ll test/dsa/types/union_arrays.ll

[Arushi Aggarwal]

Author: aggarwa4
Date: Thu Apr 28 16:36:26 2011
New Revision: 130445

URL: http://llvm.org/viewvc/llvm-project?rev=130445&view=rev
Log:
Fix Tcl lexer errors. 

Modified:
    poolalloc/trunk/lib/DSA/DSTest.cpp
    poolalloc/trunk/test/dsa/local/union_P2I.ll
    poolalloc/trunk/test/dsa/types/array2struct.ll
    poolalloc/trunk/test/dsa/types/union_arrays.ll

Modified: poolalloc/trunk/lib/DSA/DSTest.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DSTest.cpp?rev=130445&r1=130444&r2=130445&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DSTest.cpp (original)
+++ poolalloc/trunk/lib/DSA/DSTest.cpp Thu Apr 28 16:36:26 2011
@@ -281,7 +281,6 @@
   if (N->isNodeCompletelyFolded()) {
     O << "Folded";
   }
-
   // Go through all the types, and just dump them.
   // FIXME: Lifted from Printer.cpp, probably should be shared
   bool firstType = true;
@@ -472,10 +471,12 @@
       NodeValue NV(*I, M, DS);
       std::string *type = new std::string();
       llvm::raw_string_ostream *test= new llvm::raw_string_ostream(*type);
-
       printTypesForNode(*test, NV);
+      std::string type1 = test->str();
+      type1.erase(remove_if(type1.begin(), type1.end(), isspace), type1.end());
+      typeRef.erase(remove_if(typeRef.begin(), typeRef.end(), isspace), typeRef.end());
 
-      if(test->str()!=typeRef) {
+      if(type1 != typeRef) {
         errs() << "ERROR: Testing for type :   \t" <<
           typeRef  << "\n";
         errs() << "       But found this type :\t" <<

Modified: poolalloc/trunk/test/dsa/local/union_P2I.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/local/union_P2I.ll?rev=130445&r1=130444&r2=130445&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/local/union_P2I.ll (original)
+++ poolalloc/trunk/test/dsa/local/union_P2I.ll Thu Apr 28 16:36:26 2011
@@ -3,7 +3,7 @@
 ;RUN: dsaopt %s -dsa-local -analyze -check-same-node=main:ptr:0,main:obj:0
 ;RUN: dsaopt %s -dsa-local -analyze -check-type=main:obj,FoldedVOID
 ;RUN: adsaopt %s -simplify-gep -mergearrgep -o t.bc
-;RUN: dsaopt t.bc -dsa-local -enable-type-inference-opts -analyze -check-type=main:obj,0:i32|[100 x %struct.StructType]
+;RUN: dsaopt t.bc -dsa-local -enable-type-inference-opts -analyze -check-type=main:obj,0:i32|\\\[100x%\struct.StructType\\\]
 
 
 ; ModuleID = 'union_P2.bc'

Modified: poolalloc/trunk/test/dsa/types/array2struct.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/types/array2struct.ll?rev=130445&r1=130444&r2=130445&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/types/array2struct.ll (original)
+++ poolalloc/trunk/test/dsa/types/array2struct.ll Thu Apr 28 16:36:26 2011
@@ -2,7 +2,7 @@
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
 ;RUN: dsaopt %s -dsa-local -analyze -check-type=tree,FoldedVOID
-;RUN: dsaopt %s -dsa-local -enable-type-inference-opts -analyze -check-type=tree,12:\[8 x i32\]Array
+;RUN: dsaopt %s -dsa-local -enable-type-inference-opts -analyze -check-type=tree,12:\\\[8xi32\\\]Array
 ; LLVM front end converts the type of tree, to a struct type instead of an array of the right type.
 ; even though structurally equivalent, DSA cant infer this yet.
 

Modified: poolalloc/trunk/test/dsa/types/union_arrays.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/types/union_arrays.ll?rev=130445&r1=130444&r2=130445&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/types/union_arrays.ll (original)
+++ poolalloc/trunk/test/dsa/types/union_arrays.ll Thu Apr 28 16:36:26 2011
@@ -4,7 +4,7 @@
 ;RUN: dsaopt %s -dsa-local -analyze -check-type=func:obj,FoldedVOID
 ;RUN: dsaopt %s -dsa-local -analyze -enable-type-inference-opts -check-type=func:obj,FoldedVOID
 ;RUN: adsaopt %s -mem2reg -simplify-gep -mergearrgep -dce -o t.bc
-;RUN: dsaopt t.bc -dsa-local -analyze -enable-type-inference-opts -check-type=func:obj,0:i32|[10 x i32]::40:i16|[10 x i16]::60:i32|[10 x i32]
+;RUN: dsaopt t.bc -dsa-local -analyze -enable-type-inference-opts -check-type=func:obj,0:i32|\\\[10xi32\\\]::40:i16|\\\[10xi16\\\]::60:i32|\\\[10xi32\\\]
 
 %struct.StructType1 = type { [10 x i32], [10 x i16], [10 x i32] }
 %struct.StructType2 = type { [10 x i32], [10 x i32], [10 x i32] }