Skip to content

Commit

Permalink
Add params() to FunctionType. NFC.
Browse files Browse the repository at this point in the history
While at it, also use makeArrayRef in elements().

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222556 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
espindola committed Nov 21, 2014
1 parent e8f6119 commit 0b835fc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
6 changes: 4 additions & 2 deletions include/llvm/IR/DerivedTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ class FunctionType : public Type {
typedef Type::subtype_iterator param_iterator;
param_iterator param_begin() const { return ContainedTys + 1; }
param_iterator param_end() const { return &ContainedTys[NumContainedTys]; }
ArrayRef<Type *> params() const {
return makeArrayRef(param_begin(), param_end());
}

/// Parameter type accessors.
Type *getParamType(unsigned i) const { return ContainedTys[i+1]; }
Expand Down Expand Up @@ -274,9 +277,8 @@ class StructType : public CompositeType {
typedef Type::subtype_iterator element_iterator;
element_iterator element_begin() const { return ContainedTys; }
element_iterator element_end() const { return &ContainedTys[NumContainedTys];}

ArrayRef<Type *> const elements() const {
return ArrayRef<Type*>(&*element_begin(), getNumElements());
return makeArrayRef(element_begin(), element_end());
}

/// isLayoutIdentical - Return true if this is layout identical to the
Expand Down
7 changes: 3 additions & 4 deletions lib/IR/LLVMContextImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,9 @@ struct FunctionTypeKeyInfo {
bool isVarArg;
KeyTy(const Type* R, const ArrayRef<Type*>& P, bool V) :
ReturnType(R), Params(P), isVarArg(V) {}
KeyTy(const FunctionType* FT) :
ReturnType(FT->getReturnType()),
Params(makeArrayRef(FT->param_begin(), FT->param_end())),
isVarArg(FT->isVarArg()) {}
KeyTy(const FunctionType *FT)
: ReturnType(FT->getReturnType()), Params(FT->params()),
isVarArg(FT->isVarArg()) {}
bool operator==(const KeyTy& that) const {
if (ReturnType != that.ReturnType)
return false;
Expand Down

0 comments on commit 0b835fc

Please sign in to comment.