diff options
Diffstat (limited to 'include/clang/CodeGen')
| -rw-r--r-- | include/clang/CodeGen/CGFunctionInfo.h | 6 | ||||
| -rw-r--r-- | include/clang/CodeGen/SwiftCallingConv.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/clang/CodeGen/CGFunctionInfo.h b/include/clang/CodeGen/CGFunctionInfo.h index cf64e9f3eeff8..58d1f0d71c748 100644 --- a/include/clang/CodeGen/CGFunctionInfo.h +++ b/include/clang/CodeGen/CGFunctionInfo.h @@ -581,11 +581,11 @@ public: typedef ArgInfo *arg_iterator; typedef llvm::iterator_range<arg_iterator> arg_range; - typedef llvm::iterator_range<const_arg_iterator> arg_const_range; + typedef llvm::iterator_range<const_arg_iterator> const_arg_range; arg_range arguments() { return arg_range(arg_begin(), arg_end()); } - arg_const_range arguments() const { - return arg_const_range(arg_begin(), arg_end()); + const_arg_range arguments() const { + return const_arg_range(arg_begin(), arg_end()); } const_arg_iterator arg_begin() const { return getArgsBuffer() + 1; } diff --git a/include/clang/CodeGen/SwiftCallingConv.h b/include/clang/CodeGen/SwiftCallingConv.h index 45b3145ed9f1a..5aa9be2d67c19 100644 --- a/include/clang/CodeGen/SwiftCallingConv.h +++ b/include/clang/CodeGen/SwiftCallingConv.h @@ -114,6 +114,9 @@ private: void addLegalTypedData(llvm::Type *type, CharUnits begin, CharUnits end); void addEntry(llvm::Type *type, CharUnits begin, CharUnits end); void splitVectorEntry(unsigned index); + static bool shouldMergeEntries(const StorageEntry &first, + const StorageEntry &second, + CharUnits chunkSize); }; /// Should an aggregate which expands to the given type sequence |