Merge branch 'llvm:main' into vector_update

Author: JoshuaMBa

compiler-rt/lib/scudo/standalone/vector.h

@@ -9,6 +9,8 @@
 #ifndef SCUDO_VECTOR_H_
 #define SCUDO_VECTOR_H_
 
+#include "common.h"
+#include "internal_defs.h"
 #include "mem_map.h"
 
 #include <string.h>
@@ -121,7 +123,7 @@ template <typename T, size_t StaticCapacity> class VectorNoCtor {
 };
 
 template <typename T, size_t StaticCapacity = 8>
-class Vector : public VectorNoCtor<T, StaticCapacity> {
+class Vector : public VectorNoCtor<T, Max<size_t>(1, StaticCapacity)> {
 public:
   constexpr Vector() { VectorNoCtor<T, StaticCapacity>::init(); }
   explicit Vector(uptr Count) {

llvm/test/Transforms/InstCombine/AMDGPU/select-from-load.ll

@@ -25,8 +25,8 @@ entry:
   br label %for.cond10
 
 for.cond10:                                       ; preds = %for.cond10, %entry
-  %3 = load i64, ptr %retval.0.i
-  store i64 %3, ptr addrspace(1) null
+  %load.0 = load i64, ptr %retval.0.i
+  store i64 %load.0, ptr addrspace(1) null
   br label %for.cond10
 }