diff options
| author | Dan Gohman <gohman@apple.com> | 2008-10-01 19:58:59 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2008-10-01 19:58:59 +0000 |
| commit | 1dd27578dde4eddb5435b19edc2e2d6869ef5111 (patch) | |
| tree | f4b634954ce4357639c345facf3d8d609d69e87e | |
| parent | 5c8c00af1f0fc20de4b56b46bd28b718ce123fe8 (diff) | |
| download | bcm5719-llvm-1dd27578dde4eddb5435b19edc2e2d6869ef5111.tar.gz bcm5719-llvm-1dd27578dde4eddb5435b19edc2e2d6869ef5111.zip | |
Make some implicit conversions explicit, to avoid compiler warnings.
llvm-svn: 56927
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/VMCore/AsmWriter.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 3d0a2d6e50c..4e8c47c85e4 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -2927,7 +2927,7 @@ static SDValue getMemcpyLoadsAndStores(SelectionDAG &DAG, // Expand memcpy to a series of load and store ops if the size operand falls // below a certain threshold. std::vector<MVT> MemOps; - uint64_t Limit = -1; + uint64_t Limit = uint64_t(-1); if (!AlwaysInline) Limit = TLI.getMaxStoresPerMemcpy(); unsigned DstAlign = Align; // Destination alignment can change. @@ -2985,7 +2985,7 @@ static SDValue getMemmoveLoadsAndStores(SelectionDAG &DAG, // Expand memmove to a series of load and store ops if the size operand falls // below a certain threshold. std::vector<MVT> MemOps; - uint64_t Limit = -1; + uint64_t Limit = uint64_t(-1); if (!AlwaysInline) Limit = TLI.getMaxStoresPerMemmove(); unsigned DstAlign = Align; // Destination alignment can change. diff --git a/llvm/lib/VMCore/AsmWriter.cpp b/llvm/lib/VMCore/AsmWriter.cpp index 6c7b68b41d3..5d765a4c658 100644 --- a/llvm/lib/VMCore/AsmWriter.cpp +++ b/llvm/lib/VMCore/AsmWriter.cpp @@ -385,7 +385,7 @@ int SlotTracker::getGlobalSlot(const GlobalValue *V) { // Find the type plane in the module map ValueMap::iterator MI = mMap.find(V); - return MI == mMap.end() ? -1 : MI->second; + return MI == mMap.end() ? -1 : (int)MI->second; } @@ -397,7 +397,7 @@ int SlotTracker::getLocalSlot(const Value *V) { initialize(); ValueMap::iterator FI = fMap.find(V); - return FI == fMap.end() ? -1 : FI->second; + return FI == fMap.end() ? -1 : (int)FI->second; } |

