diff options
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Support/Annotation.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index d1de88b7e24..244dee393f6 100644 --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -262,7 +262,7 @@ class VISIBILITY_HIDDEN WorkListRemover : public SelectionDAG::DAGUpdateListener { DAGCombiner &DC; public: - WorkListRemover(DAGCombiner &dc) : DC(dc) {} + explicit WorkListRemover(DAGCombiner &dc) : DC(dc) {} virtual void NodeDeleted(SDNode *N) { DC.removeFromWorkList(N); diff --git a/llvm/lib/Support/Annotation.cpp b/llvm/lib/Support/Annotation.cpp index 9d5e5457d9a..3ecc42f782e 100644 --- a/llvm/lib/Support/Annotation.cpp +++ b/llvm/lib/Support/Annotation.cpp @@ -57,9 +57,9 @@ AnnotationID AnnotationManager::getID(const std::string &Name) { // Name -> ID IDMapType::iterator I = IDMap->find(Name); if (I == IDMap->end()) { (*IDMap)[Name] = IDCounter++; // Add a new element - return IDCounter-1; + return AnnotationID(IDCounter-1); } - return I->second; + return AnnotationID(I->second); } // getID - Name -> ID + registration of a factory function for demand driven diff --git a/llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp b/llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp index 388071d1e9a..d0067b3302c 100644 --- a/llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp +++ b/llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp @@ -1112,7 +1112,7 @@ namespace { else if (isa<ConstantPointerNull>(V)) return ConstantRange(APInt::getNullValue(typeToWidth(V->getType()))); else - return typeToWidth(V->getType()); + return ConstantRange(typeToWidth(V->getType())); } // typeToWidth - returns the number of bits necessary to store a value of |
