Adding a key_type definition to MapVector

[kevcadieux]

Summary

The key_type type definition for map containers is useful in some generic, template-based programming scenarios. The addition of key_type to MapVector is consistent with other map types like DenseMap.

[kevcadieux]

There are build failures due to a failed Polly test

test/ScopInliner/simple-inline-loop.ll

After reproducing it locally, I verified that this failure occurs even without my change.

[Meinersbur]

The Polly failure was fixed here: https://github.com/llvm/llvm-project/commit/7f627596977624730f9298a1b69883af1555765e

[kevcadieux]

In D113242#3112628, @Meinersbur wrote:

The Polly failure was fixed here: https://github.com/llvm/llvm-project/commit/7f627596977624730f9298a1b69883af1555765e

Thanks for letting me know. Do you know what is the proper way to trigger a remerge before building? I tried simply restarting the build but it didn't include the fix.

[kevcadieux]

Rebasing.

[Meinersbur]

In D113242#3112913, @kevcadieux wrote:

Thanks for letting me know. Do you know what is the proper way to trigger a remerge before building?

The only way I know is re-uploading the diff.

I tried simply restarting the build but it didn't include the fix.

If you upload with arcanist it also stores the parent git SHA1 and would just re-apply the patch to that. If you upload via web form Phabricator does not have parent information, but I don't know what happens when triggering a re-build. Might either use the opt-of-tree at time of uploading the diff or the top-of-tree when running the pre-merge check.

[dexonsmith]

LGTM.

[kevcadieux]

In D113242#3129079, @dexonsmith wrote:

LGTM.

Thanks for approving! I don't have commit privileges since this is my first contribution. Could you please do me a favor and commit it for me? Thanks!

[llvm-commits]

Sure—please let me know the email address and author name to I use for attribution!

[kevcadieux]

In D113242#3136329, @llvm-commits wrote:

Sure—please let me know the email address and author name to I use for attribution!

Author name: Kevin Cadieux
Email: [e-mail]

llvm/include/llvm/ADT/MapVector.h

class MapVector {
   MapType Map;
   VectorType Vector;
 
   static_assert(
       std::is_integral<typename MapType::mapped_type>::value,
       "The mapped_type of the specified Map must be an integral type");
 
 public:
+  using key_type = KeyT;
   using value_type = typename VectorType::value_type;
   using size_type = typename VectorType::size_type;
 
   using iterator = typename VectorType::iterator;
   using const_iterator = typename VectorType::const_iterator;
   using reverse_iterator = typename VectorType::reverse_iterator;
   using const_reverse_iterator = typename VectorType::const_reverse_iterator;