diff options
| author | Gabor Greif <ggreif@gmail.com> | 2008-02-28 08:38:45 +0000 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2008-02-28 08:38:45 +0000 |
| commit | c0734e3c994b55d054916921ef2d5eb9bc04f28d (patch) | |
| tree | 17cfed580a76008a65101d8cf9832974ab186ea0 | |
| parent | e526d8a95568f356d68b601f6037125dde8078ed (diff) | |
| download | llvm-c0734e3c994b55d054916921ef2d5eb9bc04f28d.tar.gz llvm-c0734e3c994b55d054916921ef2d5eb9bc04f28d.tar.bz2 llvm-c0734e3c994b55d054916921ef2d5eb9bc04f28d.tar.xz | |
Fix http://llvm.org/bugs/show_bug.cgi?id=2104 by ordering lexicographically what gets printed. Be const-correct in PrintResults and uninline it too
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47712 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Analysis/AliasAnalysisEvaluator.cpp | 17 | ||||
| -rw-r--r-- | test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/lib/Analysis/AliasAnalysisEvaluator.cpp b/lib/Analysis/AliasAnalysisEvaluator.cpp index d8182d0eec..1ed06805fa 100644 --- a/lib/Analysis/AliasAnalysisEvaluator.cpp +++ b/lib/Analysis/AliasAnalysisEvaluator.cpp @@ -31,6 +31,7 @@ #include "llvm/Support/Compiler.h" #include "llvm/Support/Streams.h" #include <set> +#include <sstream> using namespace llvm; namespace { @@ -80,12 +81,18 @@ namespace { FunctionPass *llvm::createAAEvalPass() { return new AAEval(); } -static inline void PrintResults(const char *Msg, bool P, Value *V1, Value *V2, - Module *M) { +static void PrintResults(const char *Msg, bool P, const Value *V1, const Value *V2, + const Module *M) { if (P) { - cerr << " " << Msg << ":\t"; - WriteAsOperand(*cerr.stream(), V1, true, M) << ", "; - WriteAsOperand(*cerr.stream(), V2, true, M) << "\n"; + std::stringstream s1, s2; + WriteAsOperand(s1, V1, true, M); + WriteAsOperand(s2, V2, true, M); + std::string o1(s1.str()), o2(s2.str()); + if (o2 < o1) + std::swap(o1, o2); + cerr << " " << Msg << ":\t" + << o1 << ", " + << o2 << "\n"; } } diff --git a/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll b/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll index 5a2373e401..9936afb195 100644 --- a/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll +++ b/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& grep {9 no alias} ; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& grep {6 may alias} -; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& grep {MayAlias:.*i32\\* %Jpointer, i32\\* %Ipointer} +; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& grep {MayAlias:.*i32\\* %Ipointer, i32\\* %Jpointer} define void @foo(i32* noalias %p, i32* noalias %q, i32 %i, i32 %j) { %Ipointer = getelementptr i32* %p, i32 %i |