commit 21ae3374449b3d08a8d53db2a1b34fcfb8121896
author Arnold Schwaighofer <aschwaighofer@apple.com> Tue Oct 11 20:34:03 2016 +0000
committer Arnold Schwaighofer <aschwaighofer@apple.com> Tue Oct 11 16:03:48 2016 -0700
tree d5908e6e3c43398c9c57cf681230510dd9d7f5c3
parent 968470f17040c6a6c15a8b44854ab74b7b0f4b34

Pass the end of a component to SwiftAggLowering's enumerateComponents callback

This is usefull for determining whether components overlap.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@283932 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit ceb94e6d115bc8cce548b3d76f1fcf24f23421e6)

include/clang/CodeGen/SwiftCallingConv.h

diff --git a/include/clang/CodeGen/SwiftCallingConv.h b/include/clang/CodeGen/SwiftCallingConv.h
index f9c2fd9..0f7d2a4 100644
--- a/include/clang/CodeGen/SwiftCallingConv.h
+++ b/include/clang/CodeGen/SwiftCallingConv.h
@@ -91,7 +91,7 @@
   bool shouldPassIndirectly(bool asReturnValue) const;
 
   using EnumerationCallback =
-    llvm::function_ref<void(CharUnits offset, llvm::Type *type)>;
+    llvm::function_ref<void(CharUnits offset, CharUnits end, llvm::Type *type)>;
 
   /// Enumerate the expanded components of this type.
   ///

lib/CodeGen/SwiftCallingConv.cpp

diff --git a/lib/CodeGen/SwiftCallingConv.cpp b/lib/CodeGen/SwiftCallingConv.cpp
index 44b46f6..59c78bf 100644
--- a/lib/CodeGen/SwiftCallingConv.cpp
+++ b/lib/CodeGen/SwiftCallingConv.cpp
@@ -506,7 +506,7 @@
   assert(Finished && "haven't yet finished lowering");
 
   for (auto &entry : Entries) {
-    callback(entry.Begin, entry.Type);
+    callback(entry.Begin, entry.End, entry.Type);
   }
 }