summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-04-22 17:47:03 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-04-22 17:47:03 +0000
commit89992b0d6b5548f7cf61b3f8565161f0c159dad2 (patch)
tree757e1792eb0c68618338aaf3d7c57b868c14b598
parent953d18a9881a10ead95840790336f05ff95952a6 (diff)
downloadbcm5719-llvm-89992b0d6b5548f7cf61b3f8565161f0c159dad2.tar.gz
bcm5719-llvm-89992b0d6b5548f7cf61b3f8565161f0c159dad2.zip
Fix DataLayout::operator==().
Patch by Maks Naumov! llvm-svn: 206911
-rw-r--r--llvm/lib/IR/DataLayout.cpp2
-rw-r--r--llvm/test/Linker/Inputs/datalayout-b.ll2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/IR/DataLayout.cpp b/llvm/lib/IR/DataLayout.cpp
index d85081629cf..7c3bc3df6d1 100644
--- a/llvm/lib/IR/DataLayout.cpp
+++ b/llvm/lib/IR/DataLayout.cpp
@@ -357,7 +357,7 @@ bool DataLayout::operator==(const DataLayout &Other) const {
StackNaturalAlign == Other.StackNaturalAlign &&
ManglingMode == Other.ManglingMode &&
LegalIntWidths == Other.LegalIntWidths &&
- Alignments == Other.Alignments && Pointers == Pointers;
+ Alignments == Other.Alignments && Pointers == Other.Pointers;
assert(Ret == (getStringRepresentation() == Other.getStringRepresentation()));
return Ret;
}
diff --git a/llvm/test/Linker/Inputs/datalayout-b.ll b/llvm/test/Linker/Inputs/datalayout-b.ll
index 59cdb68a3f7..d76c1aa2e31 100644
--- a/llvm/test/Linker/Inputs/datalayout-b.ll
+++ b/llvm/test/Linker/Inputs/datalayout-b.ll
@@ -1 +1 @@
-target datalayout = "E"
+target datalayout = "e-p:16:16"
OpenPOWER on IntegriCloud