diff options
author | Erik Eckstein <eeckstein@apple.com> | 2016-11-11 22:21:39 +0000 |
---|---|---|
committer | Erik Eckstein <eeckstein@apple.com> | 2016-11-11 22:21:39 +0000 |
commit | c1d52e5c53ef7eeaabedbe092a8da0d6e02e1ef0 (patch) | |
tree | 825ebafe865b55753f6af9fec68098fcea955b71 /llvm/lib/Transforms/Utils/FunctionComparator.cpp | |
parent | 3ccc39ef7c4b31cdcc9fab1c13616022104481ad (diff) | |
download | bcm5719-llvm-c1d52e5c53ef7eeaabedbe092a8da0d6e02e1ef0.tar.gz bcm5719-llvm-c1d52e5c53ef7eeaabedbe092a8da0d6e02e1ef0.zip |
FunctionComparator: don't rely on argument evaluation order.
This is a follow-up on the recent refactoring of the FunctionMerge pass.
It should fix a fail of the new FunctionComparator unittest whe compiling with MSVC.
llvm-svn: 286648
Diffstat (limited to 'llvm/lib/Transforms/Utils/FunctionComparator.cpp')
-rw-r--r-- | llvm/lib/Transforms/Utils/FunctionComparator.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Utils/FunctionComparator.cpp b/llvm/lib/Transforms/Utils/FunctionComparator.cpp index 6884b403e92..1cb75b49c01 100644 --- a/llvm/lib/Transforms/Utils/FunctionComparator.cpp +++ b/llvm/lib/Transforms/Utils/FunctionComparator.cpp @@ -355,7 +355,9 @@ int FunctionComparator::cmpConstants(const Constant *L, } int FunctionComparator::cmpGlobalValues(GlobalValue *L, GlobalValue *R) const { - return cmpNumbers(GlobalNumbers->getNumber(L), GlobalNumbers->getNumber(R)); + uint64_t LNumber = GlobalNumbers->getNumber(L); + uint64_t RNumber = GlobalNumbers->getNumber(R); + return cmpNumbers(LNumber, RNumber); } /// cmpType - compares two types, |