diff options
| author | Davide Italiano <davide@freebsd.org> | 2017-01-11 21:58:42 +0000 |
|---|---|---|
| committer | Davide Italiano <davide@freebsd.org> | 2017-01-11 21:58:42 +0000 |
| commit | ff69405213d6f1ca8c1dc89d814cf24600ce3ac1 (patch) | |
| tree | fe51fcdb214dceaeb9425f1fc1f646c1e6650583 | |
| parent | 6e919df2f5e967375391d5b1cda83d505acb9a56 (diff) | |
| download | bcm5719-llvm-ff69405213d6f1ca8c1dc89d814cf24600ce3ac1.tar.gz bcm5719-llvm-ff69405213d6f1ca8c1dc89d814cf24600ce3ac1.zip | |
[NewGVN] Parenthesise assertion condition (-Wparenthesis).
Format an assertion message while I'm here.
llvm-svn: 291710
| -rw-r--r-- | llvm/lib/Transforms/Scalar/NewGVN.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/llvm/lib/Transforms/Scalar/NewGVN.cpp b/llvm/lib/Transforms/Scalar/NewGVN.cpp index 04fd5d0b0bd..93e011a9284 100644 --- a/llvm/lib/Transforms/Scalar/NewGVN.cpp +++ b/llvm/lib/Transforms/Scalar/NewGVN.cpp @@ -1536,13 +1536,12 @@ void NewGVN::verifyMemoryCongruency() const { if (auto *FirstMUD = dyn_cast<MemoryUseOrDef>(KV.first)) { auto *SecondMUD = dyn_cast<MemoryUseOrDef>(KV.second); if (FirstMUD && SecondMUD) - assert(singleReachablePHIPath(FirstMUD, SecondMUD) || + assert((singleReachablePHIPath(FirstMUD, SecondMUD) || ValueToClass.lookup(FirstMUD->getMemoryInst()) == - ValueToClass.lookup(SecondMUD->getMemoryInst()) && + ValueToClass.lookup(SecondMUD->getMemoryInst())) && "The instructions for these memory operations should have " - "been in " - "the same congruence class or reachable through a single " - "argument phi"); + "been in the same congruence class or reachable through" + "a single argument phi"); } else if (auto *FirstMP = dyn_cast<MemoryPhi>(KV.first)) { // We can only sanely verify that MemoryDefs in the operand list all have |
